Merge pull request #40 from tjwatson/updateFrameworks
Update frameworks
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 52e8434..268b33d 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -12,12 +12,12 @@
runs-on: ${{ matrix.os }}
strategy:
matrix:
- java_version: ['11', '13']
+ java_version: ['11', '15']
os: [ubuntu-latest, windows-latest, macOS-latest]
steps:
- uses: actions/checkout@v1
- name: Set up JDK ${{ matrix.java_version }}
- uses: actions/setup-java@v1.3.0
+ uses: actions/setup-java@v1.4.3
with:
java-version: ${{ matrix.java_version }}
- name: Main build using Felix
@@ -31,10 +31,10 @@
atomos.examples/atomos.examples.android/gradlew -b atomos.examples/atomos.examples.android/build.gradle build
- name: Setup GraalVM environment
if: matrix.os == 'ubuntu-latest'
- uses: DeLaGuardo/setup-graalvm@2.0
+ uses: DeLaGuardo/setup-graalvm@3.0
with:
# The GraalVM version to make available on the path.
- graalvm-version: '20.2.0.java11'
+ graalvm-version: '20.3.0.java11'
- name: Install substrate native-image support
if: matrix.os == 'ubuntu-latest'
run: gu install native-image
diff --git a/atomos.examples/atomos.examples.index/pom.xml b/atomos.examples/atomos.examples.index/pom.xml
index 124b93e..fb11e59 100644
--- a/atomos.examples/atomos.examples.index/pom.xml
+++ b/atomos.examples/atomos.examples.index/pom.xml
@@ -10,16 +10,6 @@
<name>atomos.examples.index</name>
<description>Example using the Atomos index to create an executable JAR</description>
- <repositories>
- <repository>
- <id>atomos-temp-m2repo</id>
- <url>https://github.com/tjwatson/atomos-temp-m2repo/raw/master/repository</url>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>always</updatePolicy>
- </snapshots>
- </repository>
- </repositories>
<profiles>
<profile>
<id>equinox</id>
diff --git a/atomos.examples/atomos.examples.jaxrs/pom.xml b/atomos.examples/atomos.examples.jaxrs/pom.xml
index 01879a9..7e50036 100644
--- a/atomos.examples/atomos.examples.jaxrs/pom.xml
+++ b/atomos.examples/atomos.examples.jaxrs/pom.xml
@@ -10,16 +10,6 @@
<name>atomos.examples.jaxrs</name>
<description>Atomos example using Aries JAX-RS</description>
- <repositories>
- <repository>
- <id>atomos-temp-m2repo</id>
- <url>https://github.com/tjwatson/atomos-temp-m2repo/raw/master/repository</url>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>always</updatePolicy>
- </snapshots>
- </repository>
- </repositories>
<properties>
<jaxb.version>2.3.3</jaxb.version>
<aries.jaxrs.version>1.0.9</aries.jaxrs.version>
diff --git a/atomos.examples/atomos.examples.jlink/pom.xml b/atomos.examples/atomos.examples.jlink/pom.xml
index 34e4f40..ed7dee7 100644
--- a/atomos.examples/atomos.examples.jlink/pom.xml
+++ b/atomos.examples/atomos.examples.jlink/pom.xml
@@ -14,8 +14,8 @@
<repositories>
<repository>
- <id>atomos-temp-m2repo</id>
- <url>https://github.com/tjwatson/atomos-temp-m2repo/raw/master/repository</url>
+ <id>apache-snapshots</id>
+ <url>https://repository.apache.org/snapshots</url>
<snapshots>
<enabled>true</enabled>
<updatePolicy>always</updatePolicy>
@@ -93,7 +93,7 @@
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.framework.connect</artifactId>
+ <artifactId>org.apache.felix.framework</artifactId>
</dependency>
<dependency>
<groupId>org.apache.felix.atomos.osgi.frameworks.felix</groupId>
@@ -258,10 +258,10 @@
<module>
<artifact>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.framework.connect</artifactId>
+ <artifactId>org.apache.felix.framework</artifactId>
</artifact>
<moduleInfoSource>
- open module org.apache.felix.framework.connect {
+ open module org.apache.felix.framework {
requires jdk.unsupported;
exports org.apache.felix.framework;
diff --git a/atomos.examples/atomos.examples.springloader/pom.xml b/atomos.examples/atomos.examples.springloader/pom.xml
index 244fb13..d2c8e6e 100644
--- a/atomos.examples/atomos.examples.springloader/pom.xml
+++ b/atomos.examples/atomos.examples.springloader/pom.xml
@@ -10,16 +10,6 @@
<name>atomos.examples.springloader</name>
<description>Atomos example using Spring Boot Loader</description>
- <repositories>
- <repository>
- <id>atomos-temp-m2repo</id>
- <url>https://github.com/tjwatson/atomos-temp-m2repo/raw/master/repository</url>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>always</updatePolicy>
- </snapshots>
- </repository>
- </repositories>
<profiles>
<profile>
<id>felix</id>
diff --git a/atomos.examples/atomos.examples.substrate.lib/pom.xml b/atomos.examples/atomos.examples.substrate.lib/pom.xml
index 975d3ed..ad66588 100644
--- a/atomos.examples/atomos.examples.substrate.lib/pom.xml
+++ b/atomos.examples/atomos.examples.substrate.lib/pom.xml
@@ -16,16 +16,6 @@
<maven.compiler.target>${java.version}</maven.compiler.target>
</properties>
- <repositories>
- <repository>
- <id>atomos-temp-m2repo</id>
- <url>https://github.com/tjwatson/atomos-temp-m2repo/raw/master/repository</url>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>always</updatePolicy>
- </snapshots>
- </repository>
- </repositories>
<profiles>
<profile>
<id>equinox</id>
@@ -188,7 +178,6 @@
-H:DynamicProxyConfigurationFiles=${project.basedir}/graal_proxy_config.json
-H:+ReportUnsupportedElementsAtRuntime
-H:+ReportExceptionStackTraces
- -H:+TraceClassInitialization
-H:+PrintClassInitialization
</buildArgs>
</configuration>
diff --git a/atomos.examples/atomos.examples.substrate.maven/pom.xml b/atomos.examples/atomos.examples.substrate.maven/pom.xml
index 22316ba..bb5312c 100644
--- a/atomos.examples/atomos.examples.substrate.maven/pom.xml
+++ b/atomos.examples/atomos.examples.substrate.maven/pom.xml
@@ -7,16 +7,7 @@
</parent>
<artifactId>org.apache.felix.atomos.examples.substrate.maven</artifactId>
<name>atomos.examples.substrate.maven</name>
- <repositories>
- <repository>
- <id>atomos-temp-m2repo</id>
- <url>https://github.com/tjwatson/atomos-temp-m2repo/raw/master/repository</url>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>interval:60</updatePolicy>
- </snapshots>
- </repository>
- </repositories>
+
<profiles>
<profile>
<id>equinox</id>
diff --git a/atomos.osgi.frameworks/equinox/pom.xml b/atomos.osgi.frameworks/equinox/pom.xml
index e58fd9f..fbf309d 100644
--- a/atomos.osgi.frameworks/equinox/pom.xml
+++ b/atomos.osgi.frameworks/equinox/pom.xml
@@ -12,16 +12,6 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
- <repositories>
- <repository>
- <id>atomos-temp-m2repo</id>
- <url>https://github.com/tjwatson/atomos-temp-m2repo/raw/master/repository</url>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>always</updatePolicy>
- </snapshots>
- </repository>
- </repositories>
<dependencies>
<dependency>
<groupId>org.eclipse.platform</groupId>
diff --git a/atomos.osgi.frameworks/felix/pom.xml b/atomos.osgi.frameworks/felix/pom.xml
index ae04b53..37a0f95 100644
--- a/atomos.osgi.frameworks/felix/pom.xml
+++ b/atomos.osgi.frameworks/felix/pom.xml
@@ -14,8 +14,8 @@
</properties>
<repositories>
<repository>
- <id>atomos-temp-m2repo</id>
- <url>https://github.com/tjwatson/atomos-temp-m2repo/raw/master/repository</url>
+ <id>apache-snapshots</id>
+ <url>https://repository.apache.org/snapshots</url>
<snapshots>
<enabled>true</enabled>
<updatePolicy>always</updatePolicy>
@@ -25,7 +25,7 @@
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.framework.connect</artifactId>
+ <artifactId>org.apache.felix.framework</artifactId>
</dependency>
</dependencies>
</project>
diff --git a/atomos.osgi.frameworks/felix/src/main/java/module-info.java b/atomos.osgi.frameworks/felix/src/main/java/module-info.java
index 91201d7..1f36145 100644
--- a/atomos.osgi.frameworks/felix/src/main/java/module-info.java
+++ b/atomos.osgi.frameworks/felix/src/main/java/module-info.java
@@ -15,5 +15,5 @@
open module atomos.osgi.framework
{
- requires transitive org.apache.felix.framework.connect;
+ requires transitive org.apache.felix.framework;
}
diff --git a/atomos.runtime/pom.xml b/atomos.runtime/pom.xml
index a0c93cd..1be5d53 100644
--- a/atomos.runtime/pom.xml
+++ b/atomos.runtime/pom.xml
@@ -11,16 +11,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
- <repositories>
- <repository>
- <id>atomos-temp-m2repo</id>
- <url>https://github.com/tjwatson/atomos-temp-m2repo/raw/master/repository</url>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>always</updatePolicy>
- </snapshots>
- </repository>
- </repositories>
+
<dependencies>
<dependency>
<groupId>org.junit.jupiter</groupId>
diff --git a/atomos.utils/atomos.utils.substrate.impl/src/main/java/org/apache/felix/atomos/utils/substrate/impl/BaseNativeImageArguments.java b/atomos.utils/atomos.utils.substrate.impl/src/main/java/org/apache/felix/atomos/utils/substrate/impl/BaseNativeImageArguments.java
index fb22f81..657ada0 100644
--- a/atomos.utils/atomos.utils.substrate.impl/src/main/java/org/apache/felix/atomos/utils/substrate/impl/BaseNativeImageArguments.java
+++ b/atomos.utils/atomos.utils.substrate.impl/src/main/java/org/apache/felix/atomos/utils/substrate/impl/BaseNativeImageArguments.java
@@ -42,8 +42,6 @@
String NI_PARAM_H_RESOURCE_CONFIGURATION_FILES = "-H:ResourceConfigurationFiles";
- String NI_PARAM_H_TRACE_CLASS_INITIALIZATION = "-H:+TraceClassInitialization";
-
String NI_PARAM_INITIALIZE_AT_BUILD_TIME = "--initialize-at-build-time";
String NI_PARAM_NO_FALLBACK = "--no-fallback";
diff --git a/atomos.utils/atomos.utils.substrate.impl/src/main/java/org/apache/felix/atomos/utils/substrate/impl/NativeImageArgumentsImpl.java b/atomos.utils/atomos.utils.substrate.impl/src/main/java/org/apache/felix/atomos/utils/substrate/impl/NativeImageArgumentsImpl.java
index 223285c..a702164 100644
--- a/atomos.utils/atomos.utils.substrate.impl/src/main/java/org/apache/felix/atomos/utils/substrate/impl/NativeImageArgumentsImpl.java
+++ b/atomos.utils/atomos.utils.substrate.impl/src/main/java/org/apache/felix/atomos/utils/substrate/impl/NativeImageArgumentsImpl.java
@@ -148,9 +148,6 @@
addArgIfTrue(otherArguments, NI_PARAM_H_REPORT_EXCEPTION_STACK_TRACES,
reportExceptionStackTraces());
//
- addArgIfTrue(otherArguments, NI_PARAM_H_TRACE_CLASS_INITIALIZATION,
- allowIncompleteClasspath());
- //-H:+TraceClassInitialization
addArgIfTrue(otherArguments, NI_PARAM_H_PRINT_CLASS_INITIALIZATION,
traceClassInitialization());
//--no-fallback
diff --git a/pom.xml b/pom.xml
index 1fde8ce..2ee6bcc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<atomos.version>${project.version}</atomos.version>
- <bnd.version>5.0.1</bnd.version>
+ <bnd.version>5.2.0</bnd.version>
</properties>
<modules>
@@ -167,7 +167,7 @@
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi</artifactId>
- <version>3.16.0</version>
+ <version>3.16.100</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
@@ -177,8 +177,8 @@
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.framework.connect</artifactId>
- <version>0.1.0-SNAPSHOT</version>
+ <artifactId>org.apache.felix.framework</artifactId>
+ <version>6.1.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
