You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by ro...@apache.org on 2021/04/04 14:21:41 UTC
[aries] 02/12: update to support java 16
This is an automated email from the ASF dual-hosted git repository.
rotty3000 pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/aries.git
commit 413c991cf5f2a1046df32189e661c6df2a80babd
Author: Raymond Auge <ro...@apache.org>
AuthorDate: Fri Apr 2 12:27:48 2021 -0400
update to support java 16
Signed-off-by: Raymond Auge <ro...@apache.org>
---
spi-fly/pom.xml | 141 ++++++++++++++++++++-
spi-fly/spi-fly-core/pom.xml | 14 +-
.../spifly/ProviderPrototypeServiceFactory.java | 2 +-
.../aries/spifly/ProviderServiceFactory.java | 2 +-
.../org/apache/aries/spifly/packageinfo | 2 +-
.../java/org/apache/aries/spifly/UtilTest.java | 2 +-
spi-fly/spi-fly-dynamic-bundle/pom.xml | 15 +--
.../ClientWeavingHookGenericCapabilityTest.java | 32 ++---
.../dynamic/ClientWeavingHookOSGi43Test.java | 2 +-
.../spifly/dynamic/ClientWeavingHookTest.java | 38 +++---
.../spi-fly-dynamic-framework-extension/pom.xml | 13 +-
spi-fly/spi-fly-static-bundle/pom.xml | 12 +-
spi-fly/spi-fly-static-tool/pom.xml | 8 +-
spi-fly/spi-fly-weaver/pom.xml | 12 +-
14 files changed, 199 insertions(+), 96 deletions(-)
diff --git a/spi-fly/pom.xml b/spi-fly/pom.xml
index 73fef80..0ce7449 100644
--- a/spi-fly/pom.xml
+++ b/spi-fly/pom.xml
@@ -22,16 +22,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries</groupId>
- <artifactId>parent</artifactId>
- <version>2.1.0</version>
- <relativePath>../parent/pom.xml</relativePath>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>23</version>
+ <relativePath />
</parent>
<groupId>org.apache.aries.spifly</groupId>
<artifactId>spifly</artifactId>
- <name>Apache Aries SPI Fly</name>
<version>1.3.3-SNAPSHOT</version>
+ <name>Apache Aries SPI Fly</name>
<packaging>pom</packaging>
<description>
SPI support for OSGi
@@ -42,7 +42,18 @@
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/aries.git</developerConnection>
<url>https://gitbox.apache.org/repos/asf?p=aries.git;a=summary</url>
<tag>HEAD</tag>
- </scm>
+ </scm>
+
+ <properties>
+ <apache-rat-plugin.version>0.13</apache-rat-plugin.version>
+ <asm.version>9.0</asm.version>
+ <bnd.version>5.3.0</bnd.version>
+ <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
+
+ <java.source.version>1.8</java.source.version>
+ </properties>
<modules>
<module>spi-fly-core</module>
@@ -56,8 +67,126 @@
-->
</modules>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ <version>1.7.30</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.13.2</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>3.0.0-M2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.aries.versioning</groupId>
+ <artifactId>org.apache.aries.versioning.plugin</artifactId>
+ <version>0.3.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>${maven-compiler-plugin.version}</version>
+ <configuration>
+ <optimize>true</optimize>
+ <debug>true</debug>
+ <showDeprecation>true</showDeprecation>
+ <showWarnings>true</showWarnings>
+ <source>${maven.compiler.source}</source>
+ <target>${maven.compiler.target}</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>3.0.0-M5</version>
+ <configuration>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <forkMode>once</forkMode>
+ <argLine>
+ -enableassertions
+ </argLine>
+ <failIfNoTests>false</failIfNoTests>
+ <workingDirectory>${project.build.directory}</workingDirectory>
+ <excludes>
+ <exclude>**/Abstract*.java</exclude>
+ <exclude>**/Test*.java</exclude>
+ </excludes>
+ <includes>
+ <include>**/*Test.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
<profiles>
<profile>
+ <activation>
+ <jdk>[9,)</jdk>
+ </activation>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>${maven-compiler-plugin.version}</version>
+ <configuration>
+ <optimize>true</optimize>
+ <debug>true</debug>
+ <showDeprecation>true</showDeprecation>
+ <showWarnings>true</showWarnings>
+ <source>${maven.compiler.source}</source>
+ <target>${maven.compiler.target}</target>
+ <release>${java.specification.version}</release>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>3.0.0-M5</version>
+ <configuration>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <forkMode>once</forkMode>
+ <argLine>
+ -enableassertions
+ --add-opens java.base/java.lang=ALL-UNNAMED
+ </argLine>
+ <failIfNoTests>false</failIfNoTests>
+ <workingDirectory>${project.build.directory}</workingDirectory>
+ <excludes>
+ <exclude>**/Abstract*.java</exclude>
+ <exclude>**/Test*.java</exclude>
+ </excludes>
+ <includes>
+ <include>**/*Test.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ </profile>
+ <profile>
<id>rat</id>
<activation>
<activeByDefault>true</activeByDefault>
diff --git a/spi-fly/spi-fly-core/pom.xml b/spi-fly/spi-fly-core/pom.xml
index 1362f07..77712c4 100644
--- a/spi-fly/spi-fly-core/pom.xml
+++ b/spi-fly/spi-fly-core/pom.xml
@@ -22,10 +22,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries</groupId>
- <artifactId>parent</artifactId>
- <version>2.1.0</version>
- <relativePath>../../parent/pom.xml</relativePath>
+ <groupId>org.apache.aries.spifly</groupId>
+ <artifactId>spifly</artifactId>
+ <version>1.3.3-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.spifly</groupId>
@@ -46,10 +46,6 @@
<tag>HEAD</tag>
</scm>
- <properties>
- <bnd.version>5.1.2</bnd.version>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
@@ -71,7 +67,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
@@ -82,7 +77,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
</dependency>
</dependencies>
</project>
diff --git a/spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/ProviderPrototypeServiceFactory.java b/spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/ProviderPrototypeServiceFactory.java
index 4055231..efe4ad7 100644
--- a/spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/ProviderPrototypeServiceFactory.java
+++ b/spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/ProviderPrototypeServiceFactory.java
@@ -32,7 +32,7 @@ public class ProviderPrototypeServiceFactory implements PrototypeServiceFactory
@Override
public Object getService(Bundle bundle, ServiceRegistration registration) {
try {
- return providerClass.newInstance();
+ return providerClass.getDeclaredConstructor().newInstance();
} catch (Exception e) {
throw new RuntimeException("Unable to instantiate class " + providerClass +
" Does it have a public no-arg constructor?", e);
diff --git a/spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/ProviderServiceFactory.java b/spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/ProviderServiceFactory.java
index 5246d1c..8fa4af9 100644
--- a/spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/ProviderServiceFactory.java
+++ b/spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/ProviderServiceFactory.java
@@ -32,7 +32,7 @@ public class ProviderServiceFactory implements ServiceFactory {
@Override
public Object getService(Bundle bundle, ServiceRegistration registration) {
try {
- return providerClass.newInstance();
+ return providerClass.getDeclaredConstructor().newInstance();
} catch (Exception e) {
throw new RuntimeException("Unable to instantiate class " + providerClass +
" Does it have a public no-arg constructor?", e);
diff --git a/spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/packageinfo b/spi-fly/spi-fly-core/src/main/resources/org/apache/aries/spifly/packageinfo
similarity index 98%
rename from spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/packageinfo
rename to spi-fly/spi-fly-core/src/main/resources/org/apache/aries/spifly/packageinfo
index 1da3be9..f558bad 100644
--- a/spi-fly/spi-fly-core/src/main/java/org/apache/aries/spifly/packageinfo
+++ b/spi-fly/spi-fly-core/src/main/resources/org/apache/aries/spifly/packageinfo
@@ -16,4 +16,4 @@
# specific language governing permissions and limitations
# under the License.
#
-version 1.1.0
+version 1.1.0
\ No newline at end of file
diff --git a/spi-fly/spi-fly-core/src/test/java/org/apache/aries/spifly/UtilTest.java b/spi-fly/spi-fly-core/src/test/java/org/apache/aries/spifly/UtilTest.java
index bb537a3..f2ef9cf 100644
--- a/spi-fly/spi-fly-core/src/test/java/org/apache/aries/spifly/UtilTest.java
+++ b/spi-fly/spi-fly-core/src/test/java/org/apache/aries/spifly/UtilTest.java
@@ -18,7 +18,7 @@
*/
package org.apache.aries.spifly;
-import static junit.framework.Assert.assertNotNull;
+import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertSame;
import java.net.URL;
diff --git a/spi-fly/spi-fly-dynamic-bundle/pom.xml b/spi-fly/spi-fly-dynamic-bundle/pom.xml
index 2a91eeb..ca058cf 100644
--- a/spi-fly/spi-fly-dynamic-bundle/pom.xml
+++ b/spi-fly/spi-fly-dynamic-bundle/pom.xml
@@ -22,10 +22,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries</groupId>
- <artifactId>parent</artifactId>
- <version>2.1.0</version>
- <relativePath>../../parent/pom.xml</relativePath>
+ <groupId>org.apache.aries.spifly</groupId>
+ <artifactId>spifly</artifactId>
+ <version>1.3.3-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.spifly</groupId>
@@ -45,11 +45,6 @@
<tag>HEAD</tag>
</scm>
- <properties>
- <asm.version>9.0</asm.version>
- <bnd.version>5.1.2</bnd.version>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.ow2.asm</groupId>
@@ -106,7 +101,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
@@ -117,7 +111,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
</dependency>
</dependencies>
diff --git a/spi-fly/spi-fly-dynamic-bundle/src/test/java/org/apache/aries/spifly/dynamic/ClientWeavingHookGenericCapabilityTest.java b/spi-fly/spi-fly-dynamic-bundle/src/test/java/org/apache/aries/spifly/dynamic/ClientWeavingHookGenericCapabilityTest.java
index 2afd2c8..a123ba2 100644
--- a/spi-fly/spi-fly-dynamic-bundle/src/test/java/org/apache/aries/spifly/dynamic/ClientWeavingHookGenericCapabilityTest.java
+++ b/spi-fly/spi-fly-dynamic-bundle/src/test/java/org/apache/aries/spifly/dynamic/ClientWeavingHookGenericCapabilityTest.java
@@ -112,7 +112,7 @@ public class ClientWeavingHookGenericCapabilityTest {
// META-INF/services/org.apache.aries.mytest.MySPI file from impl1 is visible.
Class<?> cls = wc.getDefinedClass();
Method method = cls.getMethod("test", new Class [] {String.class});
- Object result = method.invoke(cls.newInstance(), "hello");
+ Object result = method.invoke(cls.getDeclaredConstructor().newInstance(), "hello");
Assert.assertEquals(Collections.singleton("olleh"), result);
}
@@ -144,7 +144,7 @@ public class ClientWeavingHookGenericCapabilityTest {
// META-INF/services/org.apache.aries.mytest.MySPI file from impl1 is visible.
Class<?> cls = wc.getDefinedClass();
Method method = cls.getMethod("test", new Class [] {String.class});
- Object result = method.invoke(cls.newInstance(), "hello");
+ Object result = method.invoke(cls.getDeclaredConstructor().newInstance(), "hello");
Assert.assertEquals(Collections.emptySet(), result);
}
@@ -180,7 +180,7 @@ public class ClientWeavingHookGenericCapabilityTest {
// META-INF/services/org.apache.aries.mytest.MySPI file from impl1 is visible.
Class<?> cls = wc.getDefinedClass();
Method method = cls.getMethod("test", new Class [] {String.class});
- Object result = method.invoke(cls.newInstance(), "hello");
+ Object result = method.invoke(cls.getDeclaredConstructor().newInstance(), "hello");
Assert.assertEquals(Collections.singleton("olleh"), result);
}
@@ -236,7 +236,7 @@ public class ClientWeavingHookGenericCapabilityTest {
// META-INF/services/org.apache.aries.mytest.MySPI file from impl1 is visible.
Class<?> cls = wc.getDefinedClass();
Method method = cls.getMethod("test", new Class [] {String.class});
- Object result = method.invoke(cls.newInstance(), "hello");
+ Object result = method.invoke(cls.getDeclaredConstructor().newInstance(), "hello");
Assert.assertEquals(Collections.singleton("olleh"), result);
}
@@ -278,7 +278,7 @@ public class ClientWeavingHookGenericCapabilityTest {
// META-INF/services/org.apache.aries.mytest.MySPI file from impl1 is visible.
Class<?> cls = wc.getDefinedClass();
Method method = cls.getMethod("test", new Class [] {String.class});
- method.invoke(cls.newInstance(), "hi there");
+ method.invoke(cls.getDeclaredConstructor().newInstance(), "hi there");
Assert.assertSame(cl, Thread.currentThread().getContextClassLoader());
}
@@ -313,7 +313,7 @@ public class ClientWeavingHookGenericCapabilityTest {
// Invoke the woven class, check that it properly set the TCCL so that the implementation of impl5 is called.
// That implementation throws an exception, after which we are making sure that the TCCL is set back appropriately.
try {
- method.invoke(cls.newInstance(), "hello");
+ method.invoke(cls.getDeclaredConstructor().newInstance(), "hello");
Assert.fail("Invocation should have thrown an exception");
} catch (InvocationTargetException ite) {
RuntimeException re = (RuntimeException) ite.getCause();
@@ -353,7 +353,7 @@ public class ClientWeavingHookGenericCapabilityTest {
// META-INF/services/org.apache.aries.mytest.MySPI file from impl1 is visible.
Class<?> cls = wc.getDefinedClass();
Method method = cls.getMethod("test", new Class [] {String.class});
- Object result = method.invoke(cls.newInstance(), "hello");
+ Object result = method.invoke(cls.getDeclaredConstructor().newInstance(), "hello");
Assert.assertEquals("impl4", result);
}
@@ -384,7 +384,7 @@ public class ClientWeavingHookGenericCapabilityTest {
// META-INF/services/org.apache.aries.mytest.MySPI files from impl1 and impl2 are visible.
Class<?> cls = wc.getDefinedClass();
Method method = cls.getMethod("test", new Class [] {String.class});
- Object result = method.invoke(cls.newInstance(), "hello");
+ Object result = method.invoke(cls.getDeclaredConstructor().newInstance(), "hello");
Set<String> expected = new HashSet<String>(Arrays.asList("olleh", "HELLO", "5"));
Assert.assertEquals("All three services should be invoked", expected, result);
}
@@ -513,7 +513,7 @@ public class ClientWeavingHookGenericCapabilityTest {
// Invoke the woven class. Since MySPI wasn't selected nothing should be returned
Class<?> cls = wc.getDefinedClass();
Method method = cls.getMethod("test", new Class [] {String.class});
- Object result = method.invoke(cls.newInstance(), "hello");
+ Object result = method.invoke(cls.getDeclaredConstructor().newInstance(), "hello");
Assert.assertEquals("No providers should be selected for this one", Collections.emptySet(), result);
// Weave the AltTestClient class.
@@ -524,7 +524,7 @@ public class ClientWeavingHookGenericCapabilityTest {
// Invoke the AltTestClient
Class<?> cls2 = wc2.getDefinedClass();
Method method2 = cls2.getMethod("test", new Class [] {long.class});
- Object result2 = method2.invoke(cls2.newInstance(), 4096);
+ Object result2 = method2.invoke(cls2.getDeclaredConstructor().newInstance(), 4096);
Assert.assertEquals("All Providers should be selected", (4096L*4096L)-4096L, result2);
}
@@ -565,7 +565,7 @@ public class ClientWeavingHookGenericCapabilityTest {
// META-INF/services/org.apache.aries.mytest.MySPI file from impl2 is visible.
Class<?> cls = wc.getDefinedClass();
Method method = cls.getMethod("test", new Class [] {String.class});
- Object result = method.invoke(cls.newInstance(), "hello");
+ Object result = method.invoke(cls.getDeclaredConstructor().newInstance(), "hello");
Set<String> expected = new HashSet<String>(Arrays.asList("olleh", "HELLO", "5", "impl4"));
Assert.assertEquals("All providers should be selected for this one", expected, result);
@@ -577,7 +577,7 @@ public class ClientWeavingHookGenericCapabilityTest {
// Invoke the AltTestClient
Class<?> cls2 = wc2.getDefinedClass();
Method method2 = cls2.getMethod("test", new Class [] {long.class});
- Object result2 = method2.invoke(cls2.newInstance(), 4096);
+ Object result2 = method2.invoke(cls2.getDeclaredConstructor().newInstance(), 4096);
Assert.assertEquals("Only the services from bundle impl4 should be selected", -4096L, result2);
}
@@ -616,7 +616,7 @@ public class ClientWeavingHookGenericCapabilityTest {
// META-INF/services/org.apache.aries.mytest.MySPI file from impl2 is visible.
Class<?> cls = wc.getDefinedClass();
Method method = cls.getMethod("test", new Class [] {String.class});
- Object result = method.invoke(cls.newInstance(), "hello");
+ Object result = method.invoke(cls.getDeclaredConstructor().newInstance(), "hello");
Assert.assertEquals("No providers should be selected here", Collections.emptySet(), result);
// Weave the AltTestClient class.
@@ -627,7 +627,7 @@ public class ClientWeavingHookGenericCapabilityTest {
// Invoke the AltTestClient
Class<?> cls2 = wc2.getDefinedClass();
Method method2 = cls2.getMethod("test", new Class [] {long.class});
- Object result2 = method2.invoke(cls2.newInstance(), 4096);
+ Object result2 = method2.invoke(cls2.getDeclaredConstructor().newInstance(), 4096);
Assert.assertEquals("Only the services from bundle impl4 should be selected", -4096L, result2);
}
@@ -663,7 +663,7 @@ public class ClientWeavingHookGenericCapabilityTest {
// META-INF/services/org.apache.aries.mytest.MySPI file from impl2 is visible.
Class<?> cls = wc.getDefinedClass();
Method method = cls.getMethod("test", new Class [] {String.class});
- Object result = method.invoke(cls.newInstance(), "hello");
+ Object result = method.invoke(cls.getDeclaredConstructor().newInstance(), "hello");
Set<String> expected = new HashSet<String>(Arrays.asList("HELLO", "5"));
Assert.assertEquals("Only the services from bundle impl2 should be selected", expected, result);
}
@@ -701,7 +701,7 @@ public class ClientWeavingHookGenericCapabilityTest {
// META-INF/services/org.apache.aries.mytest.MySPI file from impl2 is visible.
Class<?> cls = wc.getDefinedClass();
Method method = cls.getMethod("test", new Class [] {String.class});
- Object result = method.invoke(cls.newInstance(), "hello");
+ Object result = method.invoke(cls.getDeclaredConstructor().newInstance(), "hello");
Set<String> expected = new HashSet<String>(Arrays.asList("olleh"));
Assert.assertEquals(expected, result);
}
diff --git a/spi-fly/spi-fly-dynamic-bundle/src/test/java/org/apache/aries/spifly/dynamic/ClientWeavingHookOSGi43Test.java b/spi-fly/spi-fly-dynamic-bundle/src/test/java/org/apache/aries/spifly/dynamic/ClientWeavingHookOSGi43Test.java
index 258e4d4..fb7b310 100644
--- a/spi-fly/spi-fly-dynamic-bundle/src/test/java/org/apache/aries/spifly/dynamic/ClientWeavingHookOSGi43Test.java
+++ b/spi-fly/spi-fly-dynamic-bundle/src/test/java/org/apache/aries/spifly/dynamic/ClientWeavingHookOSGi43Test.java
@@ -104,7 +104,7 @@ public class ClientWeavingHookOSGi43Test {
// META-INF/services/org.apache.aries.mytest.MySPI file from impl1 is visible.
Class<?> cls = wc.getDefinedClass();
Method method = cls.getMethod("test", new Class [] {String.class});
- Object result = method.invoke(cls.newInstance(), "hello");
+ Object result = method.invoke(cls.getDeclaredConstructor().newInstance(), "hello");
Assert.assertEquals(Collections.singleton("olleh"), result);
}
diff --git a/spi-fly/spi-fly-dynamic-bundle/src/test/java/org/apache/aries/spifly/dynamic/ClientWeavingHookTest.java b/spi-fly/spi-fly-dynamic-bundle/src/test/java/org/apache/aries/spifly/dynamic/ClientWeavingHookTest.java
index 18eae3c..7204a51 100644
--- a/spi-fly/spi-fly-dynamic-bundle/src/test/java/org/apache/aries/spifly/dynamic/ClientWeavingHookTest.java
+++ b/spi-fly/spi-fly-dynamic-bundle/src/test/java/org/apache/aries/spifly/dynamic/ClientWeavingHookTest.java
@@ -111,7 +111,7 @@ public class ClientWeavingHookTest {
// META-INF/services/org.apache.aries.mytest.MySPI file from impl1 is visible.
Class<?> cls = wc.getDefinedClass();
Method method = cls.getMethod("test", new Class [] {String.class});
- Object result = method.invoke(cls.newInstance(), "hello");
+ Object result = method.invoke(cls.getDeclaredConstructor().newInstance(), "hello");
Assert.assertEquals(Collections.singleton("olleh"), result);
}
@@ -187,7 +187,7 @@ public class ClientWeavingHookTest {
// META-INF/services/org.apache.aries.mytest.MySPI file from impl1 is visible.
Class<?> cls = wc.getDefinedClass();
Method method = cls.getMethod("testService2", new Class [] {String.class});
- Object result = method.invoke(cls.newInstance(), "hello");
+ Object result = method.invoke(cls.getDeclaredConstructor().newInstance(), "hello");
Assert.assertEquals(Collections.singleton("olleh"), result);
}
@@ -223,7 +223,7 @@ public class ClientWeavingHookTest {
// META-INF/services/org.apache.aries.mytest.MySPI file from impl1 is visible.
Class<?> cls = wc.getDefinedClass();
Method method = cls.getMethod("test", new Class [] {String.class});
- Object result = method.invoke(cls.newInstance(), "hello");
+ Object result = method.invoke(cls.getDeclaredConstructor().newInstance(), "hello");
Assert.assertEquals(Collections.singleton("olleh"), result);
}
@@ -263,7 +263,7 @@ public class ClientWeavingHookTest {
// META-INF/services/org.apache.aries.mytest.MySPI file from impl1 is visible.
Class<?> cls = wc.getDefinedClass();
Method method = cls.getMethod("test", new Class [] {String.class});
- method.invoke(cls.newInstance(), "hi there");
+ method.invoke(cls.getDeclaredConstructor().newInstance(), "hi there");
Assert.assertSame(cl, Thread.currentThread().getContextClassLoader());
}
@@ -301,7 +301,7 @@ public class ClientWeavingHookTest {
// META-INF/services/org.apache.aries.mytest.MySPI file from impl1 is visible.
Class<?> cls = wc.getDefinedClass();
Method method = cls.getMethod("test", new Class [] {String.class});
- Object result = method.invoke(cls.newInstance(), "hello");
+ Object result = method.invoke(cls.getDeclaredConstructor().newInstance(), "hello");
Assert.assertEquals("impl4", result);
}
@@ -332,7 +332,7 @@ public class ClientWeavingHookTest {
// META-INF/services/org.apache.aries.mytest.MySPI files from impl1 and impl2 are visible.
Class<?> cls = wc.getDefinedClass();
Method method = cls.getMethod("test", new Class [] {String.class});
- Object result = method.invoke(cls.newInstance(), "hello");
+ Object result = method.invoke(cls.getDeclaredConstructor().newInstance(), "hello");
Set<String> expected = new HashSet<String>(Arrays.asList("olleh", "HELLO", "5"));
Assert.assertEquals("All three services should be invoked", expected, result);
}
@@ -362,7 +362,7 @@ public class ClientWeavingHookTest {
// META-INF/services/org.apache.aries.mytest.MySPI file from impl2 is visible.
Class<?> cls = wc.getDefinedClass();
Method method = cls.getMethod("test", new Class [] {String.class});
- Object result = method.invoke(cls.newInstance(), "hello");
+ Object result = method.invoke(cls.getDeclaredConstructor().newInstance(), "hello");
Set<String> expected = new HashSet<String>(Arrays.asList("HELLO", "5"));
Assert.assertEquals("Only the services from bundle impl2 should be selected", expected, result);
}
@@ -393,7 +393,7 @@ public class ClientWeavingHookTest {
// META-INF/services/org.apache.aries.mytest.MySPI file from impl2 is visible.
Class<?> cls = wc.getDefinedClass();
Method method = cls.getMethod("test", new Class [] {String.class});
- Object result = method.invoke(cls.newInstance(), "hello");
+ Object result = method.invoke(cls.getDeclaredConstructor().newInstance(), "hello");
Assert.assertEquals("Only the services from bundle impl2 should be selected", Collections.singleton("Updated!hello!Updated"), result);
}
@@ -426,7 +426,7 @@ public class ClientWeavingHookTest {
// META-INF/services/org.apache.aries.mytest.MySPI file from impl2 is visible.
Class<?> cls = wc.getDefinedClass();
Method method = cls.getMethod("test", new Class [] {String.class});
- Object result = method.invoke(cls.newInstance(), "hello");
+ Object result = method.invoke(cls.getDeclaredConstructor().newInstance(), "hello");
Set<String> expected = new HashSet<String>(Arrays.asList("olleh", "impl4"));
Assert.assertEquals("All providers should be selected for this one", expected, result);
}
@@ -460,7 +460,7 @@ public class ClientWeavingHookTest {
// META-INF/services/org.apache.aries.mytest.MySPI file from impl2 is visible.
Class<?> cls = wc.getDefinedClass();
Method method = cls.getMethod("test", new Class [] {String.class});
- Object result = method.invoke(cls.newInstance(), "hello");
+ Object result = method.invoke(cls.getDeclaredConstructor().newInstance(), "hello");
Set<String> expected = new HashSet<String>(Arrays.asList("olleh", "impl4"));
Assert.assertEquals("All providers should be selected for this one", expected, result);
}
@@ -496,7 +496,7 @@ public class ClientWeavingHookTest {
// META-INF/services/org.apache.aries.mytest.MySPI file from impl2 is visible.
Class<?> cls = wc.getDefinedClass();
Method method = cls.getMethod("test", new Class [] {String.class});
- Object result = method.invoke(cls.newInstance(), "hello");
+ Object result = method.invoke(cls.getDeclaredConstructor().newInstance(), "hello");
Set<String> expected = new HashSet<String>(Arrays.asList("olleh", "impl4", "HELLO", "5"));
Assert.assertEquals("All providers should be selected for this one", expected, result);
@@ -508,7 +508,7 @@ public class ClientWeavingHookTest {
// Invoke the AltTestClient
Class<?> cls2 = wc2.getDefinedClass();
Method method2 = cls2.getMethod("test", new Class [] {long.class});
- Object result2 = method2.invoke(cls2.newInstance(), 4096);
+ Object result2 = method2.invoke(cls2.getDeclaredConstructor().newInstance(), 4096);
Assert.assertEquals("Only the services from bundle impl4 should be selected", -4096L, result2);
}
@@ -567,7 +567,7 @@ public class ClientWeavingHookTest {
// META-INF/services/org.apache.aries.mytest.MySPI file from impl2 is visible.
Class<?> cls = wc.getDefinedClass();
Method method = cls.getMethod("test", new Class [] {String.class});
- Object result = method.invoke(cls.newInstance(), "hello");
+ Object result = method.invoke(cls.getDeclaredConstructor().newInstance(), "hello");
Assert.assertEquals(testClientResult, result);
URL clsUrl2 = getClass().getResource("JaxpClient.class");
@@ -576,7 +576,7 @@ public class ClientWeavingHookTest {
Class<?> cls2 = wc2.getDefinedClass();
Method method2 = cls2.getMethod("test", new Class [] {});
- Class<?> result2 = (Class<?>) method2.invoke(cls2.newInstance());
+ Class<?> result2 = (Class<?>) method2.invoke(cls2.getDeclaredConstructor().newInstance());
Assert.assertEquals(jaxpClientResult, result2.getName());
}
@@ -590,7 +590,7 @@ public class ClientWeavingHookTest {
// META-INF/services/org.apache.aries.mytest.MySPI file from impl2 is visible.
Class<?> cls = wc.getDefinedClass();
Method method = cls.getMethod("testService", new Class [] {String.class, Class.class});
- Object result = method.invoke(cls.newInstance(), "hello", MySPI.class);
+ Object result = method.invoke(cls.getDeclaredConstructor().newInstance(), "hello", MySPI.class);
Assert.assertEquals(testClientResult, result);
}
@@ -611,7 +611,7 @@ public class ClientWeavingHookTest {
Class<?> cls = wc.getDefinedClass();
Method method = cls.getMethod("test", new Class [] {});
- Class<?> result = (Class<?>) method.invoke(cls.newInstance());
+ Class<?> result = (Class<?>) method.invoke(cls.getDeclaredConstructor().newInstance());
Assert.assertEquals("JAXP implementation from JRE", thisJVMsDBF, result.getName());
}
@@ -636,7 +636,7 @@ public class ClientWeavingHookTest {
Class<?> cls = wc.getDefinedClass();
Method method = cls.getMethod("test", new Class [] {});
- Class<?> result = (Class<?>) method.invoke(cls.newInstance());
+ Class<?> result = (Class<?>) method.invoke(cls.getDeclaredConstructor().newInstance());
Assert.assertEquals("JAXP implementation from JRE", "org.apache.aries.spifly.dynamic.impl3.MyAltDocumentBuilderFactory", result.getName());
}
@@ -660,7 +660,7 @@ public class ClientWeavingHookTest {
Class<?> cls = wc.getDefinedClass();
Method method = cls.getMethod("test", new Class [] {});
- Class<?> result = (Class<?>) method.invoke(cls.newInstance());
+ Class<?> result = (Class<?>) method.invoke(cls.getDeclaredConstructor().newInstance());
Assert.assertEquals("JAXP implementation from JRE", thisJVMsDBF, result.getName());
}
@@ -684,7 +684,7 @@ public class ClientWeavingHookTest {
Class<?> cls = wc.getDefinedClass();
Method method = cls.getMethod("test", new Class [] {});
- Class<?> result = (Class<?>) method.invoke(cls.newInstance());
+ Class<?> result = (Class<?>) method.invoke(cls.getDeclaredConstructor().newInstance());
Assert.assertEquals("JAXP implementation from alternative bundle", "org.apache.aries.spifly.dynamic.impl3.MyAltDocumentBuilderFactory", result.getName());
}
diff --git a/spi-fly/spi-fly-dynamic-framework-extension/pom.xml b/spi-fly/spi-fly-dynamic-framework-extension/pom.xml
index ef0796f..6796378 100644
--- a/spi-fly/spi-fly-dynamic-framework-extension/pom.xml
+++ b/spi-fly/spi-fly-dynamic-framework-extension/pom.xml
@@ -22,10 +22,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries</groupId>
- <artifactId>parent</artifactId>
- <version>2.1.0</version>
- <relativePath>../../parent/pom.xml</relativePath>
+ <groupId>org.apache.aries.spifly</groupId>
+ <artifactId>spifly</artifactId>
+ <version>1.3.3-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.spifly</groupId>
@@ -45,11 +45,6 @@
<tag>HEAD</tag>
</scm>
- <properties>
- <asm.version>9.0</asm.version>
- <bnd.version>5.1.2</bnd.version>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.ow2.asm</groupId>
diff --git a/spi-fly/spi-fly-static-bundle/pom.xml b/spi-fly/spi-fly-static-bundle/pom.xml
index c7b7a4a..52fe814 100644
--- a/spi-fly/spi-fly-static-bundle/pom.xml
+++ b/spi-fly/spi-fly-static-bundle/pom.xml
@@ -22,10 +22,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries</groupId>
- <artifactId>parent</artifactId>
- <version>2.1.0</version>
- <relativePath>../../parent/pom.xml</relativePath>
+ <groupId>org.apache.aries.spifly</groupId>
+ <artifactId>spifly</artifactId>
+ <version>1.3.3-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.spifly</groupId>
@@ -45,10 +45,6 @@
<tag>HEAD</tag>
</scm>
- <properties>
- <bnd.version>5.1.2</bnd.version>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.aries.spifly</groupId>
diff --git a/spi-fly/spi-fly-static-tool/pom.xml b/spi-fly/spi-fly-static-tool/pom.xml
index c477602..56ae19a 100644
--- a/spi-fly/spi-fly-static-tool/pom.xml
+++ b/spi-fly/spi-fly-static-tool/pom.xml
@@ -22,10 +22,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries</groupId>
- <artifactId>parent</artifactId>
- <version>2.1.0</version>
- <relativePath>../../parent/pom.xml</relativePath>
+ <groupId>org.apache.aries.spifly</groupId>
+ <artifactId>spifly</artifactId>
+ <version>1.3.3-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.spifly</groupId>
diff --git a/spi-fly/spi-fly-weaver/pom.xml b/spi-fly/spi-fly-weaver/pom.xml
index 07460a3..c3c608f 100644
--- a/spi-fly/spi-fly-weaver/pom.xml
+++ b/spi-fly/spi-fly-weaver/pom.xml
@@ -22,10 +22,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries</groupId>
- <artifactId>parent</artifactId>
- <version>2.1.0</version>
- <relativePath>../../parent/pom.xml</relativePath>
+ <groupId>org.apache.aries.spifly</groupId>
+ <artifactId>spifly</artifactId>
+ <version>1.3.3-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.spifly</groupId>
@@ -41,10 +41,6 @@
<tag>HEAD</tag>
</scm>
- <properties>
- <asm.version>9.0</asm.version>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.ow2.asm</groupId>