You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2015/07/29 08:21:28 UTC
svn commit: r1693185 - in /felix/trunk/framework: pom.xml
src/test/java/org/apache/felix/framework/BundleWiringImplTest.java
Author: cziegeler
Date: Wed Jul 29 06:21:27 2015
New Revision: 1693185
URL: http://svn.apache.org/r1693185
Log:
Update to use latest parent pom, and correctly set java 6 as minimum version
Modified:
felix/trunk/framework/pom.xml
felix/trunk/framework/src/test/java/org/apache/felix/framework/BundleWiringImplTest.java
Modified: felix/trunk/framework/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/framework/pom.xml?rev=1693185&r1=1693184&r2=1693185&view=diff
==============================================================================
--- felix/trunk/framework/pom.xml (original)
+++ felix/trunk/framework/pom.xml Wed Jul 29 06:21:27 2015
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>felix-parent</artifactId>
- <version>2.1</version>
+ <version>3</version>
<relativePath>../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -30,6 +30,7 @@
<version>5.1.0-SNAPSHOT</version>
<properties>
<dollar>$</dollar>
+ <felix.java.version>6</felix.java.version>
</properties>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/framework</connection>
@@ -40,15 +41,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <target>1.5</target>
- <source>1.5</source>
- </configuration>
- </plugin>
-
- <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>2.5.0</version>
@@ -65,7 +57,7 @@
org.osgi.resource.dto;-split-package:=first,
org.osgi.service.packageadmin;-split-package:=first,
org.osgi.service.startlevel;-split-package:=first,
- org.osgi.service.url;-split-package:=first,
+ org.osgi.service.url;-split-package:=first,
org.osgi.service.resolver,
org.osgi.util.tracker;-split-package:=first,
org.osgi.dto
@@ -144,11 +136,5 @@
<version>4.2</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>1.10.19</version>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
Modified: felix/trunk/framework/src/test/java/org/apache/felix/framework/BundleWiringImplTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/test/java/org/apache/felix/framework/BundleWiringImplTest.java?rev=1693185&r1=1693184&r2=1693185&view=diff
==============================================================================
--- felix/trunk/framework/src/test/java/org/apache/felix/framework/BundleWiringImplTest.java (original)
+++ felix/trunk/framework/src/test/java/org/apache/felix/framework/BundleWiringImplTest.java Wed Jul 29 06:21:27 2015
@@ -222,10 +222,10 @@ public class BundleWiringImplTest
assertEquals("There should be 2 state changes fired by the weaving", 2,
dummyWovenClassListener.stateList.size());
assertEquals("The first state change should transform the class",
- WovenClass.TRANSFORMED,
+ (Object)WovenClass.TRANSFORMED,
dummyWovenClassListener.stateList.get(0));
assertEquals("The second state change should define the class",
- WovenClass.DEFINED, dummyWovenClassListener.stateList.get(1));
+ (Object)WovenClass.DEFINED, dummyWovenClassListener.stateList.get(1));
}
@SuppressWarnings({ "unchecked", "rawtypes" })
@@ -292,7 +292,7 @@ public class BundleWiringImplTest
dummyWovenClassListener.stateList.size());
assertEquals(
"The only state change should be a failed transform on the class",
- WovenClass.TRANSFORMING_FAILED,
+ (Object)WovenClass.TRANSFORMING_FAILED,
dummyWovenClassListener.stateList.get(0));
}
@@ -358,10 +358,10 @@ public class BundleWiringImplTest
assertEquals("There should be 2 state changes fired by the weaving", 2,
dummyWovenClassListener.stateList.size());
assertEquals("The first state change should transform the class",
- WovenClass.TRANSFORMED,
+ (Object)WovenClass.TRANSFORMED,
dummyWovenClassListener.stateList.get(0));
assertEquals("The second state change failed the define on the class",
- WovenClass.DEFINE_FAILED,
+ (Object)WovenClass.DEFINE_FAILED,
dummyWovenClassListener.stateList.get(1));
}