[codehaus-parent] Update to version 4
Orion Poplawski
orion at fedoraproject.org
Tue Jul 3 14:55:11 UTC 2012
commit 777219c3be69d76c775dfa668af5040a67e5e3cf
Author: Orion Poplawski <orion at cora.nwra.com>
Date: Tue Jul 3 08:55:11 2012 -0600
Update to version 4
codehaus-parent-3.pom => codehaus-parent-4.pom | 25 +++++++++++----
codehaus-parent-enforcer.patch | 39 ++++++++----------------
codehaus-parent.spec | 11 ++++--
3 files changed, 39 insertions(+), 36 deletions(-)
---
diff --git a/codehaus-parent-3.pom b/codehaus-parent-4.pom
similarity index 78%
rename from codehaus-parent-3.pom
rename to codehaus-parent-4.pom
index a82376b..2e10afb 100644
--- a/codehaus-parent-3.pom
+++ b/codehaus-parent-4.pom
@@ -1,9 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Copyright (c) 2007-2011 Sonatype, Inc. All rights reserved.
+ ~
+ ~ This program is licensed to you under the Apache License Version 2.0,
+ ~ and you may not use this file except in compliance with the Apache License Version 2.0.
+ ~ You may obtain a copy of the Apache License Version 2.0 at http://www.apache.org/licenses/LICENSE-2.0.
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the Apache License Version 2.0 is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
+ -->
<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>3</version>
+ <version>4</version>
<packaging>pom</packaging>
<name>Codehaus Parent</name>
@@ -11,9 +24,9 @@
<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:svn:http://svn.sonatype.org/spice/tags/codehaus-parent-3</connection>
- <developerConnection>scm:svn:https://svn.sonatype.org/spice/tags/codehaus-parent-3</developerConnection>
- <url>http://svn.sonatype.org/spice/tags/codehaus-parent-3</url>
+ <connection>scm:git:git at github.com:sonatype/codehaus-parent.git</connection>
+ <developerConnection>scm:git:git at github.com:sonatype/codehaus-parent.git</developerConnection>
+ <url>https://github.com/sonatype/codehaus-parent</url>
</scm>
<repositories>
@@ -49,7 +62,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>1.0-beta-1</version>
+ <version>1.0</version>
<executions>
<execution>
<id>enforce-maven</id>
@@ -73,7 +86,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>2.0</version>
+ <version>2.1</version>
<configuration>
<mavenExecutorId>forked-path</mavenExecutorId>
<useReleaseProfile>false</useReleaseProfile>
diff --git a/codehaus-parent-enforcer.patch b/codehaus-parent-enforcer.patch
index 83ea882..013821a 100644
--- a/codehaus-parent-enforcer.patch
+++ b/codehaus-parent-enforcer.patch
@@ -1,32 +1,19 @@
---- codehaus-parent-3.pom 2012-05-22 12:14:30.464286905 +0200
-+++ codehaus-parent-3.pom.new 2012-05-22 12:15:41.213299565 +0200
-@@ -45,29 +45,6 @@
+diff -up ./codehaus-parent-4.pom.enforcer ./codehaus-parent-4.pom
+--- ./codehaus-parent-4.pom.enforcer 2012-07-03 08:52:12.845362577 -0600
++++ ./codehaus-parent-4.pom 2012-07-03 08:53:40.415245681 -0600
+@@ -58,6 +58,7 @@
</distributionManagement>
<build>
-- <plugins>
-- <plugin>
-- <groupId>org.apache.maven.plugins</groupId>
-- <artifactId>maven-enforcer-plugin</artifactId>
-- <version>1.0-beta-1</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>
++ <!--
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+@@ -81,6 +82,7 @@
+ </executions>
+ </plugin>
+ </plugins>
++ -->
<pluginManagement>
<plugins>
<plugin>
diff --git a/codehaus-parent.spec b/codehaus-parent.spec
index 96d93a5..566ba6e 100644
--- a/codehaus-parent.spec
+++ b/codehaus-parent.spec
@@ -1,13 +1,13 @@
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
+Source0: http://repo1.maven.org/maven2/org/codehaus/codehaus-parent/%{version}/codehaus-parent-%{version}.pom
Patch0: %{name}-enforcer.patch
BuildArch: noarch
@@ -29,7 +29,7 @@ cp %{SOURCE0} .
%install
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 codehaus-parent-3.pom \
+install -pm 644 codehaus-parent-%{version}.pom \
$RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
%add_maven_depmap JPP-%{name}.pom
@@ -40,6 +40,9 @@ install -pm 644 codehaus-parent-3.pom \
%{_mavendepmapfragdir}/*
%changelog
+* Tue Jul 3 2012 Orion Poplawski <orion at cora.nwra.com> - 4-1
+- Update to version 4
+
* Tue May 22 2012 Stanislav Ochotnicky <sochotnicky at redhat.com> - 3-5
- Patch enforcer plugin out so it's not needed in all child packages
More information about the scm-commits
mailing list