updated parent pom

git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/trunk@1590365 13f79535-47bb-0310-9956-ffa450edef68
master
Herve Boutemy 2014-04-27 09:23:37 +00:00
parent 52446a83ea
commit 837f681ee8
3 changed files with 31 additions and 45 deletions

View File

@ -19,4 +19,5 @@
# under the License. # under the License.
# #
mvn clean site-deploy scm-publish:publish-scm $@ mvn -Preporting site site:stage $@
mvn scm-publish:publish-scm $@

View File

@ -44,6 +44,28 @@
</dependency> </dependency>
</dependencies> </dependencies>
<build>
<plugins>
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
<id>enforce-bytecode-version</id>
<configuration>
<rules>
<enforceBytecodeVersion>
<excludes>
<exclude>com.sun:tools</exclude>
</excludes>
</enforceBytecodeVersion>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<profiles> <profiles>
<profile> <profile>
<id>default-tools.jar</id> <id>default-tools.jar</id>

51
pom.xml
View File

@ -23,7 +23,7 @@
<parent> <parent>
<artifactId>maven-parent</artifactId> <artifactId>maven-parent</artifactId>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
<version>23</version> <version>24</version>
<relativePath>../pom/maven/pom.xml</relativePath> <relativePath>../pom/maven/pom.xml</relativePath>
</parent> </parent>
@ -37,7 +37,7 @@
The Maven Plugin Tools contains the necessary tools to be able to produce Maven Plugins in scripting languages The Maven Plugin Tools contains the necessary tools to be able to produce Maven Plugins in scripting languages
and to generate rebarbative content like descriptor, help and documentation. and to generate rebarbative content like descriptor, help and documentation.
</description> </description>
<url>${maven.pluginTools.url}</url> <url>http://maven.apache.org/plugin-tools</url>
<inceptionYear>2004</inceptionYear> <inceptionYear>2004</inceptionYear>
<mailingLists> <mailingLists>
@ -160,7 +160,7 @@
<distributionManagement> <distributionManagement>
<site> <site>
<id>apache.website</id> <id>apache.website</id>
<url>${maven.pluginTools.siteUrlDeployment}</url> <url>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/content/${maven.site.path}</url>
</site> </site>
</distributionManagement> </distributionManagement>
@ -169,13 +169,7 @@
<mavenVersion>2.2.1</mavenVersion> <mavenVersion>2.2.1</mavenVersion>
<antVersion>1.7.1</antVersion> <antVersion>1.7.1</antVersion>
<mavenInvokerPluginVersion>1.8</mavenInvokerPluginVersion> <mavenInvokerPluginVersion>1.8</mavenInvokerPluginVersion>
<maven.site.path>plugin-tools-archives/plugin-tools-LATEST</maven.site.path>
<maven.pluginTools.siteFilePath>${maven.site.cache}/maven-scm-${project.version}</maven.pluginTools.siteFilePath>
<maven.pluginTools.siteUrlDeployment>file://${maven.pluginTools.siteFilePath}</maven.pluginTools.siteUrlDeployment>
<maven.pluginTools.scmPubCheckoutDirectory>${maven.site.cache}/maven-plugin-tools-site-content-${project.version}</maven.pluginTools.scmPubCheckoutDirectory>
<maven.pluginTools.scmPubUrl>https://svn.apache.org/repos/infra/websites/production/maven/content/plugin-tools-archives/plugin-tools-${project.version}</maven.pluginTools.scmPubUrl>
<maven.pluginTools.url>http://maven.apache.org/plugin-tools-archives/plugin-tools-${project.version}</maven.pluginTools.url>
</properties> </properties>
<dependencyManagement> <dependencyManagement>
@ -251,7 +245,7 @@
<dependency> <dependency>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId> <artifactId>plexus-utils</artifactId>
<version>3.0</version> <version>3.0.15</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
@ -343,27 +337,11 @@
<build> <build>
<pluginManagement> <pluginManagement>
<plugins> <plugins>
<plugin> <plugin><!-- TODO remove when upgrading maven-parent to 25 -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.5</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-publish-plugin</artifactId>
<configuration>
<checkoutDirectory>${maven.pluginTools.scmPubCheckoutDirectory}</checkoutDirectory>
<pubScmUrl>scm:svn:${maven.pluginTools.scmPubUrl}</pubScmUrl>
<checkinComment>Apache Maven Plugin Tools site deployment</checkinComment>
<content>${maven.pluginTools.siteFilePath}</content>
<tryUpdate>true</tryUpdate>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId> <artifactId>maven-site-plugin</artifactId>
<configuration> <configuration>
<stagingSiteURL>scp://people.apache.org/www/maven.apache.org/plugin-tools-${project.version}</stagingSiteURL> <topSiteURL>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/content/${maven.site.path}</topSiteURL>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
@ -376,7 +354,6 @@
<plugin> <plugin>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-metadata</artifactId> <artifactId>plexus-component-metadata</artifactId>
<version>1.5.5</version>
<executions> <executions>
<execution> <execution>
<goals> <goals>
@ -398,7 +375,6 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>2.9</version>
<configuration> <configuration>
<linksource>true</linksource> <linksource>true</linksource>
<links combine.children="append"> <links combine.children="append">
@ -423,7 +399,6 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId> <artifactId>maven-jxr-plugin</artifactId>
<version>2.3</version>
<reportSets> <reportSets>
<reportSet> <reportSet>
<id>non-aggregate</id> <id>non-aggregate</id>
@ -442,7 +417,6 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId> <artifactId>maven-checkstyle-plugin</artifactId>
<version>2.9.1</version>
<reportSets> <reportSets>
<reportSet> <reportSet>
<id>non-aggregate</id> <id>non-aggregate</id>
@ -462,16 +436,5 @@
</plugins> </plugins>
</reporting> </reporting>
</profile> </profile>
<profile>
<id>site-release</id>
<properties>
<maven.pluginTools.siteFilePath>${maven.site.cache}/maven-plugin-tools</maven.pluginTools.siteFilePath>
<maven.pluginTools.scmPubCheckoutDirectory>${maven.site.cache}/plugin-tools</maven.pluginTools.scmPubCheckoutDirectory>
<maven.pluginTools.scmPubUrl>https://svn.apache.org/repos/infra/websites/production/maven/content/plugin-tools</maven.pluginTools.scmPubUrl>
<maven.pluginTools.url>http://maven.apache.org/plugin-tools</maven.pluginTools.url>
</properties>
</profile>
</profiles> </profiles>
</project> </project>