You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by br...@apache.org on 2013/01/07 10:23:57 UTC
svn commit: r1429720 - in /archiva/tags/archiva-1.3.6: ./ archiva-docs/
archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/
archiva-modules/archiva-web/archiva-webapp-test/ archiva-modul...
Author: brett
Date: Mon Jan 7 09:23:56 2013
New Revision: 1429720
URL: http://svn.apache.org/viewvc?rev=1429720&view=rev
Log:
merge changes from archiva-1.3.x for the release
Added:
archiva/tags/archiva-1.3.6/.gitignore
- copied unchanged from r1429719, archiva/branches/archiva-1.3.x/.gitignore
Modified:
archiva/tags/archiva-1.3.6/ (props changed)
archiva/tags/archiva-1.3.6/archiva-docs/ (props changed)
archiva/tags/archiva-1.3.6/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/Consumer.java (props changed)
archiva/tags/archiva-1.3.6/archiva-modules/archiva-web/archiva-webapp-test/ (props changed)
archiva/tags/archiva-1.3.6/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties (props changed)
archiva/tags/archiva-1.3.6/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml (props changed)
archiva/tags/archiva-1.3.6/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/security/UserRepositoriesStub.java (props changed)
archiva/tags/archiva-1.3.6/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports/ (props changed)
archiva/tags/archiva-1.3.6/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports/GenerateReportActionTest.java (props changed)
archiva/tags/archiva-1.3.6/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/reports/ (props changed)
archiva/tags/archiva-1.3.6/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/reports/GenerateReportActionTest.xml (props changed)
archiva/tags/archiva-1.3.6/pom.xml
Propchange: archiva/tags/archiva-1.3.6/
------------------------------------------------------------------------------
Merged /archiva/branches/archiva-1.3.x:r1429695-1429719
Propchange: archiva/tags/archiva-1.3.6/archiva-docs/
------------------------------------------------------------------------------
Merged /archiva/branches/archiva-1.3.x/archiva-docs:r1429695-1429719
Propchange: archiva/tags/archiva-1.3.6/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/Consumer.java
------------------------------------------------------------------------------
Merged /archiva/branches/archiva-1.3.x/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/Consumer.java:r1429695-1429719
Propchange: archiva/tags/archiva-1.3.6/archiva-modules/archiva-web/archiva-webapp-test/
------------------------------------------------------------------------------
Merged /archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp-test:r1429695-1429719
Propchange: archiva/tags/archiva-1.3.6/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties
------------------------------------------------------------------------------
Merged /archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties:r1429695-1429719
Propchange: archiva/tags/archiva-1.3.6/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml
------------------------------------------------------------------------------
Merged /archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml:r1429695-1429719
Propchange: archiva/tags/archiva-1.3.6/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/security/UserRepositoriesStub.java
------------------------------------------------------------------------------
Merged /archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/security/UserRepositoriesStub.java:r1429695-1429719
Propchange: archiva/tags/archiva-1.3.6/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports/
------------------------------------------------------------------------------
Merged /archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports:r1429695-1429719
Propchange: archiva/tags/archiva-1.3.6/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports/GenerateReportActionTest.java
------------------------------------------------------------------------------
Merged /archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports/GenerateReportActionTest.java:r1429695-1429719
Propchange: archiva/tags/archiva-1.3.6/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/reports/
------------------------------------------------------------------------------
Merged /archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/reports:r1429695-1429719
Propchange: archiva/tags/archiva-1.3.6/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/reports/GenerateReportActionTest.xml
------------------------------------------------------------------------------
Merged /archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/reports/GenerateReportActionTest.xml:r1429695-1429719
Modified: archiva/tags/archiva-1.3.6/pom.xml
URL: http://svn.apache.org/viewvc/archiva/tags/archiva-1.3.6/pom.xml?rev=1429720&r1=1429719&r2=1429720&view=diff
==============================================================================
--- archiva/tags/archiva-1.3.6/pom.xml (original)
+++ archiva/tags/archiva-1.3.6/pom.xml Mon Jan 7 09:23:56 2013
@@ -138,7 +138,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
+ <version>2.5.1</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
@@ -1211,9 +1211,14 @@
<!-- TODO: we need to push this into the parent, and also upgrade to the latest ASF parent POM -->
<distributionManagement>
<repository>
- <id>vmbuild.staging</id>
- <name>Apache Release Staging Repository on VMBuild</name>
- <url>http://vmbuild.apache.org/archiva/repository/staged-archiva</url>
+ <id>archiva-repository.releases</id>
+ <name>Apache Release Staging Repository</name>
+ <url>https://archiva-repository.apache.org/archiva/repository/archiva-releases-stage/</url>
</repository>
+ <snapshotRepository>
+ <id>archiva-repository.snapshots</id>
+ <name>Apache Development Snapshot Repository</name>
+ <url>https://archiva-repository.apache.org/archiva/repository/snapshots/</url>
+ </snapshotRepository>
</distributionManagement>
</project>