Attachment 706362 Details for Bug 917084 – diff -u -r apache-maven-3.0.4 apache-maven-3.0.5

[patch] diff -u -r apache-maven-3.0.4 apache-maven-3.0.5

maven.diff (text/plain), 22.26 KB, created by Mikolaj Izdebski on 2013-03-07 06:30:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikolaj Izdebski

Created: 2013-03-07 06:30:33 UTC

Size: 22.26 KB

patch

obsolete

>diff -u -r apache-maven-3.0.4/DEPENDENCIES apache-maven-3.0.5/DEPENDENCIES
>--- apache-maven-3.0.4/DEPENDENCIES	2012-01-17 09:47:30.000000000 +0100
>+++ apache-maven-3.0.5/DEPENDENCIES	2013-02-19 14:54:18.000000000 +0100
>@@ -47,33 +47,33 @@
> From: 'The Apache Software Foundation' (http://www.apache.org/)
>   - Commons CLI (http://commons.apache.org/cli/) commons-cli:commons-cli:jar:1.2
>     License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
>-  - Maven Aether Provider (http://maven.apache.org/ref/3.0.4//maven-aether-provider) org.apache.maven:maven-aether-provider:jar:3.0.4
>+  - Maven Aether Provider (http://maven.apache.org/ref/3.0.5//maven-aether-provider) org.apache.maven:maven-aether-provider:jar:3.0.5
>     License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
>-  - Maven Artifact (http://maven.apache.org/ref/3.0.4//maven-artifact) org.apache.maven:maven-artifact:jar:3.0.4
>+  - Maven Artifact (http://maven.apache.org/ref/3.0.5//maven-artifact) org.apache.maven:maven-artifact:jar:3.0.5
>     License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
>-  - Maven Compat (http://maven.apache.org/ref/3.0.4//maven-compat) org.apache.maven:maven-compat:jar:3.0.4
>+  - Maven Compat (http://maven.apache.org/ref/3.0.5//maven-compat) org.apache.maven:maven-compat:jar:3.0.5
>     License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
>-  - Maven Core (http://maven.apache.org/ref/3.0.4//maven-core) org.apache.maven:maven-core:jar:3.0.4
>+  - Maven Core (http://maven.apache.org/ref/3.0.5//maven-core) org.apache.maven:maven-core:jar:3.0.5
>     License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
>-  - Maven Embedder (http://maven.apache.org/ref/3.0.4//maven-embedder) org.apache.maven:maven-embedder:jar:3.0.4
>+  - Maven Embedder (http://maven.apache.org/ref/3.0.5//maven-embedder) org.apache.maven:maven-embedder:jar:3.0.5
>     License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
>-  - Maven Model (http://maven.apache.org/ref/3.0.4//maven-model) org.apache.maven:maven-model:jar:3.0.4
>+  - Maven Model (http://maven.apache.org/ref/3.0.5//maven-model) org.apache.maven:maven-model:jar:3.0.5
>     License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
>-  - Maven Model Builder (http://maven.apache.org/ref/3.0.4//maven-model-builder) org.apache.maven:maven-model-builder:jar:3.0.4
>+  - Maven Model Builder (http://maven.apache.org/ref/3.0.5//maven-model-builder) org.apache.maven:maven-model-builder:jar:3.0.5
>     License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
>-  - Maven Plugin API (http://maven.apache.org/ref/3.0.4//maven-plugin-api) org.apache.maven:maven-plugin-api:jar:3.0.4
>+  - Maven Plugin API (http://maven.apache.org/ref/3.0.5//maven-plugin-api) org.apache.maven:maven-plugin-api:jar:3.0.5
>     License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
>-  - Maven Repository Metadata Model (http://maven.apache.org/ref/3.0.4//maven-repository-metadata) org.apache.maven:maven-repository-metadata:jar:3.0.4
>+  - Maven Repository Metadata Model (http://maven.apache.org/ref/3.0.5//maven-repository-metadata) org.apache.maven:maven-repository-metadata:jar:3.0.5
>     License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
>-  - Maven Settings (http://maven.apache.org/ref/3.0.4//maven-settings) org.apache.maven:maven-settings:jar:3.0.4
>+  - Maven Settings (http://maven.apache.org/ref/3.0.5//maven-settings) org.apache.maven:maven-settings:jar:3.0.5
>     License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
>-  - Maven Settings Builder (http://maven.apache.org/ref/3.0.4//maven-settings-builder) org.apache.maven:maven-settings-builder:jar:3.0.4
>+  - Maven Settings Builder (http://maven.apache.org/ref/3.0.5//maven-settings-builder) org.apache.maven:maven-settings-builder:jar:3.0.5
>     License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
>-  - Apache Maven Wagon :: Providers :: File Provider (http://maven.apache.org/wagon//wagon-providers/wagon-file) org.apache.maven.wagon:wagon-file:jar:2.2
>+  - Apache Maven Wagon :: Providers :: File Provider (http://maven.apache.org/wagon/wagon-providers/wagon-file) org.apache.maven.wagon:wagon-file:jar:2.4
>     License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
>-  - Apache Maven Wagon :: Providers :: HTTP Provider (http://maven.apache.org/wagon//wagon-providers/wagon-http) org.apache.maven.wagon:wagon-http:jar:2.2
>+  - Apache Maven Wagon :: Providers :: HTTP Provider (http://maven.apache.org/wagon/wagon-providers/wagon-http) org.apache.maven.wagon:wagon-http:jar:2.4
>     License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
>-  - Apache Maven Wagon :: API (http://maven.apache.org/wagon//wagon-provider-api) org.apache.maven.wagon:wagon-provider-api:jar:2.2
>+  - Apache Maven Wagon :: API (http://maven.apache.org/wagon/wagon-provider-api) org.apache.maven.wagon:wagon-provider-api:jar:2.4
>     License: The Apache Software License, Version 2.0  (http://www.apache.org/licenses/LICENSE-2.0.txt)
> 
> 
>diff -u -r apache-maven-3.0.4/apache-maven/pom.xml apache-maven-3.0.5/apache-maven/pom.xml
>--- apache-maven-3.0.4/apache-maven/pom.xml	2012-01-17 09:40:06.000000000 +0100
>+++ apache-maven-3.0.5/apache-maven/pom.xml	2013-02-19 14:45:37.000000000 +0100
>@@ -21,7 +21,7 @@
>   <parent>
>     <groupId>org.apache.maven</groupId>
>     <artifactId>maven</artifactId>
>-    <version>3.0.4</version>
>+    <version>3.0.5</version>
>   </parent>
> 
>   <artifactId>apache-maven</artifactId>
>diff -u -r apache-maven-3.0.4/maven-aether-provider/pom.xml apache-maven-3.0.5/maven-aether-provider/pom.xml
>--- apache-maven-3.0.4/maven-aether-provider/pom.xml	2012-01-17 09:40:25.000000000 +0100
>+++ apache-maven-3.0.5/maven-aether-provider/pom.xml	2013-02-19 14:45:37.000000000 +0100
>@@ -25,7 +25,7 @@
>   <parent>
>     <groupId>org.apache.maven</groupId>
>     <artifactId>maven</artifactId>
>-    <version>3.0.4</version>
>+    <version>3.0.5</version>
>   </parent>
> 
>   <artifactId>maven-aether-provider</artifactId>
>diff -u -r apache-maven-3.0.4/maven-artifact/pom.xml apache-maven-3.0.5/maven-artifact/pom.xml
>--- apache-maven-3.0.4/maven-artifact/pom.xml	2012-01-17 09:40:25.000000000 +0100
>+++ apache-maven-3.0.5/maven-artifact/pom.xml	2013-02-19 14:45:37.000000000 +0100
>@@ -16,7 +16,7 @@
>   <parent>
>     <groupId>org.apache.maven</groupId>
>     <artifactId>maven</artifactId>
>-    <version>3.0.4</version>
>+    <version>3.0.5</version>
>   </parent>
> 
>   <artifactId>maven-artifact</artifactId>
>Only in apache-maven-3.0.4/maven-artifact/src/main: resources
>Only in apache-maven-3.0.4/maven-artifact/src/test: resources
>diff -u -r apache-maven-3.0.4/maven-compat/pom.xml apache-maven-3.0.5/maven-compat/pom.xml
>--- apache-maven-3.0.4/maven-compat/pom.xml	2012-01-17 09:40:09.000000000 +0100
>+++ apache-maven-3.0.5/maven-compat/pom.xml	2013-02-19 14:45:37.000000000 +0100
>@@ -16,7 +16,7 @@
>   <parent>
>     <groupId>org.apache.maven</groupId>
>     <artifactId>maven</artifactId>
>-    <version>3.0.4</version>
>+    <version>3.0.5</version>
>   </parent>
> 
>   <artifactId>maven-compat</artifactId>
>Only in apache-maven-3.0.4/maven-compat/src/test/java/org/apache/maven/repository: ideworkspace
>diff -u -r apache-maven-3.0.4/maven-core/pom.xml apache-maven-3.0.5/maven-core/pom.xml
>--- apache-maven-3.0.4/maven-core/pom.xml	2012-01-17 09:40:25.000000000 +0100
>+++ apache-maven-3.0.5/maven-core/pom.xml	2013-02-19 14:45:40.000000000 +0100
>@@ -16,7 +16,7 @@
>   <parent>
>     <groupId>org.apache.maven</groupId>
>     <artifactId>maven</artifactId>
>-    <version>3.0.4</version>
>+    <version>3.0.5</version>
>   </parent>
> 
>   <artifactId>maven-core</artifactId>
>@@ -127,73 +127,34 @@
>           </models>
>         </configuration>
>       </plugin>
>-    </plugins>
>-  </build>
>-
>-  <profiles>
>-    <profile>
>-      <id>svn-buildnumber</id>
>-      <activation>
>-        <file>
>-          <exists>.svn</exists>
>-        </file>
>-      </activation>
>-      <build>
>-        <plugins>
>-          <plugin>
>-            <groupId>org.codehaus.mojo</groupId>
>-            <artifactId>buildnumber-maven-plugin</artifactId>
>-            <executions>
>-              <execution>
>-                <phase>generate-resources</phase>
>-                <goals>
>-                  <goal>create</goal>
>-                </goals>
>-              </execution>
>-            </executions>
>+      <plugin>
>+        <groupId>org.codehaus.mojo</groupId>
>+        <artifactId>buildnumber-maven-plugin</artifactId>
>+        <executions>
>+          <execution>
>+            <id>create-noncanonicalrev</id>
>+            <goals>
>+              <goal>create-timestamp</goal>
>+            </goals>
>             <configuration>
>-              <doCheck>false</doCheck>
>-              <doUpdate>false</doUpdate>
>-              <providerImplementations>
>-                <svn>javasvn</svn>
>-              </providerImplementations> 
>+              <timestampFormat>'NON-CANONICAL_'yyyy-MM-dd_HH-mm_'${user.name}'</timestampFormat>
>+              <timestampPropertyName>nonCanonicalRevision</timestampPropertyName>
>             </configuration>
>-          </plugin>
>-        </plugins>
>-      </build>
>-    </profile>
>-    <profile>
>-      <id>non-canonical-buildnumber</id>
>-      <activation>
>-        <file>
>-          <missing>.svn</missing>
>-        </file>
>-      </activation>
>-      <build>
>-        <plugins>
>-          <plugin>
>-            <groupId>org.codehaus.mojo</groupId>
>-            <artifactId>buildnumber-maven-plugin</artifactId>
>-            <executions>
>-              <execution>
>-                <phase>generate-resources</phase>
>-                <goals>
>-                  <goal>create</goal>
>-                </goals>
>-              </execution>
>-            </executions>
>+          </execution>
>+          <execution>
>+            <id>create-buildnumber</id>
>+            <goals>
>+              <goal>create</goal>
>+            </goals>
>             <configuration>
>               <doCheck>false</doCheck>
>               <doUpdate>false</doUpdate>
>-              <format>NON-CANONICAL_{0,date,yyyy-MM-dd_HH-mm}_{1}</format>
>-              <items>
>-                <item>timestamp</item>
>-                <item>${user.name}</item>
>-              </items>
>+              <revisionOnScmFailure>${nonCanonicalRevision}</revisionOnScmFailure>
>             </configuration>
>-          </plugin>
>-        </plugins>
>-      </build>
>-    </profile>
>-  </profiles>
>+          </execution>
>+        </executions>
>+      </plugin>
>+    </plugins>
>+  </build>
>+
> </project>
>Only in apache-maven-3.0.4/maven-core/src/test/projects/lifecycle-executor/project-with-plugin-level-configuration-only: src
>Only in apache-maven-3.0.4/maven-core/src/test/resources-project-builder: profile-repository-override
>diff -u -r apache-maven-3.0.4/maven-embedder/pom.xml apache-maven-3.0.5/maven-embedder/pom.xml
>--- apache-maven-3.0.4/maven-embedder/pom.xml	2012-01-17 09:40:31.000000000 +0100
>+++ apache-maven-3.0.5/maven-embedder/pom.xml	2013-02-19 14:45:43.000000000 +0100
>@@ -16,7 +16,7 @@
>   <parent>
>     <groupId>org.apache.maven</groupId>
>     <artifactId>maven</artifactId>
>-    <version>3.0.4</version>
>+    <version>3.0.5</version>
>   </parent>
> 
>   <artifactId>maven-embedder</artifactId>
>Only in apache-maven-3.0.4/maven-embedder/src/test/error-reporting-projects: bad-plugin-exec-env
>Only in apache-maven-3.0.4/maven-embedder/src/test/error-reporting-projects/load-extern-profiles-ioex: profiles.xml
>Only in apache-maven-3.0.4/maven-embedder/src/test/error-reporting-projects: project-parse-ioex
>Only in apache-maven-3.0.4/maven-embedder/src/test/error-reporting-projects: task-lifecycle-loader-err
>Only in apache-maven-3.0.4/maven-embedder/src/test: java
>diff -u -r apache-maven-3.0.4/maven-model/pom.xml apache-maven-3.0.5/maven-model/pom.xml
>--- apache-maven-3.0.4/maven-model/pom.xml	2012-01-17 09:40:25.000000000 +0100
>+++ apache-maven-3.0.5/maven-model/pom.xml	2013-02-19 14:45:44.000000000 +0100
>@@ -25,7 +25,7 @@
>   <parent>
>     <groupId>org.apache.maven</groupId>
>     <artifactId>maven</artifactId>
>-    <version>3.0.4</version>
>+    <version>3.0.5</version>
>   </parent>
> 
>   <artifactId>maven-model</artifactId>
>diff -u -r apache-maven-3.0.4/maven-model-builder/pom.xml apache-maven-3.0.5/maven-model-builder/pom.xml
>--- apache-maven-3.0.4/maven-model-builder/pom.xml	2012-01-17 09:40:10.000000000 +0100
>+++ apache-maven-3.0.5/maven-model-builder/pom.xml	2013-02-19 14:45:44.000000000 +0100
>@@ -16,7 +16,7 @@
>   <parent>
>     <groupId>org.apache.maven</groupId>
>     <artifactId>maven</artifactId>
>-    <version>3.0.4</version>
>+    <version>3.0.5</version>
>   </parent>
> 
>   <artifactId>maven-model-builder</artifactId>
>diff -u -r apache-maven-3.0.4/maven-model-builder/pom.xml.orig apache-maven-3.0.5/maven-model-builder/pom.xml.orig
>--- apache-maven-3.0.4/maven-model-builder/pom.xml.orig	2012-01-17 09:40:10.000000000 +0100
>+++ apache-maven-3.0.5/maven-model-builder/pom.xml.orig	2013-02-19 14:45:44.000000000 +0100
>@@ -16,7 +16,7 @@
>   <parent>
>     <groupId>org.apache.maven</groupId>
>     <artifactId>maven</artifactId>
>-    <version>3.0.4</version>
>+    <version>3.0.5</version>
>   </parent>
> 
>   <artifactId>maven-model-builder</artifactId>
>diff -u -r apache-maven-3.0.4/maven-plugin-api/pom.xml apache-maven-3.0.5/maven-plugin-api/pom.xml
>--- apache-maven-3.0.4/maven-plugin-api/pom.xml	2012-01-17 09:40:26.000000000 +0100
>+++ apache-maven-3.0.5/maven-plugin-api/pom.xml	2013-02-19 14:45:44.000000000 +0100
>@@ -25,7 +25,7 @@
>   <parent>
>     <groupId>org.apache.maven</groupId>
>     <artifactId>maven</artifactId>
>-    <version>3.0.4</version>
>+    <version>3.0.5</version>
>   </parent>
> 
>   <artifactId>maven-plugin-api</artifactId>
>diff -u -r apache-maven-3.0.4/maven-plugin-api/pom.xml.orig apache-maven-3.0.5/maven-plugin-api/pom.xml.orig
>--- apache-maven-3.0.4/maven-plugin-api/pom.xml.orig	2012-01-17 09:40:26.000000000 +0100
>+++ apache-maven-3.0.5/maven-plugin-api/pom.xml.orig	2013-02-19 14:45:44.000000000 +0100
>@@ -25,7 +25,7 @@
>   <parent>
>     <groupId>org.apache.maven</groupId>
>     <artifactId>maven</artifactId>
>-    <version>3.0.4</version>
>+    <version>3.0.5</version>
>   </parent>
> 
>   <artifactId>maven-plugin-api</artifactId>
>diff -u -r apache-maven-3.0.4/maven-repository-metadata/pom.xml apache-maven-3.0.5/maven-repository-metadata/pom.xml
>--- apache-maven-3.0.4/maven-repository-metadata/pom.xml	2012-01-17 09:40:25.000000000 +0100
>+++ apache-maven-3.0.5/maven-repository-metadata/pom.xml	2013-02-19 14:45:45.000000000 +0100
>@@ -25,7 +25,7 @@
>   <parent>
>     <groupId>org.apache.maven</groupId>
>     <artifactId>maven</artifactId>
>-    <version>3.0.4</version>
>+    <version>3.0.5</version>
>   </parent>
> 
>   <artifactId>maven-repository-metadata</artifactId>
>diff -u -r apache-maven-3.0.4/maven-settings/pom.xml apache-maven-3.0.5/maven-settings/pom.xml
>--- apache-maven-3.0.4/maven-settings/pom.xml	2012-01-17 09:40:26.000000000 +0100
>+++ apache-maven-3.0.5/maven-settings/pom.xml	2013-02-19 14:45:45.000000000 +0100
>@@ -25,7 +25,7 @@
>   <parent>
>     <groupId>org.apache.maven</groupId>
>     <artifactId>maven</artifactId>
>-    <version>3.0.4</version>
>+    <version>3.0.5</version>
>   </parent>
> 
>   <artifactId>maven-settings</artifactId>
>diff -u -r apache-maven-3.0.4/maven-settings-builder/pom.xml apache-maven-3.0.5/maven-settings-builder/pom.xml
>--- apache-maven-3.0.4/maven-settings-builder/pom.xml	2012-01-17 09:40:09.000000000 +0100
>+++ apache-maven-3.0.5/maven-settings-builder/pom.xml	2013-02-19 14:45:45.000000000 +0100
>@@ -25,7 +25,7 @@
>   <parent>
>     <groupId>org.apache.maven</groupId>
>     <artifactId>maven</artifactId>
>-    <version>3.0.4</version>
>+    <version>3.0.5</version>
>   </parent>
> 
>   <artifactId>maven-settings-builder</artifactId>
>diff -u -r apache-maven-3.0.4/pom.xml apache-maven-3.0.5/pom.xml
>--- apache-maven-3.0.4/pom.xml	2012-01-17 09:40:31.000000000 +0100
>+++ apache-maven-3.0.5/pom.xml	2013-02-19 14:45:45.000000000 +0100
>@@ -21,12 +21,12 @@
>   <parent>
>     <groupId>org.apache.maven</groupId>
>     <artifactId>maven-parent</artifactId>
>-    <version>21</version>
>+    <version>23</version>
>     <relativePath>../pom/maven/pom.xml</relativePath>
>   </parent>
> 
>   <artifactId>maven</artifactId>
>-  <version>3.0.4</version>
>+  <version>3.0.5</version>
>   <packaging>pom</packaging>
> 
>   <name>Apache Maven</name>
>@@ -50,7 +50,7 @@
>     <plexusInterpolationVersion>1.14</plexusInterpolationVersion>
>     <plexusUtilsVersion>2.0.6</plexusUtilsVersion>
>     <sisuInjectVersion>2.3.0</sisuInjectVersion>
>-    <wagonVersion>2.2</wagonVersion>
>+    <wagonVersion>2.4</wagonVersion>
>     <securityDispatcherVersion>1.3</securityDispatcherVersion>
>     <cipherVersion>1.7</cipherVersion>
>     <modelloVersion>1.4.1</modelloVersion>
>@@ -65,6 +65,8 @@
>     <siteDeployUrl>scp://people.apache.org/www/maven.apache.org/ref/${project.version}/</siteDeployUrl>
>     <siteUrl>http://maven.apache.org/ref/${project.version}/</siteUrl>
> 
>+    <maven.site.path>ref/${project.version}</maven.site.path>
>+
>   </properties>
> 
>   <mailingLists>
>@@ -159,9 +161,10 @@
>   </modules>
> 
>   <scm>
>-    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/maven-3/tags/maven-3.0.4</connection>
>-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/maven-3/tags/maven-3.0.4</developerConnection>
>-    <url>http://svn.apache.org/viewvc/maven/maven-3/tags/maven-3.0.4</url>
>+    <connection>scm:git:https://git-wip-us.apache.org/repos/asf/maven.git</connection>
>+    <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/maven.git</developerConnection>
>+    <url>https://git-wip-us.apache.org/repos/asf?p=maven.git</url>
>+    <tag>maven-3.0.5</tag>
>   </scm>
>   <issueManagement>
>     <system>jira</system>
>@@ -174,7 +177,7 @@
>   <distributionManagement>
>     <site>
>       <id>apache.website</id>
>-      <url>${siteDeployUrl}</url>
>+      <url>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/content/${maven.site.path}</url>
>     </site>
>   </distributionManagement>
> 
>@@ -450,12 +453,22 @@
>         <plugin>
>           <groupId>org.apache.maven.plugins</groupId>
>           <artifactId>maven-assembly-plugin</artifactId>
>-          <version>2.2-beta-5</version>
>+          <version>2.4</version>
>         </plugin>
>         <plugin>
>           <groupId>org.codehaus.mojo</groupId>
>           <artifactId>buildnumber-maven-plugin</artifactId>
>-          <version>1.0</version>
>+          <version>1.2</version>
>+        </plugin>
>+        <plugin>
>+          <groupId>org.apache.maven.plugins</groupId>
>+          <artifactId>maven-scm-publish-plugin</artifactId>
>+          <version>1.0-beta-2</version>
>+          <configuration>
>+            <content>${project.build.directory}/staging/${maven.site.path}</content>
>+            <checkoutDirectory>${maven.site.cache}/${maven.site.path}</checkoutDirectory>
>+            <tryUpdate>true</tryUpdate>
>+          </configuration>
>         </plugin>
>       </plugins>
>     </pluginManagement>
>diff -u -r apache-maven-3.0.4/pom.xml.orig apache-maven-3.0.5/pom.xml.orig
>--- apache-maven-3.0.4/pom.xml.orig	2012-01-17 09:40:31.000000000 +0100
>+++ apache-maven-3.0.5/pom.xml.orig	2013-02-19 14:45:45.000000000 +0100
>@@ -21,12 +21,12 @@
>   <parent>
>     <groupId>org.apache.maven</groupId>
>     <artifactId>maven-parent</artifactId>
>-    <version>21</version>
>+    <version>23</version>
>     <relativePath>../pom/maven/pom.xml</relativePath>
>   </parent>
> 
>   <artifactId>maven</artifactId>
>-  <version>3.0.4</version>
>+  <version>3.0.5</version>
>   <packaging>pom</packaging>
> 
>   <name>Apache Maven</name>
>@@ -50,7 +50,7 @@
>     <plexusInterpolationVersion>1.14</plexusInterpolationVersion>
>     <plexusUtilsVersion>2.0.6</plexusUtilsVersion>
>     <sisuInjectVersion>2.3.0</sisuInjectVersion>
>-    <wagonVersion>2.2</wagonVersion>
>+    <wagonVersion>2.4</wagonVersion>
>     <securityDispatcherVersion>1.3</securityDispatcherVersion>
>     <cipherVersion>1.7</cipherVersion>
>     <modelloVersion>1.4.1</modelloVersion>
>@@ -65,6 +65,8 @@
>     <siteDeployUrl>scp://people.apache.org/www/maven.apache.org/ref/${project.version}/</siteDeployUrl>
>     <siteUrl>http://maven.apache.org/ref/${project.version}/</siteUrl>
> 
>+    <maven.site.path>ref/${project.version}</maven.site.path>
>+
>   </properties>
> 
>   <mailingLists>
>@@ -159,9 +161,10 @@
>   </modules>
> 
>   <scm>
>-    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/maven-3/tags/maven-3.0.4</connection>
>-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/maven-3/tags/maven-3.0.4</developerConnection>
>-    <url>http://svn.apache.org/viewvc/maven/maven-3/tags/maven-3.0.4</url>
>+    <connection>scm:git:https://git-wip-us.apache.org/repos/asf/maven.git</connection>
>+    <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/maven.git</developerConnection>
>+    <url>https://git-wip-us.apache.org/repos/asf?p=maven.git</url>
>+    <tag>maven-3.0.5</tag>
>   </scm>
>   <issueManagement>
>     <system>jira</system>
>@@ -174,7 +177,7 @@
>   <distributionManagement>
>     <site>
>       <id>apache.website</id>
>-      <url>${siteDeployUrl}</url>
>+      <url>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/content/${maven.site.path}</url>
>     </site>
>   </distributionManagement>
> 
>@@ -450,12 +453,22 @@
>         <plugin>
>           <groupId>org.apache.maven.plugins</groupId>
>           <artifactId>maven-assembly-plugin</artifactId>
>-          <version>2.2-beta-5</version>
>+          <version>2.4</version>
>         </plugin>
>         <plugin>
>           <groupId>org.codehaus.mojo</groupId>
>           <artifactId>buildnumber-maven-plugin</artifactId>
>-          <version>1.0</version>
>+          <version>1.2</version>
>+        </plugin>
>+        <plugin>
>+          <groupId>org.apache.maven.plugins</groupId>
>+          <artifactId>maven-scm-publish-plugin</artifactId>
>+          <version>1.0-beta-2</version>
>+          <configuration>
>+            <content>${project.build.directory}/staging/${maven.site.path}</content>
>+            <checkoutDirectory>${maven.site.cache}/${maven.site.path}</checkoutDirectory>
>+            <tryUpdate>true</tryUpdate>
>+          </configuration>
>         </plugin>
>       </plugins>
>     </pluginManagement>

Actions: View | Diff

Attachments on bug 917084: 706362