Author: dkulp
Date: Thu Jun 5 17:56:21 2014
New Revision: 1600712
URL: http://svn.apache.org/r1600712
Log:
spy fly build with java6, maven 3.2.1
Modified:
aries/trunk/spi-fly/spi-fly-core/pom.xml
aries/trunk/spi-fly/spi-fly-core/src/test/java/org/apache/aries/spifly/ProviderBundleTrackerCustomizerGenericCapabilityTest.java
aries/trunk/spi-fly/spi-fly-core/src/test/java/org/apache/aries/spifly/UtilTest.java
aries/trunk/spi-fly/spi-fly-dynamic-bundle/pom.xml
aries/trunk/spi-fly/spi-fly-static-bundle/pom.xml
Modified: aries/trunk/spi-fly/spi-fly-core/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-core/pom.xml?rev=1600712&r1=1600711&r2=1600712&view=diff
==============================================================================
--- aries/trunk/spi-fly/spi-fly-core/pom.xml (original)
+++ aries/trunk/spi-fly/spi-fly-core/pom.xml Thu Jun 5 17:56:21 2014
@@ -73,7 +73,7 @@
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
- <version>3.0</version>
+ <version>3.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified:
aries/trunk/spi-fly/spi-fly-core/src/test/java/org/apache/aries/spifly/ProviderBundleTrackerCustomizerGenericCapabilityTest.java
URL:
http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-core/src/test/java/org/apache/aries/spifly/ProviderBundleTrackerCustomizerGenericCapabilityTest.java?rev=1600712&r1=1600711&r2=1600712&view=diff
==============================================================================
---
aries/trunk/spi-fly/spi-fly-core/src/test/java/org/apache/aries/spifly/ProviderBundleTrackerCustomizerGenericCapabilityTest.java
(original)
+++
aries/trunk/spi-fly/spi-fly-core/src/test/java/org/apache/aries/spifly/ProviderBundleTrackerCustomizerGenericCapabilityTest.java
Thu Jun 5 17:56:21 2014
@@ -43,7 +43,10 @@ import org.apache.aries.spifly.impl4.MyS
import org.apache.aries.spifly.impl4.MySPIImpl4c;
import org.easymock.EasyMock;
import org.easymock.IAnswer;
+import org.easymock.IExpectationSetters;
+
import org.junit.Test;
+
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
@@ -441,18 +444,21 @@ public class ProviderBundleTrackerCustom
private BundleContext mockSPIBundleContext4() {
BundleContext implBC = EasyMock.createNiceMock(BundleContext.class);
- EasyMock.expect(implBC.registerService((String) EasyMock.anyObject(),
EasyMock.anyObject(), (Dictionary<String,?>)EasyMock.anyObject())).
- andAnswer(new IAnswer<ServiceRegistration<?>>() {
- @Override
- public ServiceRegistration<?> answer() throws Throwable {
- final String className = (String)
EasyMock.getCurrentArguments()[0];
- final Object serviceObject =
EasyMock.getCurrentArguments()[1];
- final Dictionary<String, Object> registrationProps =
- (Dictionary<String, Object>)
EasyMock.getCurrentArguments()[2];
- return new ServiceRegistrationImpl(className,
serviceObject, registrationProps);
- }
- }).anyTimes();
-
EasyMock.expect(implBC.getService(EasyMock.anyObject(ServiceReference.class))).
+ implBC.registerService(EasyMock.anyString(),
+ EasyMock.anyObject(),
+ (Dictionary<String,?>)EasyMock.anyObject());
+ EasyMock.expectLastCall().andAnswer(new
IAnswer<ServiceRegistration<Object>>() {
+ @Override
+ public ServiceRegistration<Object> answer() throws Throwable {
+ final String className = (String)
EasyMock.getCurrentArguments()[0];
+ final Object serviceObject = EasyMock.getCurrentArguments()[1];
+ final Dictionary<String, Object> registrationProps =
+ (Dictionary<String, Object>)
EasyMock.getCurrentArguments()[2];
+ return new ServiceRegistrationImpl(className, serviceObject,
registrationProps);
+ }
+ }).anyTimes();
+ implBC.getService(EasyMock.anyObject(ServiceReference.class));
+ EasyMock.expectLastCall().
andAnswer(new IAnswer<Object>() {
@Override
public Object answer() throws Throwable {
Modified:
aries/trunk/spi-fly/spi-fly-core/src/test/java/org/apache/aries/spifly/UtilTest.java
URL:
http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-core/src/test/java/org/apache/aries/spifly/UtilTest.java?rev=1600712&r1=1600711&r2=1600712&view=diff
==============================================================================
---
aries/trunk/spi-fly/spi-fly-core/src/test/java/org/apache/aries/spifly/UtilTest.java
(original)
+++
aries/trunk/spi-fly/spi-fly-core/src/test/java/org/apache/aries/spifly/UtilTest.java
Thu Jun 5 17:56:21 2014
@@ -84,7 +84,8 @@ public class UtilTest {
providerHeaders.put(Constants.BUNDLE_CLASSPATH, ".,embedded3.jar");
EasyMock.expect(providerBundle.getHeaders()).andReturn(providerHeaders).anyTimes();
EasyMock.expect(providerBundle.getResource("embedded3.jar")).andReturn(url).anyTimes();
- EasyMock.expect(providerBundle.loadClass((String)
EasyMock.anyObject())).andAnswer(new IAnswer<Class<?>>() {
+ providerBundle.loadClass((String) EasyMock.anyObject());
+ EasyMock.expectLastCall().andAnswer(new IAnswer<Class<?>>() {
@Override
public Class<?> answer() throws Throwable {
return providerCL.loadClass((String)
EasyMock.getCurrentArguments()[0]);
@@ -117,7 +118,8 @@ public class UtilTest {
providerHeaders.put(Constants.BUNDLE_CLASSPATH, ".,embedded3.jar");
EasyMock.expect(providerBundle.getHeaders()).andReturn(providerHeaders).anyTimes();
EasyMock.expect(providerBundle.getResource("embedded3.jar")).andReturn(url).anyTimes();
- EasyMock.expect(providerBundle.loadClass((String)
EasyMock.anyObject())).andAnswer(new IAnswer<Class<?>>() {
+ providerBundle.loadClass((String) EasyMock.anyObject());
+ EasyMock.expectLastCall().andAnswer(new IAnswer<Class<?>>() {
@Override
public Class<?> answer() throws Throwable {
return providerCL.loadClass((String)
EasyMock.getCurrentArguments()[0]);
Modified: aries/trunk/spi-fly/spi-fly-dynamic-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-dynamic-bundle/pom.xml?rev=1600712&r1=1600711&r2=1600712&view=diff
==============================================================================
--- aries/trunk/spi-fly/spi-fly-dynamic-bundle/pom.xml (original)
+++ aries/trunk/spi-fly/spi-fly-dynamic-bundle/pom.xml Thu Jun 5 17:56:21 2014
@@ -44,6 +44,9 @@
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/spi-fly/spi-fly-dynamic-bundle</developerConnection>
<url>http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-dynamic-bundle</url>
</scm>
+ <properties>
+ <lastReleaseVersion>1.0.0</lastReleaseVersion>
+ </properties>
<dependencies>
<dependency>
@@ -128,7 +131,6 @@
<plugin>
<groupId>org.apache.aries.versioning</groupId>
<artifactId>org.apache.aries.versioning.plugin</artifactId>
- <version>0.1.0</version>
<executions>
<execution>
<id>default-verify</id>
@@ -136,10 +138,6 @@
<goals>
<goal>version-check</goal>
</goals>
- <configuration>
-
<oldArtifact>org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:1.0.0
- </oldArtifact>
- </configuration>
</execution>
</executions>
</plugin>
Modified: aries/trunk/spi-fly/spi-fly-static-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-static-bundle/pom.xml?rev=1600712&r1=1600711&r2=1600712&view=diff
==============================================================================
--- aries/trunk/spi-fly/spi-fly-static-bundle/pom.xml (original)
+++ aries/trunk/spi-fly/spi-fly-static-bundle/pom.xml Thu Jun 5 17:56:21 2014
@@ -44,6 +44,9 @@
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/spi-fly/spi-fly-static-bundle</developerConnection>
<url>http://svn.apache.org/viewvc/aries/trunk/spi-fly/spi-fly-static-bundle</url>
</scm>
+ <properties>
+ <lastReleaseVersion>1.0.0</lastReleaseVersion>
+ </properties>
<dependencies>
<dependency>
@@ -90,7 +93,6 @@
<plugin>
<groupId>org.apache.aries.versioning</groupId>
<artifactId>org.apache.aries.versioning.plugin</artifactId>
- <version>0.1.0</version>
<executions>
<execution>
<id>default-verify</id>
@@ -98,10 +100,6 @@
<goals>
<goal>version-check</goal>
</goals>
- <configuration>
-
<oldArtifact>org.apache.aries.spifly:org.apache.aries.spifly.static.bundle:1.0.0
- </oldArtifact>
- </configuration>
</execution>
</executions>
</plugin>
