SLING-10045 update dependencies to 2018
no longer required to inline org.apache.sling.commons.osgi
diff --git a/core/pom.xml b/core/pom.xml
index d31d222..3c57e79 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.osgi-mock.parent</artifactId>
- <version>2.4.19-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
@@ -35,6 +35,23 @@
<dependencies>
<dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.cmpn</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.commons.osgi</artifactId>
+ <version>2.4.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
<version>4.1</version>
@@ -43,13 +60,13 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.3.2</version>
+ <version>3.6</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.4</version>
+ <version>2.5</version>
<scope>compile</scope>
</dependency>
@@ -91,16 +108,9 @@
<!-- Artifact is shaded and inlined, only some classes included (see below) -->
<dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.commons.osgi</artifactId>
- <version>2.4.0</version>
- <scope>compile</scope>
- </dependency>
- <!-- Artifact is shaded and inlined, only some classes included (see below) -->
- <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
- <version>5.0.0</version>
+ <version>5.6.10</version>
<scope>compile</scope>
</dependency>
<!-- Artifact is shaded and inlined, only some classes included (see below) -->
@@ -199,17 +209,12 @@
<shadeSourcesContent>true</shadeSourcesContent>
<artifactSet>
<includes>
- <include>org.apache.sling:org.apache.sling.commons.osgi</include>
<include>org.apache.felix:org.apache.felix.framework</include>
<include>org.apache.felix:org.apache.felix.scr</include>
</includes>
</artifactSet>
<relocations>
<relocation>
- <pattern>org.apache.sling.commons.osgi</pattern>
- <shadedPattern>osgimock.org.apache.sling.commons.osgi</shadedPattern>
- </relocation>
- <relocation>
<pattern>org.apache.felix.framework</pattern>
<shadedPattern>osgimock.org.apache.felix.framework</shadedPattern>
</relocation>
@@ -220,13 +225,6 @@
</relocations>
<filters>
<filter>
- <artifact>org.apache.sling:org.apache.sling.commons.osgi</artifact>
- <includes>
- <include>org/apache/sling/commons/osgi/ServiceUtil*</include>
- <include>org/apache/sling/commons/osgi/Order*</include>
- </includes>
- </filter>
- <filter>
<artifact>org.apache.felix:org.apache.felix.framework</artifact>
<includes>
<include>org/apache/felix/framework/**</include>
diff --git a/core/src/test/java/org/apache/sling/testing/mock/osgi/MockEventAdminTest.java b/core/src/test/java/org/apache/sling/testing/mock/osgi/MockEventAdminTest.java
index 9e1ca1d..74c2b39 100644
--- a/core/src/test/java/org/apache/sling/testing/mock/osgi/MockEventAdminTest.java
+++ b/core/src/test/java/org/apache/sling/testing/mock/osgi/MockEventAdminTest.java
@@ -101,7 +101,7 @@
assertEquals(ImmutableList.of(EVENT_OTHER_3), eventHandlerAll.getReceivedEvents());
}
- @Test(timeout = 2000)
+ @Test(timeout = 3000)
public void testPostEvents() {
EventAdmin eventAdmin = context.getService(EventAdmin.class);
eventAdmin.postEvent(EVENT_SAMPLE_2);
diff --git a/junit4/pom.xml b/junit4/pom.xml
index c499848..2d08139 100644
--- a/junit4/pom.xml
+++ b/junit4/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.osgi-mock.parent</artifactId>
- <version>2.4.19-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
@@ -37,18 +37,29 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.osgi-mock.core</artifactId>
- <version>2.4.19-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.osgi-mock.core</artifactId>
- <version>2.4.19-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.cmpn</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
diff --git a/junit5/pom.xml b/junit5/pom.xml
index 821a4f8..b006272 100644
--- a/junit5/pom.xml
+++ b/junit5/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.osgi-mock.parent</artifactId>
- <version>2.4.19-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
@@ -37,18 +37,29 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.osgi-mock.core</artifactId>
- <version>2.4.19-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.osgi-mock.core</artifactId>
- <version>2.4.19-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.cmpn</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
diff --git a/parent/pom.xml b/parent/pom.xml
index a69e963..b67b451 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -28,7 +28,7 @@
</parent>
<artifactId>org.apache.sling.testing.osgi-mock.parent</artifactId>
- <version>2.4.19-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Sling Testing OSGi Mock Parent</name>
@@ -41,16 +41,6 @@
<artifactId>org.osgi.annotation.versioning</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <scope>provided</scope>
- </dependency>
<!-- Nullability annotations -->
<dependency>
@@ -67,12 +57,12 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>3.1.0</version>
+ <version>3.7.0</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
- <version>3.1.0</version>
+ <version>3.7.0</version>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
diff --git a/pom.xml b/pom.xml
index 4da58b1..b6127dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.osgi-mock.parent</artifactId>
- <version>2.4.19-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath>parent/pom.xml</relativePath>
</parent>
diff --git a/relocate/pom.xml b/relocate/pom.xml
index 392fda7..1cc367f 100644
--- a/relocate/pom.xml
+++ b/relocate/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.osgi-mock.parent</artifactId>
- <version>2.4.19-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
