Author: timothyjward
Date: Tue May 7 10:11:37 2013
New Revision: 1479837
URL: http://svn.apache.org/r1479837
Log:
ARIES-1006 : Get Aries building on JDK 7 - fixes for Aries parent
Modified:
aries/trunk/parent/default-parent/java5-parent/pom.xml
aries/trunk/parent/default-parent/java6-parent/pom.xml
aries/trunk/parent/default-parent/pom.xml
aries/trunk/parent/pom.xml
Modified: aries/trunk/parent/default-parent/java5-parent/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/parent/default-parent/java5-parent/pom.xml?rev=1479837&r1=1479836&r2=1479837&view=diff
==============================================================================
--- aries/trunk/parent/default-parent/java5-parent/pom.xml (original)
+++ aries/trunk/parent/default-parent/java5-parent/pom.xml Tue May 7 10:11:37
2013
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>default-parent</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
<artifactId>java5-parent</artifactId>
Modified: aries/trunk/parent/default-parent/java6-parent/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/parent/default-parent/java6-parent/pom.xml?rev=1479837&r1=1479836&r2=1479837&view=diff
==============================================================================
--- aries/trunk/parent/default-parent/java6-parent/pom.xml (original)
+++ aries/trunk/parent/default-parent/java6-parent/pom.xml Tue May 7 10:11:37
2013
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>default-parent</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
<artifactId>java6-parent</artifactId>
Modified: aries/trunk/parent/default-parent/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/parent/default-parent/pom.xml?rev=1479837&r1=1479836&r2=1479837&view=diff
==============================================================================
--- aries/trunk/parent/default-parent/pom.xml (original)
+++ aries/trunk/parent/default-parent/pom.xml Tue May 7 10:11:37 2013
@@ -25,10 +25,11 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>parent</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.0.0</version>
</parent>
<artifactId>default-parent</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
<name>Aries :: Default Parent POM</name>
<packaging>pom</packaging>
@@ -356,25 +357,23 @@
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.7</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.1</version>
+ <configuration>
+ <optimize>true</optimize>
+ <debug>true</debug>
+ <showDeprecation>true</showDeprecation>
+ <showWarnings>true</showWarnings>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <optimize>true</optimize>
- <debug>true</debug>
- <showDeprecation>true</showDeprecation>
- <showWarnings>true</showWarnings>
- <fork>true</fork>
- <compilerArgument>-Xlint:-options</compilerArgument>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
<executions>
<execution>
Modified: aries/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/parent/pom.xml?rev=1479837&r1=1479836&r2=1479837&view=diff
==============================================================================
--- aries/trunk/parent/pom.xml (original)
+++ aries/trunk/parent/pom.xml Tue May 7 10:11:37 2013
@@ -32,7 +32,7 @@
<groupId>org.apache.aries</groupId>
<artifactId>parent</artifactId>
<name>Aries :: Top Parent POM</name>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<description>
