FELIX-6522 Using snapshot Felix main which can start on JDK17+ with SM enabled
diff --git a/appserver/featuresets/debug/pom.xml b/appserver/featuresets/debug/pom.xml
index a09addf..fe69dc7 100644
--- a/appserver/featuresets/debug/pom.xml
+++ b/appserver/featuresets/debug/pom.xml
@@ -40,16 +40,16 @@
In the IDE, for instance, Eclipse, go to run - debug configurations - remote java application - project
And add this project there.
- </description>
+ </description>
<name>Debug</name>
<dependencies>
- <dependency>
+ <dependency>
<groupId>jakarta.el</groupId>
<artifactId>jakarta.el-api</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
@@ -65,9 +65,9 @@
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.framework</artifactId>
+ <artifactId>org.apache.felix.main</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-framework</artifactId>
diff --git a/nucleus/parent/pom.xml b/nucleus/parent/pom.xml
index 819fbd5..c5c8eb1 100644
--- a/nucleus/parent/pom.xml
+++ b/nucleus/parent/pom.xml
@@ -462,10 +462,17 @@
<scope>provided</scope>
</dependency>
+ <!-- framework is transitive dependency of others, but it is aggregated in main too -->
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.main</artifactId>
- <version>7.0.3</version>
+ <version>7.1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.framework</artifactId>
+ <version>7.1.0-SNAPSHOT</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -524,12 +531,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.framework</artifactId>
- <version>7.0.3</version>
- <scope>provided</scope>
- </dependency>
<!-- This is currently used by osgi-shell cmd -->
<dependency>
<groupId>org.jline</groupId>
diff --git a/snapshots/felix-framework/pom.xml b/snapshots/felix-framework/pom.xml
new file mode 100644
index 0000000..ef3c818
--- /dev/null
+++ b/snapshots/felix-framework/pom.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright (c) 2022 Contributors to the Eclipse Foundation. All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v. 2.0, which is available at
+ http://www.eclipse.org/legal/epl-2.0.
+
+ This Source Code may also be made available under the following Secondary
+ Licenses when the conditions for such availability set forth in the
+ Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ version 2 with the GNU Classpath Exception, which is available at
+ https://www.gnu.org/software/classpath/license.html.
+
+ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"
+>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.glassfish.main.snapshots</groupId>
+ <artifactId>snapshotsmodule</artifactId>
+ <version>0.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>felix-framework</artifactId>
+ <packaging>pom</packaging>
+
+ <properties>
+ <snapshots.sources.url>https://github.com/dmatej/felix-dev/archive/refs/heads/FELIX-6522-JDK17.zip</snapshots.sources.url>
+ <snapshots.sources.directory>${project.build.directory}/felix-dev-FELIX-6522-JDK17/framework</snapshots.sources.directory>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.googlecode.maven-download-plugin</groupId>
+ <artifactId>download-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-invoker-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/snapshots/felix-main/pom.xml b/snapshots/felix-main/pom.xml
new file mode 100644
index 0000000..c0dc007
--- /dev/null
+++ b/snapshots/felix-main/pom.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright (c) 2022 Contributors to the Eclipse Foundation. All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v. 2.0, which is available at
+ http://www.eclipse.org/legal/epl-2.0.
+
+ This Source Code may also be made available under the following Secondary
+ Licenses when the conditions for such availability set forth in the
+ Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ version 2 with the GNU Classpath Exception, which is available at
+ https://www.gnu.org/software/classpath/license.html.
+
+ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"
+>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.glassfish.main.snapshots</groupId>
+ <artifactId>snapshotsmodule</artifactId>
+ <version>0.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>felix-main</artifactId>
+ <packaging>pom</packaging>
+
+ <properties>
+ <snapshots.sources.url>https://github.com/dmatej/felix-dev/archive/refs/heads/FELIX-6522-JDK17.zip</snapshots.sources.url>
+ <snapshots.sources.directory>${project.build.directory}/felix-dev-FELIX-6522-JDK17/main</snapshots.sources.directory>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.glassfish.main.snapshots</groupId>
+ <artifactId>felix-framework</artifactId>
+ <type>pom</type>
+ <version>0.0.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.googlecode.maven-download-plugin</groupId>
+ <artifactId>download-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-invoker-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/snapshots/pom.xml b/snapshots/pom.xml
index 3fff435..4746e20 100644
--- a/snapshots/pom.xml
+++ b/snapshots/pom.xml
@@ -39,6 +39,11 @@
<name>GlassFish Snapshots Parent</name>
<description>Temporary snapshot modules</description>
+ <modules>
+ <module>felix-framework</module>
+ <module>felix-main</module>
+ </modules>
+
<build>
<plugins>
<plugin>
@@ -89,6 +94,8 @@
</pomIncludes>
<!-- source:jar - ie. metro uses sources of other modules -->
<goals>clean source:jar install</goals>
+ <!-- Felix uses ianal plugin made in 2008 which requires this -->
+ <mavenOpts>--add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED</mavenOpts>
<settingsFile>${basedir}/../settings.xml</settingsFile>
<profiles>staging,default</profiles>
<parallelThreads>4</parallelThreads>
