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/04 05:18:18 UTC
[felix-atomos] branch master updated: Create a single
org.apache.felix.atomos:osgi.core project
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
The following commit(s) were added to refs/heads/master by this push:
new fcc6521 Create a single org.apache.felix.atomos:osgi.core project
new da58c38 Merge pull request #43 from tjwatson/master
fcc6521 is described below
commit fcc652169466f51ce685b0358d94f84f762845cc
Author: Thomas Watson <tj...@us.ibm.com>
AuthorDate: Wed Feb 3 16:16:45 2021 -0600
Create a single org.apache.felix.atomos:osgi.core project
This project now creates different classifiers for equinox
and felix
---
atomos.examples/atomos.examples.index/pom.xml | 10 +-
atomos.examples/atomos.examples.jaxrs/pom.xml | 10 +-
atomos.examples/atomos.examples.jlink/pom.xml | 6 +-
.../atomos.examples.springloader/pom.xml | 10 +-
.../atomos.examples.substrate.lib/pom.xml | 10 +-
.../atomos.examples.substrate.maven/pom.xml | 10 +-
atomos.osgi.core/pom.xml | 103 +++++++++++++++++++++
atomos.osgi.core/src/main/resources/README | 18 ++++
atomos.osgi.frameworks/equinox/pom.xml | 25 -----
.../equinox/src/main/java/module-info.java | 19 ----
atomos.osgi.frameworks/felix/pom.xml | 25 -----
.../felix/src/main/java/module-info.java | 19 ----
atomos.osgi.frameworks/pom.xml | 27 ------
atomos.runtime/pom.xml | 21 ++++-
atomos.runtime/src/main/java/module-info.java | 2 +-
.../atomos.tests.classpath.service/pom.xml | 14 ++-
atomos.tests/atomos.tests.index.bundles/pom.xml | 14 ++-
.../atomos.tests.modulepath.service/pom.xml | 16 +++-
pom.xml | 2 +-
19 files changed, 192 insertions(+), 169 deletions(-)
diff --git a/atomos.examples/atomos.examples.index/pom.xml b/atomos.examples/atomos.examples.index/pom.xml
index 6694769..a5e8506 100644
--- a/atomos.examples/atomos.examples.index/pom.xml
+++ b/atomos.examples/atomos.examples.index/pom.xml
@@ -15,9 +15,8 @@
<id>equinox</id>
<dependencies>
<dependency>
- <groupId>org.apache.felix.atomos.osgi.frameworks.equinox</groupId>
- <artifactId>osgi.core</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <groupId>org.eclipse.platform</groupId>
+ <artifactId>org.eclipse.osgi</artifactId>
</dependency>
</dependencies>
<activation>
@@ -31,9 +30,8 @@
</properties>
<dependencies>
<dependency>
- <groupId>org.apache.felix.atomos.osgi.frameworks.felix</groupId>
- <artifactId>osgi.core</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.framework</artifactId>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
diff --git a/atomos.examples/atomos.examples.jaxrs/pom.xml b/atomos.examples/atomos.examples.jaxrs/pom.xml
index 59a42b4..eb8deef 100644
--- a/atomos.examples/atomos.examples.jaxrs/pom.xml
+++ b/atomos.examples/atomos.examples.jaxrs/pom.xml
@@ -20,9 +20,8 @@
<id>equinox</id>
<dependencies>
<dependency>
- <groupId>org.apache.felix.atomos.osgi.frameworks.equinox</groupId>
- <artifactId>osgi.core</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <groupId>org.eclipse.platform</groupId>
+ <artifactId>org.eclipse.osgi</artifactId>
</dependency>
</dependencies>
<activation>
@@ -36,9 +35,8 @@
</properties>
<dependencies>
<dependency>
- <groupId>org.apache.felix.atomos.osgi.frameworks.felix</groupId>
- <artifactId>osgi.core</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.framework</artifactId>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
diff --git a/atomos.examples/atomos.examples.jlink/pom.xml b/atomos.examples/atomos.examples.jlink/pom.xml
index b843c1b..9c50cac 100644
--- a/atomos.examples/atomos.examples.jlink/pom.xml
+++ b/atomos.examples/atomos.examples.jlink/pom.xml
@@ -65,9 +65,10 @@
<artifactId>org.eclipse.osgi</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.felix.atomos.osgi.frameworks.equinox</groupId>
+ <groupId>org.apache.felix.atomos</groupId>
<artifactId>osgi.core</artifactId>
<version>1.0.0-SNAPSHOT</version>
+ <classifier>AtomosEquinox</classifier>
</dependency>
</dependencies>
<activation>
@@ -85,9 +86,10 @@
<artifactId>org.apache.felix.framework</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.felix.atomos.osgi.frameworks.felix</groupId>
+ <groupId>org.apache.felix.atomos</groupId>
<artifactId>osgi.core</artifactId>
<version>1.0.0-SNAPSHOT</version>
+ <classifier>AtomosFelix</classifier>
</dependency>
</dependencies>
</profile>
diff --git a/atomos.examples/atomos.examples.springloader/pom.xml b/atomos.examples/atomos.examples.springloader/pom.xml
index 11fe8da..4704c0a 100644
--- a/atomos.examples/atomos.examples.springloader/pom.xml
+++ b/atomos.examples/atomos.examples.springloader/pom.xml
@@ -15,9 +15,8 @@
<id>equinox</id>
<dependencies>
<dependency>
- <groupId>org.apache.felix.atomos.osgi.frameworks.equinox</groupId>
- <artifactId>osgi.core</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <groupId>org.eclipse.platform</groupId>
+ <artifactId>org.eclipse.osgi</artifactId>
</dependency>
</dependencies>
<activation>
@@ -31,9 +30,8 @@
</properties>
<dependencies>
<dependency>
- <groupId>org.apache.felix.atomos.osgi.frameworks.felix</groupId>
- <artifactId>osgi.core</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.framework</artifactId>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
diff --git a/atomos.examples/atomos.examples.substrate.lib/pom.xml b/atomos.examples/atomos.examples.substrate.lib/pom.xml
index 1ea0d7f..fcaccb3 100644
--- a/atomos.examples/atomos.examples.substrate.lib/pom.xml
+++ b/atomos.examples/atomos.examples.substrate.lib/pom.xml
@@ -22,9 +22,8 @@
<id>equinox</id>
<dependencies>
<dependency>
- <groupId>org.apache.felix.atomos.osgi.frameworks.equinox</groupId>
- <artifactId>osgi.core</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <groupId>org.eclipse.platform</groupId>
+ <artifactId>org.eclipse.osgi</artifactId>
</dependency>
</dependencies>
<activation>
@@ -38,9 +37,8 @@
</properties>
<dependencies>
<dependency>
- <groupId>org.apache.felix.atomos.osgi.frameworks.felix</groupId>
- <artifactId>osgi.core</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.framework</artifactId>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
diff --git a/atomos.examples/atomos.examples.substrate.maven/pom.xml b/atomos.examples/atomos.examples.substrate.maven/pom.xml
index 8d2bbc1..6c141af 100644
--- a/atomos.examples/atomos.examples.substrate.maven/pom.xml
+++ b/atomos.examples/atomos.examples.substrate.maven/pom.xml
@@ -13,9 +13,8 @@
<id>equinox</id>
<dependencies>
<dependency>
- <groupId>org.apache.felix.atomos.osgi.frameworks.equinox</groupId>
- <artifactId>osgi.core</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <groupId>org.eclipse.platform</groupId>
+ <artifactId>org.eclipse.osgi</artifactId>
</dependency>
</dependencies>
<activation>
@@ -29,9 +28,8 @@
</properties>
<dependencies>
<dependency>
- <groupId>org.apache.felix.atomos.osgi.frameworks.felix</groupId>
- <artifactId>osgi.core</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.framework</artifactId>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
diff --git a/atomos.osgi.core/pom.xml b/atomos.osgi.core/pom.xml
new file mode 100644
index 0000000..0809e75
--- /dev/null
+++ b/atomos.osgi.core/pom.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>atomos-parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../atomos-parent/pom.xml</relativePath>
+ </parent>
+ <groupId>org.apache.felix.atomos</groupId>
+ <packaging>jar</packaging>
+ <artifactId>osgi.core</artifactId>
+ <name>osgi.core</name>
+ <scm>
+ <connection>scm:git:https://github.com/apache/felix-atomos.git</connection>
+ <developerConnection>scm:git:https://github.com/apache/felix-atomos.git</developerConnection>
+ <url>https://github.com/apache/felix-atomos</url>
+ <tag>HEAD</tag>
+ </scm>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.moditect</groupId>
+ <artifactId>moditect-maven-plugin</artifactId>
+ <version>1.0.0.RC1</version>
+ <executions>
+ <execution>
+ <id>add-module-infos-equinox</id>
+ <phase>package</phase>
+ <goals>
+ <goal>add-module-info</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/modules/equinox</outputDirectory>
+ <overwriteExistingFiles>true</overwriteExistingFiles>
+ <modules>
+ <module>
+ <file>${project.build.directory}/${project.artifactId}-${project.version}.jar</file>
+ <moduleInfoSource>
+module osgi.core
+{
+ requires transitive org.eclipse.osgi;
+}
+ </moduleInfoSource>
+ </module>
+ </modules>
+ </configuration>
+ </execution>
+ <execution>
+ <id>add-module-infos-felix</id>
+ <phase>package</phase>
+ <goals>
+ <goal>add-module-info</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/modules/felix</outputDirectory>
+ <overwriteExistingFiles>true</overwriteExistingFiles>
+ <modules>
+ <module>
+ <file>${project.build.directory}/${project.artifactId}-${project.version}.jar</file>
+ <moduleInfoSource>
+module osgi.core
+{
+ requires transitive org.apache.felix.framework;
+}
+ </moduleInfoSource>
+ </module>
+ </modules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>3.2.0</version>
+ <executions>
+ <execution>
+ <id>attach-artifacts</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>${project.build.directory}/modules/felix/${project.artifactId}-${project.version}.jar</file>
+ <type>jar</type>
+ <classifier>AtomosFelix</classifier>
+ </artifact>
+ <artifact>
+ <file>${project.build.directory}/modules/equinox/${project.artifactId}-${project.version}.jar</file>
+ <type>jar</type>
+ <classifier>AtomosEquinox</classifier>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
diff --git a/atomos.osgi.core/src/main/resources/README b/atomos.osgi.core/src/main/resources/README
new file mode 100644
index 0000000..daf5d58
--- /dev/null
+++ b/atomos.osgi.core/src/main/resources/README
@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+This module provides a facade for osgi.core to represent a framework implementation.
diff --git a/atomos.osgi.frameworks/equinox/pom.xml b/atomos.osgi.frameworks/equinox/pom.xml
deleted file mode 100644
index 421ea13..0000000
--- a/atomos.osgi.frameworks/equinox/pom.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.felix.atomos.osgi.frameworks</groupId>
- <artifactId>osgi.cores</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </parent>
- <groupId>org.apache.felix.atomos.osgi.frameworks.equinox</groupId>
- <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>
- <url>https://github.com/apache/felix-atomos</url>
- <tag>HEAD</tag>
- </scm>
-
- <dependencies>
- <dependency>
- <groupId>org.eclipse.platform</groupId>
- <artifactId>org.eclipse.osgi</artifactId>
- </dependency>
- </dependencies>
-</project>
diff --git a/atomos.osgi.frameworks/equinox/src/main/java/module-info.java b/atomos.osgi.frameworks/equinox/src/main/java/module-info.java
deleted file mode 100644
index 993670b..0000000
--- a/atomos.osgi.frameworks/equinox/src/main/java/module-info.java
+++ /dev/null
@@ -1,19 +0,0 @@
-
-/*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-module osgi.core
-{
- requires transitive org.eclipse.osgi;
-}
diff --git a/atomos.osgi.frameworks/felix/pom.xml b/atomos.osgi.frameworks/felix/pom.xml
deleted file mode 100644
index a55cb8c..0000000
--- a/atomos.osgi.frameworks/felix/pom.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.felix.atomos.osgi.frameworks</groupId>
- <artifactId>osgi.cores</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </parent>
- <groupId>org.apache.felix.atomos.osgi.frameworks.felix</groupId>
- <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>
- <url>https://github.com/apache/felix-atomos</url>
- <tag>HEAD</tag>
- </scm>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <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
deleted file mode 100644
index 3df5b25..0000000
--- a/atomos.osgi.frameworks/felix/src/main/java/module-info.java
+++ /dev/null
@@ -1,19 +0,0 @@
-
-/*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-module osgi.core
-{
- requires transitive org.apache.felix.framework;
-}
diff --git a/atomos.osgi.frameworks/pom.xml b/atomos.osgi.frameworks/pom.xml
deleted file mode 100644
index 6dadc3d..0000000
--- a/atomos.osgi.frameworks/pom.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.felix</groupId>
- <artifactId>atomos-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <relativePath>../atomos-parent/pom.xml</relativePath>
- </parent>
- <packaging>pom</packaging>
- <groupId>org.apache.felix.atomos.osgi.frameworks</groupId>
- <artifactId>osgi.cores</artifactId>
- <name>atomos.osgi.frameworks</name>
- <properties>
- <maven.javadoc.skip>true</maven.javadoc.skip>
- </properties>
- <scm>
- <connection>scm:git:https://github.com/apache/felix-atomos.git</connection>
- <developerConnection>scm:git:https://github.com/apache/felix-atomos.git</developerConnection>
- <url>https://github.com/apache/felix-atomos</url>
- <tag>HEAD</tag>
- </scm>
- <modules>
- <module>equinox</module>
- <module>felix</module>
- </modules>
-</project>
diff --git a/atomos.runtime/pom.xml b/atomos.runtime/pom.xml
index 7694f8f..6bb91e7 100644
--- a/atomos.runtime/pom.xml
+++ b/atomos.runtime/pom.xml
@@ -38,9 +38,15 @@
<id>equinox</id>
<dependencies>
<dependency>
- <groupId>org.apache.felix.atomos.osgi.frameworks.equinox</groupId>
+ <groupId>org.eclipse.platform</groupId>
+ <artifactId>org.eclipse.osgi</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix.atomos</groupId>
<artifactId>osgi.core</artifactId>
<version>1.0.0-SNAPSHOT</version>
+ <classifier>AtomosEquinox</classifier>
<scope>provided</scope>
</dependency>
</dependencies>
@@ -55,9 +61,20 @@
</properties>
<dependencies>
<dependency>
- <groupId>org.apache.felix.atomos.osgi.frameworks.felix</groupId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.framework</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix.atomos</groupId>
<artifactId>osgi.core</artifactId>
<version>1.0.0-SNAPSHOT</version>
+ <classifier>AtomosFelix</classifier>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.log</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/atomos.runtime/src/main/java/module-info.java b/atomos.runtime/src/main/java/module-info.java
index 73dc8bb..73c76c6 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 osgi.core;
+ requires 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 704f14a..6264618 100644
--- a/atomos.tests/atomos.tests.classpath.service/pom.xml
+++ b/atomos.tests/atomos.tests.classpath.service/pom.xml
@@ -13,10 +13,9 @@
<id>equinox</id>
<dependencies>
<dependency>
- <groupId>org.apache.felix.atomos.osgi.frameworks.equinox</groupId>
- <artifactId>osgi.core</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <scope>provided</scope>
+ <groupId>org.eclipse.platform</groupId>
+ <artifactId>org.eclipse.osgi</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
<activation>
@@ -30,10 +29,9 @@
</properties>
<dependencies>
<dependency>
- <groupId>org.apache.felix.atomos.osgi.frameworks.felix</groupId>
- <artifactId>osgi.core</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <scope>provided</scope>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.framework</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
</profile>
diff --git a/atomos.tests/atomos.tests.index.bundles/pom.xml b/atomos.tests/atomos.tests.index.bundles/pom.xml
index edfdd5e..5d2facf 100644
--- a/atomos.tests/atomos.tests.index.bundles/pom.xml
+++ b/atomos.tests/atomos.tests.index.bundles/pom.xml
@@ -13,10 +13,9 @@
<id>equinox</id>
<dependencies>
<dependency>
- <groupId>org.apache.felix.atomos.osgi.frameworks.equinox</groupId>
- <artifactId>osgi.core</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <scope>provided</scope>
+ <groupId>org.eclipse.platform</groupId>
+ <artifactId>org.eclipse.osgi</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
<activation>
@@ -30,10 +29,9 @@
</properties>
<dependencies>
<dependency>
- <groupId>org.apache.felix.atomos.osgi.frameworks.felix</groupId>
- <artifactId>osgi.core</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <scope>provided</scope>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.framework</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
</profile>
diff --git a/atomos.tests/atomos.tests.modulepath.service/pom.xml b/atomos.tests/atomos.tests.modulepath.service/pom.xml
index 7b3c78e..e5e3f2a 100644
--- a/atomos.tests/atomos.tests.modulepath.service/pom.xml
+++ b/atomos.tests/atomos.tests.modulepath.service/pom.xml
@@ -13,9 +13,15 @@
<id>equinox</id>
<dependencies>
<dependency>
- <groupId>org.apache.felix.atomos.osgi.frameworks.equinox</groupId>
+ <groupId>org.eclipse.platform</groupId>
+ <artifactId>org.eclipse.osgi</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix.atomos</groupId>
<artifactId>osgi.core</artifactId>
<version>1.0.0-SNAPSHOT</version>
+ <classifier>AtomosEquinox</classifier>
<scope>provided</scope>
</dependency>
</dependencies>
@@ -30,9 +36,15 @@
</properties>
<dependencies>
<dependency>
- <groupId>org.apache.felix.atomos.osgi.frameworks.felix</groupId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.framework</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix.atomos</groupId>
<artifactId>osgi.core</artifactId>
<version>1.0.0-SNAPSHOT</version>
+ <classifier>AtomosFelix</classifier>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/pom.xml b/pom.xml
index 86dfbf3..4ad4d82 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<modules>
<module>atomos-parent</module>
- <module>atomos.osgi.frameworks</module>
+ <module>atomos.osgi.core</module>
<module>atomos.runtime</module>
<module>atomos.tests</module>
<module>atomos.utils</module>