Author: timothyjward
Date: Tue May 7 10:33:56 2013
New Revision: 1479845
URL: http://svn.apache.org/r1479845
Log:
ARIES-1006 : Get Aries building on JDK 7 - fixes for Aries util
Modified:
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/util/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/util/pom.xml?rev=1479845&r1=1479844&r2=1479845&view=diff
==============================================================================
--- aries/trunk/util/pom.xml (original)
+++ aries/trunk/util/pom.xml Tue May 7 10:33:56 2013
@@ -21,13 +21,13 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>java5-parent</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath />
</parent>
<artifactId>org.apache.aries.util-parent</artifactId>
<packaging>pom</packaging>
- <version>1.1.2-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
<name>Apache Aries Util</name>
<description>
Modified: aries/trunk/util/util-r42/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/util/util-r42/pom.xml?rev=1479845&r1=1479844&r2=1479845&view=diff
==============================================================================
--- aries/trunk/util/util-r42/pom.xml (original)
+++ aries/trunk/util/util-r42/pom.xml Tue May 7 10:33:56 2013
@@ -21,13 +21,13 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>java5-parent</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath />
</parent>
<artifactId>org.apache.aries.util-r42</artifactId>
<packaging>jar</packaging>
- <version>1.1.2-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
<name>Apache Aries Util classes compiled under r 42 framework</name>
<description>
This bundle contains the OSGi common util for Apache Aries classes
that need to be compiled under r 4.2
@@ -83,7 +83,7 @@
<dependency>
<groupId>org.apache.aries.testsupport</groupId>
<artifactId>org.apache.aries.testsupport.unit</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: aries/trunk/util/util/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/util/util/pom.xml?rev=1479845&r1=1479844&r2=1479845&view=diff
==============================================================================
--- aries/trunk/util/util/pom.xml (original)
+++ aries/trunk/util/util/pom.xml Tue May 7 10:33:56 2013
@@ -21,13 +21,13 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>java5-parent</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath />
</parent>
<artifactId>org.apache.aries.util</artifactId>
<packaging>bundle</packaging>
- <version>1.1.2-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
<name>Apache Aries Util</name>
<description>
This bundle contains the OSGi common util for Apache Aries
@@ -63,13 +63,13 @@
<dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util-r42</artifactId>
- <version>1.1.2-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>4.3.0</version>
+ <version>4.3.1</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -85,7 +85,7 @@
<dependency>
<groupId>org.apache.aries.testsupport</groupId>
<artifactId>org.apache.aries.testsupport.unit</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
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=1479845&r1=1479844&r2=1479845&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
Tue May 7 10:33:56 2013
@@ -33,9 +33,7 @@ public class R43Worker implements Framew
}
public ClassLoader getClassLoader(Bundle b) {
- //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();
+ return b.adapt(BundleWiring.class).getClassLoader();
}
public boolean isValid() {
