This is an automated email from the ASF dual-hosted git repository. cschneider pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/aries-rsa.git
The following commit(s) were added to refs/heads/master by this push: new 3b49157 ARIES-1937 - Require Java 8 3b49157 is described below commit 3b4915788406bbd0785efbd955fcd9c8f91e2034 Author: Christian Schneider <cschn...@adobe.com> AuthorDate: Tue Oct 29 08:23:13 2019 +0100 ARIES-1937 - Require Java 8 --- parent/pom.xml | 6 +++--- .../rsa/topologymanager/importer/TopologyManagerImportTest.java | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index b7c12d6..ab071f9 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -240,10 +240,10 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.8.0</version> + <version>3.8.1</version> <configuration> - <source>1.7</source> - <target>1.7</target> + <source>1.8</source> + <target>1.8</target> </configuration> </plugin> <plugin> diff --git a/topology-manager/src/test/java/org/apache/aries/rsa/topologymanager/importer/TopologyManagerImportTest.java b/topology-manager/src/test/java/org/apache/aries/rsa/topologymanager/importer/TopologyManagerImportTest.java index e93be3b..4f01fc1 100644 --- a/topology-manager/src/test/java/org/apache/aries/rsa/topologymanager/importer/TopologyManagerImportTest.java +++ b/topology-manager/src/test/java/org/apache/aries/rsa/topologymanager/importer/TopologyManagerImportTest.java @@ -35,6 +35,7 @@ import org.osgi.service.remoteserviceadmin.EndpointEvent; import org.osgi.service.remoteserviceadmin.ImportReference; import org.osgi.service.remoteserviceadmin.ImportRegistration; import org.osgi.service.remoteserviceadmin.RemoteServiceAdmin; +import org.osgi.service.remoteserviceadmin.RemoteServiceAdminListener; public class TopologyManagerImportTest { @@ -83,8 +84,8 @@ public class TopologyManagerImportTest { private BundleContext getBundleContext(IMocksControl c) { ServiceRegistration sreg = c.createMock(ServiceRegistration.class); BundleContext bc = c.createMock(BundleContext.class); - EasyMock.expect(bc.registerService(EasyMock.anyObject(Class.class), - EasyMock.anyObject(), + EasyMock.expect(bc.registerService(EasyMock.eq(RemoteServiceAdminListener.class), + EasyMock.anyObject(RemoteServiceAdminListener.class), (Dictionary)EasyMock.anyObject())).andReturn(sreg).anyTimes(); return bc; }