You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2014/04/13 15:09:33 UTC
svn commit: r1586976 - /maven/indexer/trunk/pom.xml
Author: hboutemy
Date: Sun Apr 13 13:09:33 2014
New Revision: 1586976
URL: http://svn.apache.org/r1586976
Log:
svnpubsub configuration simplification (cannot upgrade parent pom because enforceBytecode find 1.6 in dependencies)
Modified:
maven/indexer/trunk/pom.xml
Modified: maven/indexer/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/indexer/trunk/pom.xml?rev=1586976&r1=1586975&r2=1586976&view=diff
==============================================================================
--- maven/indexer/trunk/pom.xml (original)
+++ maven/indexer/trunk/pom.xml Sun Apr 13 13:09:33 2014
@@ -37,7 +37,7 @@ under the License.
of Maven repositories. The Indexes are produced and consumed by all major tools in the ecosystem.
</description>
- <url>${siteUrl}</url>
+ <url>http://maven.apache.org/maven-indexer/</url>
<contributors>
<contributor>
@@ -65,13 +65,16 @@ under the License.
<system>Jenkins</system>
<url>https://builds.apache.org/job/maven-indexer/</url>
</ciManagement>
+ <distributionManagement>
+ <site>
+ <id>apache.website</id>
+ <url>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/content/${maven.site.path}</url>
+ </site>
+ </distributionManagement>
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<surefire.redirectTestOutputToFile>false</surefire.redirectTestOutputToFile>
- <siteUrl>http://maven.apache.org/maven-indexer-archives/maven-indexer-${project.version}</siteUrl>
-
<sisu-inject-plexus.version>2.2.3</sisu-inject-plexus.version>
<lucene.version>3.6.2</lucene.version>
<maven.version>3.0.4</maven.version>
@@ -80,21 +83,9 @@ under the License.
<wagon.version>2.3</wagon.version>
<truezip.version>7.6.6</truezip.version>
- <maven.site.cache>${user.home}/maven-sites</maven.site.cache>
- <maven.indexer.siteFilePath>${maven.site.cache}/maven-indexer-${project.version}</maven.indexer.siteFilePath>
- <maven.indexer.siteUrlDeployment>file://${maven.indexer.siteFilePath}</maven.indexer.siteUrlDeployment>
- <maven.indexer.scmPubCheckoutDirectory>${maven.site.cache}/maven-indexer-site-content-${project.version}</maven.indexer.scmPubCheckoutDirectory>
- <maven.indexer.scmPubUrl>https://svn.apache.org/repos/infra/websites/production/maven/content/maven-indexer-archives/maven-indexer-${project.version}</maven.indexer.scmPubUrl>
-
+ <maven.site.path>maven-indexer-archives/maven-indexer-LATEST</maven.site.path>
</properties>
- <distributionManagement>
- <site>
- <id>apache.website</id>
- <url>${maven.indexer.siteUrlDeployment}</url>
- </site>
- </distributionManagement>
-
<dependencyManagement>
<dependencies>
<dependency>
@@ -225,7 +216,7 @@ under the License.
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>0.8</version>
+ <version>0.10</version>
<executions>
<execution>
<id>rat-verify</id>
@@ -281,17 +272,17 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.2</version>
+ <version>3.3</version>
+ <configuration>
+ <topSiteURL>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/content/${maven.site.path}</topSiteURL>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-publish-plugin</artifactId>
- <version>1.0-beta-2</version>
+ <version>1.0</version>
<configuration>
- <checkoutDirectory>${maven.indexer.scmPubCheckoutDirectory}</checkoutDirectory>
- <pubScmUrl>scm:svn:${maven.indexer.scmPubUrl}</pubScmUrl>
- <checkinComment>Apache Maven Indexer site deployment</checkinComment>
- <content>${maven.indexer.siteFilePath}</content>
+ <checkoutDirectory>${maven.site.cache}/${maven.site.path}</checkoutDirectory>
<tryUpdate>true</tryUpdate>
</configuration>
</plugin>
@@ -310,12 +301,12 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.6</version>
+ <version>2.7</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9</version>
+ <version>2.9.1</version>
<configuration>
<notimestamp>true</notimestamp>
</configuration>
@@ -331,18 +322,4 @@ under the License.
</plugin>
</plugins>
</reporting>
-
- <profiles>
- <profile>
- <id>site-release</id>
-
- <properties>
- <siteUrl>http://maven.apache.org/maven-indexer/</siteUrl>
- <maven.indexer.siteFilePath>${maven.site.cache}/maven-indexer</maven.indexer.siteFilePath>
- <maven.indexer.siteUrlDeployment>file://${maven.indexer.siteFilePath}</maven.indexer.siteUrlDeployment>
- <maven.indexer.scmPubCheckoutDirectory>${maven.site.cache}/maven-indexer-site-content</maven.indexer.scmPubCheckoutDirectory>
- <maven.indexer.scmPubUrl>https://svn.apache.org/repos/infra/websites/production/maven/content/maven-indexer</maven.indexer.scmPubUrl>
- </properties>
- </profile>
- </profiles>
</project>