You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by tj...@apache.org on 2021/02/01 23:31:22 UTC
[felix-atomos] 05/05: Rename atomos.osgi.framework artifacts to
osgi.core
This is an automated email from the ASF dual-hosted git repository.
tjwatson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-atomos.git
commit d9c24978c90d6688012fa3b64c7395c7a30efe98
Author: Thomas Watson <tj...@us.ibm.com>
AuthorDate: Mon Feb 1 17:22:46 2021 -0600
Rename atomos.osgi.framework artifacts to osgi.core
The facade atomos.osgi.framework modules should use the osgi.core module
name to allow osgi bundles to be produced that are not bound to atomos
name.
---
atomos.examples/atomos.examples.index/pom.xml | 4 ++--
atomos.examples/atomos.examples.jaxrs/pom.xml | 4 ++--
atomos.examples/atomos.examples.jlink/pom.xml | 16 ++++++++--------
atomos.examples/atomos.examples.springloader/pom.xml | 4 ++--
atomos.examples/atomos.examples.substrate.lib/pom.xml | 4 ++--
atomos.examples/atomos.examples.substrate.maven/pom.xml | 4 ++--
atomos.osgi.frameworks/equinox/pom.xml | 6 +++---
.../equinox/src/main/java/module-info.java | 2 +-
atomos.osgi.frameworks/felix/pom.xml | 6 +++---
.../felix/src/main/java/module-info.java | 2 +-
atomos.osgi.frameworks/pom.xml | 2 +-
atomos.runtime/pom.xml | 4 ++--
atomos.runtime/src/main/java/module-info.java | 2 +-
atomos.tests/atomos.tests.classpath.service/pom.xml | 4 ++--
atomos.tests/atomos.tests.index.bundles/pom.xml | 4 ++--
atomos.tests/atomos.tests.modulepath.service/pom.xml | 4 ++--
.../atomos.tests.testbundles.dependent.x/pom.xml | 5 ++---
.../src/main/java/module-info.java | 2 +-
.../pom.xml | 5 ++---
.../src/main/java/module-info.java | 2 +-
20 files changed, 42 insertions(+), 44 deletions(-)
diff --git a/atomos.examples/atomos.examples.index/pom.xml b/atomos.examples/atomos.examples.index/pom.xml
index a04c8b5..6694769 100644
--- a/atomos.examples/atomos.examples.index/pom.xml
+++ b/atomos.examples/atomos.examples.index/pom.xml
@@ -16,7 +16,7 @@
<dependencies>
<dependency>
<groupId>org.apache.felix.atomos.osgi.frameworks.equinox</groupId>
- <artifactId>atomos.osgi.framework</artifactId>
+ <artifactId>osgi.core</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
</dependencies>
@@ -32,7 +32,7 @@
<dependencies>
<dependency>
<groupId>org.apache.felix.atomos.osgi.frameworks.felix</groupId>
- <artifactId>atomos.osgi.framework</artifactId>
+ <artifactId>osgi.core</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
diff --git a/atomos.examples/atomos.examples.jaxrs/pom.xml b/atomos.examples/atomos.examples.jaxrs/pom.xml
index 2b4e461..59a42b4 100644
--- a/atomos.examples/atomos.examples.jaxrs/pom.xml
+++ b/atomos.examples/atomos.examples.jaxrs/pom.xml
@@ -21,7 +21,7 @@
<dependencies>
<dependency>
<groupId>org.apache.felix.atomos.osgi.frameworks.equinox</groupId>
- <artifactId>atomos.osgi.framework</artifactId>
+ <artifactId>osgi.core</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
</dependencies>
@@ -37,7 +37,7 @@
<dependencies>
<dependency>
<groupId>org.apache.felix.atomos.osgi.frameworks.felix</groupId>
- <artifactId>atomos.osgi.framework</artifactId>
+ <artifactId>osgi.core</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
diff --git a/atomos.examples/atomos.examples.jlink/pom.xml b/atomos.examples/atomos.examples.jlink/pom.xml
index 7a85e09..b843c1b 100644
--- a/atomos.examples/atomos.examples.jlink/pom.xml
+++ b/atomos.examples/atomos.examples.jlink/pom.xml
@@ -66,7 +66,7 @@
</dependency>
<dependency>
<groupId>org.apache.felix.atomos.osgi.frameworks.equinox</groupId>
- <artifactId>atomos.osgi.framework</artifactId>
+ <artifactId>osgi.core</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
</dependencies>
@@ -86,7 +86,7 @@
</dependency>
<dependency>
<groupId>org.apache.felix.atomos.osgi.frameworks.felix</groupId>
- <artifactId>atomos.osgi.framework</artifactId>
+ <artifactId>osgi.core</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
</dependencies>
@@ -339,7 +339,7 @@
requires java.logging;
requires java.management;
requires transitive org.apache.felix.gogo.runtime;
- requires transitive atomos.osgi.framework;
+ requires transitive osgi.core;
requires transitive
osgi.promise;
@@ -379,7 +379,7 @@
<moduleInfoSource>
module org.apache.felix.gogo.command {
requires transitive org.apache.felix.gogo.runtime;
- requires transitive atomos.osgi.framework;
+ requires transitive osgi.core;
exports org.apache.felix.gogo.command;
@@ -395,7 +395,7 @@
module org.apache.felix.gogo.runtime {
requires java.logging;
- requires transitive atomos.osgi.framework;
+ requires transitive osgi.core;
exports org.apache.felix.gogo.runtime;
exports org.apache.felix.gogo.runtime.activator;
@@ -415,7 +415,7 @@
<moduleInfoSource>
module org.apache.felix.gogo.shell {
requires transitive org.apache.felix.gogo.runtime;
- requires transitive atomos.osgi.framework;
+ requires transitive osgi.core;
exports org.apache.felix.gogo.options;
exports
@@ -440,7 +440,7 @@
<path>${project.build.directory}/${project.artifactId}-${project.version}.jar</path>
</modulePath>
<modules>
- <module>atomos.osgi.framework</module>
+ <module>osgi.core</module>
<module>org.apache.felix.atomos.runtime</module>
<module>org.apache.felix.gogo.command</module>
<module>org.apache.felix.gogo.runtime</module>
@@ -481,7 +481,7 @@
<overWriteIfNewer>true</overWriteIfNewer>
<excludeTransitive>true</excludeTransitive>
<includeArtifactIds>
- atomos.osgi.framework,
+ osgi.core,
org.apache.felix.atomos.runtime,
org.apache.felix.atomos.tests.testbundles.service.contract,
org.apache.felix.atomos.tests.testbundles.service.impl,
diff --git a/atomos.examples/atomos.examples.springloader/pom.xml b/atomos.examples/atomos.examples.springloader/pom.xml
index 9aaa291..11fe8da 100644
--- a/atomos.examples/atomos.examples.springloader/pom.xml
+++ b/atomos.examples/atomos.examples.springloader/pom.xml
@@ -16,7 +16,7 @@
<dependencies>
<dependency>
<groupId>org.apache.felix.atomos.osgi.frameworks.equinox</groupId>
- <artifactId>atomos.osgi.framework</artifactId>
+ <artifactId>osgi.core</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
</dependencies>
@@ -32,7 +32,7 @@
<dependencies>
<dependency>
<groupId>org.apache.felix.atomos.osgi.frameworks.felix</groupId>
- <artifactId>atomos.osgi.framework</artifactId>
+ <artifactId>osgi.core</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
diff --git a/atomos.examples/atomos.examples.substrate.lib/pom.xml b/atomos.examples/atomos.examples.substrate.lib/pom.xml
index 8f60183..1ea0d7f 100644
--- a/atomos.examples/atomos.examples.substrate.lib/pom.xml
+++ b/atomos.examples/atomos.examples.substrate.lib/pom.xml
@@ -23,7 +23,7 @@
<dependencies>
<dependency>
<groupId>org.apache.felix.atomos.osgi.frameworks.equinox</groupId>
- <artifactId>atomos.osgi.framework</artifactId>
+ <artifactId>osgi.core</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
</dependencies>
@@ -39,7 +39,7 @@
<dependencies>
<dependency>
<groupId>org.apache.felix.atomos.osgi.frameworks.felix</groupId>
- <artifactId>atomos.osgi.framework</artifactId>
+ <artifactId>osgi.core</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
diff --git a/atomos.examples/atomos.examples.substrate.maven/pom.xml b/atomos.examples/atomos.examples.substrate.maven/pom.xml
index 6d5167a..8d2bbc1 100644
--- a/atomos.examples/atomos.examples.substrate.maven/pom.xml
+++ b/atomos.examples/atomos.examples.substrate.maven/pom.xml
@@ -14,7 +14,7 @@
<dependencies>
<dependency>
<groupId>org.apache.felix.atomos.osgi.frameworks.equinox</groupId>
- <artifactId>atomos.osgi.framework</artifactId>
+ <artifactId>osgi.core</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
</dependencies>
@@ -30,7 +30,7 @@
<dependencies>
<dependency>
<groupId>org.apache.felix.atomos.osgi.frameworks.felix</groupId>
- <artifactId>atomos.osgi.framework</artifactId>
+ <artifactId>osgi.core</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
diff --git a/atomos.osgi.frameworks/equinox/pom.xml b/atomos.osgi.frameworks/equinox/pom.xml
index f025129..421ea13 100644
--- a/atomos.osgi.frameworks/equinox/pom.xml
+++ b/atomos.osgi.frameworks/equinox/pom.xml
@@ -3,12 +3,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.felix.atomos.osgi.frameworks</groupId>
- <artifactId>atomos.osgi.frameworks</artifactId>
+ <artifactId>osgi.cores</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.felix.atomos.osgi.frameworks.equinox</groupId>
- <artifactId>atomos.osgi.framework</artifactId>
- <name>atomos.osgi.framework-equinox</name>
+ <artifactId>osgi.core</artifactId>
+ <name>osgi.core-equinox</name>
<scm>
<connection>scm:git:https://github.com/apache/felix-atomos.git</connection>
<developerConnection>scm:git:https://github.com/apache/felix-atomos.git</developerConnection>
diff --git a/atomos.osgi.frameworks/equinox/src/main/java/module-info.java b/atomos.osgi.frameworks/equinox/src/main/java/module-info.java
index e4c2522..993670b 100644
--- a/atomos.osgi.frameworks/equinox/src/main/java/module-info.java
+++ b/atomos.osgi.frameworks/equinox/src/main/java/module-info.java
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-open module atomos.osgi.framework
+module osgi.core
{
requires transitive org.eclipse.osgi;
}
diff --git a/atomos.osgi.frameworks/felix/pom.xml b/atomos.osgi.frameworks/felix/pom.xml
index 5f8539e..a55cb8c 100644
--- a/atomos.osgi.frameworks/felix/pom.xml
+++ b/atomos.osgi.frameworks/felix/pom.xml
@@ -3,12 +3,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.felix.atomos.osgi.frameworks</groupId>
- <artifactId>atomos.osgi.frameworks</artifactId>
+ <artifactId>osgi.cores</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.felix.atomos.osgi.frameworks.felix</groupId>
- <artifactId>atomos.osgi.framework</artifactId>
- <name>atomos.osgi.framework-felix</name>
+ <artifactId>osgi.core</artifactId>
+ <name>osgi.core-felix</name>
<scm>
<connection>scm:git:https://github.com/apache/felix-atomos.git</connection>
<developerConnection>scm:git:https://github.com/apache/felix-atomos.git</developerConnection>
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 1f36145..3df5b25 100644
--- a/atomos.osgi.frameworks/felix/src/main/java/module-info.java
+++ b/atomos.osgi.frameworks/felix/src/main/java/module-info.java
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-open module atomos.osgi.framework
+module osgi.core
{
requires transitive org.apache.felix.framework;
}
diff --git a/atomos.osgi.frameworks/pom.xml b/atomos.osgi.frameworks/pom.xml
index 5dd5eec..6dadc3d 100644
--- a/atomos.osgi.frameworks/pom.xml
+++ b/atomos.osgi.frameworks/pom.xml
@@ -9,7 +9,7 @@
</parent>
<packaging>pom</packaging>
<groupId>org.apache.felix.atomos.osgi.frameworks</groupId>
- <artifactId>atomos.osgi.frameworks</artifactId>
+ <artifactId>osgi.cores</artifactId>
<name>atomos.osgi.frameworks</name>
<properties>
<maven.javadoc.skip>true</maven.javadoc.skip>
diff --git a/atomos.runtime/pom.xml b/atomos.runtime/pom.xml
index 6f12d59..7694f8f 100644
--- a/atomos.runtime/pom.xml
+++ b/atomos.runtime/pom.xml
@@ -39,7 +39,7 @@
<dependencies>
<dependency>
<groupId>org.apache.felix.atomos.osgi.frameworks.equinox</groupId>
- <artifactId>atomos.osgi.framework</artifactId>
+ <artifactId>osgi.core</artifactId>
<version>1.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -56,7 +56,7 @@
<dependencies>
<dependency>
<groupId>org.apache.felix.atomos.osgi.frameworks.felix</groupId>
- <artifactId>atomos.osgi.framework</artifactId>
+ <artifactId>osgi.core</artifactId>
<version>1.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
diff --git a/atomos.runtime/src/main/java/module-info.java b/atomos.runtime/src/main/java/module-info.java
index 0e74aca..73dc8bb 100644
--- a/atomos.runtime/src/main/java/module-info.java
+++ b/atomos.runtime/src/main/java/module-info.java
@@ -23,7 +23,7 @@ open module org.apache.felix.atomos.runtime
exports org.apache.felix.atomos.runtime;
exports org.apache.felix.atomos.launch;
- requires transitive atomos.osgi.framework;
+ requires transitive osgi.core;
requires static osgi.annotation;
requires static jdk.unsupported;
requires static org.apache.felix.gogo.runtime;
diff --git a/atomos.tests/atomos.tests.classpath.service/pom.xml b/atomos.tests/atomos.tests.classpath.service/pom.xml
index 7cf568c..704f14a 100644
--- a/atomos.tests/atomos.tests.classpath.service/pom.xml
+++ b/atomos.tests/atomos.tests.classpath.service/pom.xml
@@ -14,7 +14,7 @@
<dependencies>
<dependency>
<groupId>org.apache.felix.atomos.osgi.frameworks.equinox</groupId>
- <artifactId>atomos.osgi.framework</artifactId>
+ <artifactId>osgi.core</artifactId>
<version>1.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -31,7 +31,7 @@
<dependencies>
<dependency>
<groupId>org.apache.felix.atomos.osgi.frameworks.felix</groupId>
- <artifactId>atomos.osgi.framework</artifactId>
+ <artifactId>osgi.core</artifactId>
<version>1.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
diff --git a/atomos.tests/atomos.tests.index.bundles/pom.xml b/atomos.tests/atomos.tests.index.bundles/pom.xml
index d8d2231..edfdd5e 100644
--- a/atomos.tests/atomos.tests.index.bundles/pom.xml
+++ b/atomos.tests/atomos.tests.index.bundles/pom.xml
@@ -14,7 +14,7 @@
<dependencies>
<dependency>
<groupId>org.apache.felix.atomos.osgi.frameworks.equinox</groupId>
- <artifactId>atomos.osgi.framework</artifactId>
+ <artifactId>osgi.core</artifactId>
<version>1.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -31,7 +31,7 @@
<dependencies>
<dependency>
<groupId>org.apache.felix.atomos.osgi.frameworks.felix</groupId>
- <artifactId>atomos.osgi.framework</artifactId>
+ <artifactId>osgi.core</artifactId>
<version>1.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
diff --git a/atomos.tests/atomos.tests.modulepath.service/pom.xml b/atomos.tests/atomos.tests.modulepath.service/pom.xml
index b0341c6..7b3c78e 100644
--- a/atomos.tests/atomos.tests.modulepath.service/pom.xml
+++ b/atomos.tests/atomos.tests.modulepath.service/pom.xml
@@ -14,7 +14,7 @@
<dependencies>
<dependency>
<groupId>org.apache.felix.atomos.osgi.frameworks.equinox</groupId>
- <artifactId>atomos.osgi.framework</artifactId>
+ <artifactId>osgi.core</artifactId>
<version>1.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -31,7 +31,7 @@
<dependencies>
<dependency>
<groupId>org.apache.felix.atomos.osgi.frameworks.felix</groupId>
- <artifactId>atomos.osgi.framework</artifactId>
+ <artifactId>osgi.core</artifactId>
<version>1.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
diff --git a/atomos.tests/atomos.tests.testbundles/atomos.tests.testbundles.dependent.x/pom.xml b/atomos.tests/atomos.tests.testbundles/atomos.tests.testbundles.dependent.x/pom.xml
index 3926e36..610ed54 100644
--- a/atomos.tests/atomos.tests.testbundles/atomos.tests.testbundles.dependent.x/pom.xml
+++ b/atomos.tests/atomos.tests.testbundles/atomos.tests.testbundles.dependent.x/pom.xml
@@ -15,9 +15,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.felix.atomos.osgi.frameworks.felix</groupId>
- <artifactId>atomos.osgi.framework</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/atomos.tests/atomos.tests.testbundles/atomos.tests.testbundles.dependent.x/src/main/java/module-info.java b/atomos.tests/atomos.tests.testbundles/atomos.tests.testbundles.dependent.x/src/main/java/module-info.java
index 6638a54..3868d9b 100644
--- a/atomos.tests/atomos.tests.testbundles/atomos.tests.testbundles.dependent.x/src/main/java/module-info.java
+++ b/atomos.tests/atomos.tests.testbundles/atomos.tests.testbundles.dependent.x/src/main/java/module-info.java
@@ -14,7 +14,7 @@
open module org.apache.felix.atomos.tests.testbundles.dependent.x
{
requires static osgi.annotation;
- requires atomos.osgi.framework;
+ requires osgi.core;
requires org.apache.felix.atomos.tests.testbundles.dependency.a;
requires org.apache.felix.atomos.tests.testbundles.dependency.b;
diff --git a/atomos.tests/atomos.tests.testbundles/atomos.tests.testbundles.service.impl.activator/pom.xml b/atomos.tests/atomos.tests.testbundles/atomos.tests.testbundles.service.impl.activator/pom.xml
index 2011d41..a9fed31 100644
--- a/atomos.tests/atomos.tests.testbundles/atomos.tests.testbundles.service.impl.activator/pom.xml
+++ b/atomos.tests/atomos.tests.testbundles/atomos.tests.testbundles.service.impl.activator/pom.xml
@@ -12,9 +12,8 @@
<dependencies>
<dependency>
- <groupId>org.apache.felix.atomos.osgi.frameworks.felix</groupId>
- <artifactId>atomos.osgi.framework</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/atomos.tests/atomos.tests.testbundles/atomos.tests.testbundles.service.impl.activator/src/main/java/module-info.java b/atomos.tests/atomos.tests.testbundles/atomos.tests.testbundles.service.impl.activator/src/main/java/module-info.java
index fb29cc1..51b54c5 100644
--- a/atomos.tests/atomos.tests.testbundles/atomos.tests.testbundles.service.impl.activator/src/main/java/module-info.java
+++ b/atomos.tests/atomos.tests.testbundles/atomos.tests.testbundles.service.impl.activator/src/main/java/module-info.java
@@ -14,6 +14,6 @@
open module org.apache.felix.atomos.tests.testbundles.service.impl.activator
{
requires transitive org.apache.felix.atomos.tests.testbundles.service.contract;
- requires atomos.osgi.framework;
+ requires osgi.core;
requires static osgi.annotation;
}
\ No newline at end of file