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 17:58:41 UTC
[felix-atomos] branch master updated (da58c38 -> 30bd20e)
This is an automated email from the ASF dual-hosted git repository.
tjwatson pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/felix-atomos.git.
from da58c38 Merge pull request #43 from tjwatson/master
new ddc6688 Use profiles to ensure we only compile against one source for org.osgi
new 30bd20e Make atomos osgi.core match the osgi.org:osgi.core R8 version
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
atomos.examples/atomos.examples.index/pom.xml | 22 ++++++++++--------
atomos.examples/atomos.examples.jaxrs/pom.xml | 18 ++++++++++-----
atomos.examples/atomos.examples.jlink/pom.xml | 26 ++++++++++++++-------
.../atomos.examples.springloader/pom.xml | 22 ++++++++++--------
.../atomos.examples.substrate.lib/pom.xml | 22 ++++++++++--------
.../atomos.examples.substrate.maven/pom.xml | 18 ++++++++++-----
atomos.osgi.core/pom.xml | 1 +
atomos.runtime/pom.xml | 27 +++++++++++-----------
.../atomos.tests.classpath.service/pom.xml | 3 ---
atomos.tests/atomos.tests.index.bundles/pom.xml | 3 ---
.../atomos.tests.modulepath.service/pom.xml | 22 +++++++++++-------
11 files changed, 107 insertions(+), 77 deletions(-)
[felix-atomos] 01/02: Use profiles to ensure we only compile
against one source for org.osgi
Posted by tj...@apache.org.
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 ddc6688e88653591b41bda77148e6877118cf532
Author: Thomas Watson <tj...@us.ibm.com>
AuthorDate: Thu Feb 4 10:39:35 2021 -0600
Use profiles to ensure we only compile against one source for org.osgi
The default profile will use osgi.core from OSGi, equinox and felix
profiles will use osgi.core classes from the impls
---
atomos.examples/atomos.examples.index/pom.xml | 22 +++++++++++----------
atomos.examples/atomos.examples.jaxrs/pom.xml | 18 +++++++++++------
atomos.examples/atomos.examples.jlink/pom.xml | 22 +++++++++++++++------
.../atomos.examples.springloader/pom.xml | 22 +++++++++++----------
.../atomos.examples.substrate.lib/pom.xml | 22 +++++++++++----------
.../atomos.examples.substrate.maven/pom.xml | 18 +++++++++++------
atomos.runtime/pom.xml | 23 +++++++++++-----------
.../atomos.tests.classpath.service/pom.xml | 3 ---
atomos.tests/atomos.tests.index.bundles/pom.xml | 3 ---
.../atomos.tests.modulepath.service/pom.xml | 18 +++++++++++------
10 files changed, 100 insertions(+), 71 deletions(-)
diff --git a/atomos.examples/atomos.examples.index/pom.xml b/atomos.examples/atomos.examples.index/pom.xml
index a5e8506..370b2d4 100644
--- a/atomos.examples/atomos.examples.index/pom.xml
+++ b/atomos.examples/atomos.examples.index/pom.xml
@@ -12,11 +12,11 @@
<profiles>
<profile>
- <id>equinox</id>
+ <id>default-compile</id>
<dependencies>
<dependency>
- <groupId>org.eclipse.platform</groupId>
- <artifactId>org.eclipse.osgi</artifactId>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.core</artifactId>
</dependency>
</dependencies>
<activation>
@@ -24,18 +24,20 @@
</activation>
</profile>
<profile>
- <id>felix</id>
- <properties>
- <buildWithFelix>true</buildWithFelix>
- </properties>
+ <id>equinox</id>
<dependencies>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.framework</artifactId>
+ <groupId>org.eclipse.platform</groupId>
+ <artifactId>org.eclipse.osgi</artifactId>
</dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>felix</id>
+ <dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.log</artifactId>
+ <artifactId>org.apache.felix.framework</artifactId>
</dependency>
</dependencies>
</profile>
diff --git a/atomos.examples/atomos.examples.jaxrs/pom.xml b/atomos.examples/atomos.examples.jaxrs/pom.xml
index eb8deef..3c7ee75 100644
--- a/atomos.examples/atomos.examples.jaxrs/pom.xml
+++ b/atomos.examples/atomos.examples.jaxrs/pom.xml
@@ -17,11 +17,11 @@
<profiles>
<profile>
- <id>equinox</id>
+ <id>default-compile</id>
<dependencies>
<dependency>
- <groupId>org.eclipse.platform</groupId>
- <artifactId>org.eclipse.osgi</artifactId>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.core</artifactId>
</dependency>
</dependencies>
<activation>
@@ -29,10 +29,16 @@
</activation>
</profile>
<profile>
+ <id>equinox</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse.platform</groupId>
+ <artifactId>org.eclipse.osgi</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
<id>felix</id>
- <properties>
- <buildWithFelix>true</buildWithFelix>
- </properties>
<dependencies>
<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 9c50cac..8c4f5fd 100644
--- a/atomos.examples/atomos.examples.jlink/pom.xml
+++ b/atomos.examples/atomos.examples.jlink/pom.xml
@@ -58,38 +58,48 @@
</dependencies>
<profiles>
<profile>
+ <id>default-compile</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.core</artifactId>
+ </dependency>
+ </dependencies>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ </profile>
+ <profile>
<id>equinox</id>
<dependencies>
<dependency>
<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>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
</profile>
<profile>
<id>felix</id>
- <properties>
- <buildWithFelix>true</buildWithFelix>
- </properties>
<dependencies>
<dependency>
<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>
</profile>
diff --git a/atomos.examples/atomos.examples.springloader/pom.xml b/atomos.examples/atomos.examples.springloader/pom.xml
index 4704c0a..9e938c2 100644
--- a/atomos.examples/atomos.examples.springloader/pom.xml
+++ b/atomos.examples/atomos.examples.springloader/pom.xml
@@ -12,11 +12,11 @@
<profiles>
<profile>
- <id>equinox</id>
+ <id>default-compile</id>
<dependencies>
<dependency>
- <groupId>org.eclipse.platform</groupId>
- <artifactId>org.eclipse.osgi</artifactId>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.core</artifactId>
</dependency>
</dependencies>
<activation>
@@ -24,18 +24,20 @@
</activation>
</profile>
<profile>
- <id>felix</id>
- <properties>
- <buildWithFelix>true</buildWithFelix>
- </properties>
+ <id>equinox</id>
<dependencies>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.framework</artifactId>
+ <groupId>org.eclipse.platform</groupId>
+ <artifactId>org.eclipse.osgi</artifactId>
</dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>felix</id>
+ <dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.log</artifactId>
+ <artifactId>org.apache.felix.framework</artifactId>
</dependency>
</dependencies>
</profile>
diff --git a/atomos.examples/atomos.examples.substrate.lib/pom.xml b/atomos.examples/atomos.examples.substrate.lib/pom.xml
index fcaccb3..25ff074 100644
--- a/atomos.examples/atomos.examples.substrate.lib/pom.xml
+++ b/atomos.examples/atomos.examples.substrate.lib/pom.xml
@@ -19,11 +19,11 @@
<profiles>
<profile>
- <id>equinox</id>
+ <id>default-compile</id>
<dependencies>
<dependency>
- <groupId>org.eclipse.platform</groupId>
- <artifactId>org.eclipse.osgi</artifactId>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.core</artifactId>
</dependency>
</dependencies>
<activation>
@@ -31,18 +31,20 @@
</activation>
</profile>
<profile>
- <id>felix</id>
- <properties>
- <buildWithFelix>true</buildWithFelix>
- </properties>
+ <id>equinox</id>
<dependencies>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.framework</artifactId>
+ <groupId>org.eclipse.platform</groupId>
+ <artifactId>org.eclipse.osgi</artifactId>
</dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>felix</id>
+ <dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.log</artifactId>
+ <artifactId>org.apache.felix.framework</artifactId>
</dependency>
</dependencies>
</profile>
diff --git a/atomos.examples/atomos.examples.substrate.maven/pom.xml b/atomos.examples/atomos.examples.substrate.maven/pom.xml
index 6c141af..8f77151 100644
--- a/atomos.examples/atomos.examples.substrate.maven/pom.xml
+++ b/atomos.examples/atomos.examples.substrate.maven/pom.xml
@@ -10,11 +10,11 @@
<profiles>
<profile>
- <id>equinox</id>
+ <id>default-compile</id>
<dependencies>
<dependency>
- <groupId>org.eclipse.platform</groupId>
- <artifactId>org.eclipse.osgi</artifactId>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.core</artifactId>
</dependency>
</dependencies>
<activation>
@@ -22,10 +22,16 @@
</activation>
</profile>
<profile>
+ <id>equinox</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse.platform</groupId>
+ <artifactId>org.eclipse.osgi</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
<id>felix</id>
- <properties>
- <buildWithFelix>true</buildWithFelix>
- </properties>
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
diff --git a/atomos.runtime/pom.xml b/atomos.runtime/pom.xml
index 6bb91e7..c25f83f 100644
--- a/atomos.runtime/pom.xml
+++ b/atomos.runtime/pom.xml
@@ -35,6 +35,18 @@
</dependencies>
<profiles>
<profile>
+ <id>default-compile</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.core</artifactId>
+ </dependency>
+ </dependencies>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ </profile>
+ <profile>
<id>equinox</id>
<dependencies>
<dependency>
@@ -50,15 +62,9 @@
<scope>provided</scope>
</dependency>
</dependencies>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
</profile>
<profile>
<id>felix</id>
- <properties>
- <buildWithFelix>true</buildWithFelix>
- </properties>
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -72,11 +78,6 @@
<classifier>AtomosFelix</classifier>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.log</artifactId>
- <scope>provided</scope>
- </dependency>
</dependencies>
</profile>
<profile>
diff --git a/atomos.tests/atomos.tests.classpath.service/pom.xml b/atomos.tests/atomos.tests.classpath.service/pom.xml
index 6264618..d48700e 100644
--- a/atomos.tests/atomos.tests.classpath.service/pom.xml
+++ b/atomos.tests/atomos.tests.classpath.service/pom.xml
@@ -24,9 +24,6 @@
</profile>
<profile>
<id>felix</id>
- <properties>
- <buildWithFelix>true</buildWithFelix>
- </properties>
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
diff --git a/atomos.tests/atomos.tests.index.bundles/pom.xml b/atomos.tests/atomos.tests.index.bundles/pom.xml
index 5d2facf..d5c019f 100644
--- a/atomos.tests/atomos.tests.index.bundles/pom.xml
+++ b/atomos.tests/atomos.tests.index.bundles/pom.xml
@@ -24,9 +24,6 @@
</profile>
<profile>
<id>felix</id>
- <properties>
- <buildWithFelix>true</buildWithFelix>
- </properties>
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
diff --git a/atomos.tests/atomos.tests.modulepath.service/pom.xml b/atomos.tests/atomos.tests.modulepath.service/pom.xml
index e5e3f2a..f39e49b 100644
--- a/atomos.tests/atomos.tests.modulepath.service/pom.xml
+++ b/atomos.tests/atomos.tests.modulepath.service/pom.xml
@@ -10,6 +10,18 @@
<name>atomos.tests.modulepath.service</name>
<profiles>
<profile>
+ <id>default-compile</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.core</artifactId>
+ </dependency>
+ </dependencies>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ </profile>
+ <profile>
<id>equinox</id>
<dependencies>
<dependency>
@@ -25,15 +37,9 @@
<scope>provided</scope>
</dependency>
</dependencies>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
</profile>
<profile>
<id>felix</id>
- <properties>
- <buildWithFelix>true</buildWithFelix>
- </properties>
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
[felix-atomos] 02/02: Make atomos osgi.core match the
osgi.org:osgi.core R8 version
Posted by tj...@apache.org.
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 30bd20e406a2f79a79703649c0240a753b957068
Author: Thomas Watson <tj...@us.ibm.com>
AuthorDate: Thu Feb 4 11:43:13 2021 -0600
Make atomos osgi.core match the osgi.org:osgi.core R8 version
While not strictly necessary it makes it look more consistent
with the version required for the Framework impls.
---
atomos.examples/atomos.examples.jlink/pom.xml | 4 ++--
atomos.osgi.core/pom.xml | 1 +
atomos.runtime/pom.xml | 4 ++--
atomos.tests/atomos.tests.modulepath.service/pom.xml | 4 ++--
4 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/atomos.examples/atomos.examples.jlink/pom.xml b/atomos.examples/atomos.examples.jlink/pom.xml
index 8c4f5fd..a8be6cb 100644
--- a/atomos.examples/atomos.examples.jlink/pom.xml
+++ b/atomos.examples/atomos.examples.jlink/pom.xml
@@ -80,7 +80,7 @@
<dependency>
<groupId>org.apache.felix.atomos</groupId>
<artifactId>osgi.core</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>8.0.0-SNAPSHOT</version>
<classifier>AtomosEquinox</classifier>
<scope>provided</scope>
</dependency>
@@ -97,7 +97,7 @@
<dependency>
<groupId>org.apache.felix.atomos</groupId>
<artifactId>osgi.core</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>8.0.0-SNAPSHOT</version>
<classifier>AtomosFelix</classifier>
<scope>provided</scope>
</dependency>
diff --git a/atomos.osgi.core/pom.xml b/atomos.osgi.core/pom.xml
index 0809e75..b6b7369 100644
--- a/atomos.osgi.core/pom.xml
+++ b/atomos.osgi.core/pom.xml
@@ -10,6 +10,7 @@
<groupId>org.apache.felix.atomos</groupId>
<packaging>jar</packaging>
<artifactId>osgi.core</artifactId>
+ <version>8.0.0-SNAPSHOT</version>
<name>osgi.core</name>
<scm>
<connection>scm:git:https://github.com/apache/felix-atomos.git</connection>
diff --git a/atomos.runtime/pom.xml b/atomos.runtime/pom.xml
index c25f83f..a59afe5 100644
--- a/atomos.runtime/pom.xml
+++ b/atomos.runtime/pom.xml
@@ -57,7 +57,7 @@
<dependency>
<groupId>org.apache.felix.atomos</groupId>
<artifactId>osgi.core</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>8.0.0-SNAPSHOT</version>
<classifier>AtomosEquinox</classifier>
<scope>provided</scope>
</dependency>
@@ -74,7 +74,7 @@
<dependency>
<groupId>org.apache.felix.atomos</groupId>
<artifactId>osgi.core</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>8.0.0-SNAPSHOT</version>
<classifier>AtomosFelix</classifier>
<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 f39e49b..48ac860 100644
--- a/atomos.tests/atomos.tests.modulepath.service/pom.xml
+++ b/atomos.tests/atomos.tests.modulepath.service/pom.xml
@@ -32,7 +32,7 @@
<dependency>
<groupId>org.apache.felix.atomos</groupId>
<artifactId>osgi.core</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>8.0.0-SNAPSHOT</version>
<classifier>AtomosEquinox</classifier>
<scope>provided</scope>
</dependency>
@@ -49,7 +49,7 @@
<dependency>
<groupId>org.apache.felix.atomos</groupId>
<artifactId>osgi.core</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>8.0.0-SNAPSHOT</version>
<classifier>AtomosFelix</classifier>
<scope>provided</scope>
</dependency>