Author: timothyjward
Date: Fri May 3 13:41:27 2013
New Revision: 1478788
URL: http://svn.apache.org/r1478788
Log:
ARIES-1006 : Get Aries building on JDK 7
Modified:
aries/trunk/parent/default-parent/pom.xml
aries/trunk/util/pom.xml
aries/trunk/util/util-r42/pom.xml
aries/trunk/util/util/pom.xml
aries/trunk/util/util/src/main/java/org/apache/aries/util/internal/R43Worker.java
Modified: aries/trunk/parent/default-parent/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/parent/default-parent/pom.xml?rev=1478788&r1=1478787&r2=1478788&view=diff
==============================================================================
--- aries/trunk/parent/default-parent/pom.xml (original)
+++ aries/trunk/parent/default-parent/pom.xml Fri May 3 13:41:27 2013
@@ -368,6 +368,8 @@
<debug>true</debug>
<showDeprecation>true</showDeprecation>
<showWarnings>true</showWarnings>
+ <fork>true</fork>
+ <compilerArgument>-Xlint:-options</compilerArgument>
</configuration>
</plugin>
Modified: aries/trunk/util/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/util/pom.xml?rev=1478788&r1=1478787&r2=1478788&view=diff
==============================================================================
--- aries/trunk/util/pom.xml (original)
+++ aries/trunk/util/pom.xml Fri May 3 13:41:27 2013
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>java5-parent</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath />
</parent>
Modified: aries/trunk/util/util-r42/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/util/util-r42/pom.xml?rev=1478788&r1=1478787&r2=1478788&view=diff
==============================================================================
--- aries/trunk/util/util-r42/pom.xml (original)
+++ aries/trunk/util/util-r42/pom.xml Fri May 3 13:41:27 2013
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>java5-parent</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath />
</parent>
Modified: aries/trunk/util/util/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/util/util/pom.xml?rev=1478788&r1=1478787&r2=1478788&view=diff
==============================================================================
--- aries/trunk/util/util/pom.xml (original)
+++ aries/trunk/util/util/pom.xml Fri May 3 13:41:27 2013
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>java5-parent</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath />
</parent>
Modified:
aries/trunk/util/util/src/main/java/org/apache/aries/util/internal/R43Worker.java
URL:
http://svn.apache.org/viewvc/aries/trunk/util/util/src/main/java/org/apache/aries/util/internal/R43Worker.java?rev=1478788&r1=1478787&r2=1478788&view=diff
==============================================================================
---
aries/trunk/util/util/src/main/java/org/apache/aries/util/internal/R43Worker.java
(original)
+++
aries/trunk/util/util/src/main/java/org/apache/aries/util/internal/R43Worker.java
Fri May 3 13:41:27 2013
@@ -33,7 +33,9 @@ public class R43Worker implements Framew
}
public ClassLoader getClassLoader(Bundle b) {
- return b.adapt(BundleWiring.class).getClassLoader();
+ //This cast should be unnecessary, but without it I get a compile
failure
+ //when using Maven 3.0.4, Java 7.0.21 and MacOSX 10.8.3
+ return ((BundleWiring)b.adapt(BundleWiring.class)).getClassLoader();
}
public boolean isValid() {
