Attachment 595920 Details for Bug 837240 – Update to 4

[patch] Update to 4

0001-Update-to-4.patch (text/plain), 8.00 KB, created by gil cattaneo on 2012-07-03 09:52:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: gil cattaneo

Created: 2012-07-03 09:52:13 UTC

Size: 8.00 KB

patch

obsolete

>From 4737d5c777085de0575e3b33b7280a2825e80480 Mon Sep 17 00:00:00 2001
>From: gil <puntogil@libero.it>
>Date: Tue, 3 Jul 2012 09:52:02 +0200
>Subject: [PATCH] Update to 4
>
>---
> codehaus-parent-4-enforcer.patch |   20 +++++
> codehaus-parent-4.pom            |  155 ++++++++++++++++++++++++++++++++++++++
> codehaus-parent.spec             |   25 ++++---
> 3 files changed, 189 insertions(+), 11 deletions(-)
> create mode 100644 codehaus-parent-4-enforcer.patch
> create mode 100644 codehaus-parent-4.pom
>
>diff --git a/codehaus-parent-4-enforcer.patch b/codehaus-parent-4-enforcer.patch
>new file mode 100644
>index 0000000..2ee9404
>--- /dev/null
>+++ b/codehaus-parent-4-enforcer.patch
>@@ -0,0 +1,20 @@
>+--- pom.xml	2011-05-04 08:54:12.000000000 +0200
>++++ pom.xml-gil	2012-07-03 09:40:43.286466646 +0200
>+@@ -58,7 +58,7 @@
>+ 	</distributionManagement>
>+ 
>+ 	<build>
>+-		<plugins>
>++		
>+ 		<pluginManagement>
>+ 			<plugins>
>+ 				<plugin>
>diff --git a/codehaus-parent-4.pom b/codehaus-parent-4.pom
>new file mode 100644
>index 0000000..2e10afb
>--- /dev/null
>+++ b/codehaus-parent-4.pom
>@@ -0,0 +1,155 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+
>+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
>+	<modelVersion>4.0.0</modelVersion>
>+
>+	<groupId>org.codehaus</groupId>
>+	<artifactId>codehaus-parent</artifactId>
>+	<version>4</version>
>+	<packaging>pom</packaging>
>+
>+	<name>Codehaus Parent</name>
>+	<url>http://codehaus.org/</url>
>+	<description>The Codehaus is a collaborative environment for building open source projects with a strong emphasis on modern languages, focussed on quality components that meet real world needs. </description>
>+
>+	<scm>
>+		<connection>scm:git:git@github.com:sonatype/codehaus-parent.git</connection>
>+		<developerConnection>scm:git:git@github.com:sonatype/codehaus-parent.git</developerConnection>
>+		<url>https://github.com/sonatype/codehaus-parent</url>
>+	</scm>
>+
>+	<repositories>
>+		<repository>
>+			<id>codehaus-snapshots</id>
>+			<name>Codehaus Snapshots</name>
>+			<url>http://nexus.codehaus.org/snapshots/</url>
>+			<releases>
>+				<enabled>false</enabled>
>+			</releases>
>+			<snapshots>
>+				<enabled>true</enabled>
>+			</snapshots>
>+		</repository>
>+	</repositories>
>+
>+
>+	<distributionManagement>
>+		<snapshotRepository>
>+			<id>codehaus-nexus-snapshots</id>
>+			<name>Codehaus Nexus Snapshots</name>
>+			<url>${codehausDistMgmtSnapshotsUrl}</url>
>+		</snapshotRepository>
>+		<repository>
>+			<id>codehaus-nexus-staging</id>
>+			<name>Codehaus Release Repository</name>
>+			<url>https://nexus.codehaus.org/service/local/staging/deploy/maven2/</url>
>+		</repository>
>+	</distributionManagement>
>+
>+	<build>
>+		<plugins>
>+			<plugin>
>+				<groupId>org.apache.maven.plugins</groupId>
>+				<artifactId>maven-enforcer-plugin</artifactId>
>+				<version>1.0</version>
>+				<executions>
>+					<execution>
>+						<id>enforce-maven</id>
>+						<goals>
>+							<goal>enforce</goal>
>+						</goals>
>+						<configuration>
>+							<rules>
>+								<requireMavenVersion>
>+									<version>(,2.1.0),(2.1.0,2.2.0),(2.2.0,)</version>
>+									<message>Maven 2.1.0 and 2.2.0 produce incorrect GPG signatures and checksums respectively.</message>
>+								</requireMavenVersion>
>+							</rules>
>+						</configuration>
>+					</execution>
>+				</executions>
>+			</plugin>
>+		</plugins>
>+		<pluginManagement>
>+			<plugins>
>+				<plugin>
>+					<groupId>org.apache.maven.plugins</groupId>
>+					<artifactId>maven-release-plugin</artifactId>
>+					<version>2.1</version>
>+					<configuration>
>+						<mavenExecutorId>forked-path</mavenExecutorId>
>+						<useReleaseProfile>false</useReleaseProfile>
>+						<arguments>-Pcodehaus-release</arguments>
>+					</configuration>
>+				</plugin>
>+			</plugins>
>+		</pluginManagement>
>+	</build>
>+
>+	<properties>
>+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
>+		<codehausDistMgmtSnapshotsUrl>https://nexus.codehaus.org/content/repositories/snapshots/</codehausDistMgmtSnapshotsUrl>
>+	</properties>
>+
>+	<profiles>
>+		<profile>
>+			<id>codehaus-release</id>
>+			<build>
>+				<plugins>
>+					<plugin>
>+						<groupId>org.apache.maven.plugins</groupId>
>+						<artifactId>maven-source-plugin</artifactId>
>+						<version>2.1.2</version>
>+						<executions>
>+							<execution>
>+								<id>attach-sources</id>
>+								<goals>
>+									<goal>jar-no-fork</goal>
>+								</goals>
>+							</execution>
>+						</executions>
>+					</plugin>
>+					<plugin>
>+						<groupId>org.apache.maven.plugins</groupId>
>+						<artifactId>maven-javadoc-plugin</artifactId>
>+						<version>2.7</version>
>+						<executions>
>+							<execution>
>+								<id>attach-javadocs</id>
>+								<goals>
>+									<goal>jar</goal>
>+								</goals>
>+							</execution>
>+						</executions>
>+					</plugin>
>+					<plugin>
>+						<groupId>org.apache.maven.plugins</groupId>
>+						<artifactId>maven-gpg-plugin</artifactId>
>+						<version>1.1</version>
>+						<executions>
>+							<execution>
>+								<id>sign-artifacts</id>
>+								<phase>verify</phase>
>+								<goals>
>+									<goal>sign</goal>
>+								</goals>
>+							</execution>
>+						</executions>
>+					</plugin>
>+				</plugins>
>+			</build>
>+		</profile>
>+	</profiles>
>+
>+</project>
>diff --git a/codehaus-parent.spec b/codehaus-parent.spec
>index 96d93a5..65b0b11 100644
>--- a/codehaus-parent.spec
>+++ b/codehaus-parent.spec
>@@ -1,14 +1,15 @@
> Name:           codehaus-parent
>-Version:        3
>-Release:        5%{?dist}
>+Version:        4
>+Release:        1%{?dist}
> Summary:        Parent pom file for codehaus projects
> 
> Group:          Development/Libraries
> License:        ASL 2.0
> URL:            http://codehaus.org/
> #Next version with license is at https://github.com/sonatype/codehaus-parent/blob/master/pom.xml
>-Source0:        http://repo1.maven.org/maven2/org/codehaus/codehaus-parent/3/codehaus-parent-3.pom
>-Patch0:         %{name}-enforcer.patch
>+Source0:        http://repo1.maven.org/maven2/org/codehaus/codehaus-parent/4/codehaus-parent-4.pom
>+Patch0:         %{name}-%{version}-enforcer.patch
>+
> BuildArch:      noarch
> 
> BuildRequires:  jpackage-utils
>@@ -21,25 +22,27 @@ This package contains the parent pom file for codehaus projects.
> 
> %prep
> %setup -q -c -T
>-cp %{SOURCE0} .
>+cp -p %{SOURCE0} .
> %patch0
> 
> %build
> 
>-
> %install
>+
> install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
>-install -pm 644 codehaus-parent-3.pom \
>+install -pm 644 %{name}-%{version}.pom \
>         $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
> 
> %add_maven_depmap JPP-%{name}.pom 
> 
>-
> %files
>-%{_mavenpomdir}/*
>-%{_mavendepmapfragdir}/*
>+%{_mavenpomdir}/JPP-%{name}.pom
>+%{_mavendepmapfragdir}/%{name}
> 
> %changelog
>+* Tue Jul 03 2012 gil cattaneo <puntogil@libero.it> - 4-1
>+- Update to 4
>+
> * Tue May 22 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3-5
> - Patch enforcer plugin out so it's not needed in all child packages
> 
>@@ -55,4 +58,4 @@ install -pm 644 codehaus-parent-3.pom \
> - Upstream set license to ASL 2.0
> 
> * Fri Apr 29 2011 Orion Poplawski <orion@cora.nwra.com> - 3-1
>-- Initial package
>+- Initial package
>\ No newline at end of file
>-- 
>1.7.7.6
>

Actions: View | Diff

Attachments on bug 837240: 595920