Author: jwross
Date: Tue Jul 12 17:03:03 2011
New Revision: 1145676
URL: http://svn.apache.org/viewvc?rev=1145676&view=rev
Log:
ARIES-708: org.apache.aries.util pom should point to java6-parent, not
java5-parent
Set org.apache.aries.util pom back to java5-parent. Set java5-parent project
pom to accept 1.6 source but still target 1.5. This results in no @Override
compile errors on implemented interface methods but still enforces java 5
compatibility on org.apache.aries.util.
Modified:
aries/trunk/parent/default-parent/java5-parent/pom.xml
aries/trunk/util/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=1145676&r1=1145675&r2=1145676&view=diff
==============================================================================
--- aries/trunk/parent/default-parent/java5-parent/pom.xml (original)
+++ aries/trunk/parent/default-parent/java5-parent/pom.xml Tue Jul 12 17:03:03
2011
@@ -38,7 +38,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
+ <source>1.6</source>
<target>1.5</target>
</configuration>
</plugin>
Modified: aries/trunk/util/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/util/pom.xml?rev=1145676&r1=1145675&r2=1145676&view=diff
==============================================================================
--- aries/trunk/util/pom.xml (original)
+++ aries/trunk/util/pom.xml Tue Jul 12 17:03:03 2011
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.aries</groupId>
- <artifactId>java6-parent</artifactId>
+ <artifactId>java5-parent</artifactId>
<version>0.4.1-SNAPSHOT</version>
<relativePath />
</parent>
