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/12 17:30:25 UTC
git commit: updated parent pom
Repository: maven
Updated Branches:
refs/heads/master 8e53ed0f6 -> 537220954
updated parent pom
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/53722095
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/53722095
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/53722095
Branch: refs/heads/master
Commit: 537220954412102f42681869f76416b9f2803d3c
Parents: 8e53ed0
Author: Hervé Boutemy <hb...@apache.org>
Authored: Sat Apr 12 17:30:12 2014 +0200
Committer: Hervé Boutemy <hb...@apache.org>
Committed: Sat Apr 12 17:30:12 2014 +0200
----------------------------------------------------------------------
pom.xml | 74 +++++++++++++++++++++---------------------------------------
1 file changed, 26 insertions(+), 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/53722095/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a779dd7..e282289 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>23</version>
+ <version>24</version>
<relativePath>../pom/maven/pom.xml</relativePath>
</parent>
@@ -42,6 +42,8 @@
<inceptionYear>2001</inceptionYear>
<properties>
+ <maven.compiler.source>1.6</maven.compiler.source>
+ <maven.compiler.target>1.6</maven.compiler.target>
<classWorldsVersion>2.5.1</classWorldsVersion>
<commonsCliVersion>1.2</commonsCliVersion>
<easyMockVersion>1.2_Java1.3</easyMockVersion>
@@ -87,7 +89,7 @@
<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://github.com/apache/maven/tree/${project.scm.tag}</url>
- <tag>HEAD</tag>
+ <tag>master</tag>
</scm>
<issueManagement>
<system>jira</system>
@@ -363,15 +365,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<configuration>
<autoVersionSubmodules>true</autoVersionSubmodules>
@@ -380,7 +373,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.16</version>
<configuration>
<argLine>-Xmx256m</argLine>
</configuration>
@@ -414,11 +406,6 @@
<version>1.0.0</version>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.4</version>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
<version>1.2</version>
@@ -426,7 +413,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.3</version><!-- TODO remove when upgrading parent to 24 -->
<configuration>
<topSiteURL>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/content/${maven.site.path}</topSiteURL>
</configuration>
@@ -439,18 +425,8 @@
</dependencies>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-scm-publish-plugin</artifactId>
- <version>1.0</version>
- <configuration>
- <checkoutDirectory>${maven.site.cache}/${maven.site.path}</checkoutDirectory>
- <tryUpdate>true</tryUpdate>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>0.10</version><!-- TODO remove when upgrading parent to 24 -->
<configuration>
<excludes>
<exclude>src/test/resources*/**</exclude>
@@ -466,7 +442,7 @@
<goal>check</goal>
</goals>
</execution>
- </executions>
+ </executions>
</plugin>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
<plugin>
@@ -517,10 +493,29 @@
</execution>
</executions>
</plugin>
+ <plugin><!-- TODO remove when upgrading to maven-parent 25 -->
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enforce-bytecode-version</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <enforceBytecodeVersion>
+ <maxJdkVersion>${maven.compiler.target}</maxJdkVersion>
+ </enforceBytecodeVersion>
+ </rules>
+ <fail>true</fail>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-doap-plugin</artifactId>
- <version>1.1</version>
+ <version>1.1</version>
<configuration>
<asfExtOptions>
<charter>The mission of the Apache Maven project is to create and maintain software
@@ -533,7 +528,7 @@
</plugin>
<plugin>
<groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
+ <artifactId>apache-rat-plugin</artifactId>
<configuration>
<excludes combine.children="append">
<exclude>bootstrap/**</exclude>
@@ -547,16 +542,6 @@
</plugins>
</build>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.7</version>
- </plugin>
- </plugins>
- </reporting>
-
<profiles>
<profile>
<id>apache-release</id>
@@ -583,13 +568,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.7</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9.1</version>
<configuration>
<linksource>true</linksource>
<notimestamp>true</notimestamp>
@@ -611,7 +590,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
- <version>2.4</version>
<reportSets>
<reportSet>
<id>aggregate</id>