This is an automated email from the ASF dual-hosted git repository.
alien11689 pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/aries.git
The following commit(s) were added to refs/heads/trunk by this push:
new 0ba8d7ca9 [MAINTENANCE] Replace services with org.eclipse.osgi.services
0ba8d7ca9 is described below
commit 0ba8d7ca9951330073b0699801ed29a97bddab92
Author: Dominik Przybysz <[email protected]>
AuthorDate: Sat May 3 21:42:33 2025 +0200
[MAINTENANCE] Replace services with org.eclipse.osgi.services
---
samples/ariestrader/assemblies/equinox-test-harness/pom.xml | 5 +++--
.../src/main/filtered-resources/configuration/config.ini | 2 +-
samples/blueprint/helloworld/helloworld-assembly/pom.xml | 8 ++++----
.../src/main/filtered-resources/configuration/config.ini | 2 +-
samples/blueprint/helloworld/helloworld-itests/pom.xml | 6 +++---
.../samples/blueprint/helloworld/itests/HelloworldSampleTest.java | 2 +-
6 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/samples/ariestrader/assemblies/equinox-test-harness/pom.xml
b/samples/ariestrader/assemblies/equinox-test-harness/pom.xml
index 4bcd0375d..bc5d74034 100644
--- a/samples/ariestrader/assemblies/equinox-test-harness/pom.xml
+++ b/samples/ariestrader/assemblies/equinox-test-harness/pom.xml
@@ -30,6 +30,7 @@
<packaging>pom</packaging>
<properties>
+
<org.eclipse.osgi.services.version>3.2.100.v20100503</org.eclipse.osgi.services.version>
<org.eclipse.osgi.version>3.23.0</org.eclipse.osgi.version>
</properties>
@@ -50,8 +51,8 @@
</dependency>
<dependency>
<groupId>org.eclipse.osgi</groupId>
- <artifactId>services</artifactId>
- <version>${services.version}</version>
+ <artifactId>org.eclipse.osgi.services</artifactId>
+ <version>${org.eclipse.osgi.services.version}</version>
</dependency>
<dependency>
<groupId>org.ops4j.pax.logging</groupId>
diff --git
a/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini
b/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini
index e0d8cb86d..6b03227fb 100644
---
a/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini
+++
b/samples/ariestrader/assemblies/equinox-test-harness/src/main/filtered-resources/configuration/config.ini
@@ -17,7 +17,7 @@
osgi.bundles=\
cm-${cm.version}.jar@start,\
-services-${services.version}.jar@start,\
+org.eclipse.osgi.services-${org.eclipse.osgi.services.version}.jar@start,\
asm-${asm.version}.jar@start,\
asm-commons-${asm.version}.jar@start,\
asm-tree-${asm.version}.jar@start,\
diff --git a/samples/blueprint/helloworld/helloworld-assembly/pom.xml
b/samples/blueprint/helloworld/helloworld-assembly/pom.xml
index 00d3f795d..25fd7e8c6 100644
--- a/samples/blueprint/helloworld/helloworld-assembly/pom.xml
+++ b/samples/blueprint/helloworld/helloworld-assembly/pom.xml
@@ -29,9 +29,9 @@
<packaging>pom</packaging>
<properties>
- <org.eclipse.osgi.version>3.23.0</org.eclipse.osgi.version>
<cm.version>3.2.0-v20070116</cm.version>
- <services.version>3.1.200-v20070605</services.version>
+
<org.eclipse.osgi.services.version>3.2.100.v20100503</org.eclipse.osgi.services.version>
+ <org.eclipse.osgi.version>3.23.0</org.eclipse.osgi.version>
</properties>
<dependencies>
@@ -49,8 +49,8 @@
<dependency>
<groupId>org.eclipse.osgi</groupId>
- <artifactId>services</artifactId>
- <version>${services.version}</version>
+ <artifactId>org.eclipse.osgi.services</artifactId>
+ <version>${org.eclipse.osgi.services.version}</version>
</dependency>
<dependency>
diff --git
a/samples/blueprint/helloworld/helloworld-assembly/src/main/filtered-resources/configuration/config.ini
b/samples/blueprint/helloworld/helloworld-assembly/src/main/filtered-resources/configuration/config.ini
index 34fe6990c..0be76c24b 100644
---
a/samples/blueprint/helloworld/helloworld-assembly/src/main/filtered-resources/configuration/config.ini
+++
b/samples/blueprint/helloworld/helloworld-assembly/src/main/filtered-resources/configuration/config.ini
@@ -17,7 +17,7 @@
osgi.bundles=\
cm-${cm.version}@start,\
-services-${services.version}@start,\
+org.eclipse.osgi.services-${org.eclipse.osgi.services.version}@start,\
pax-logging-api-${pax-logging.version}.jar@start,\
pax-logging-log4j2-${pax-logging.version}.jar@start,\
asm-${asm.version}.jar@start,\
diff --git a/samples/blueprint/helloworld/helloworld-itests/pom.xml
b/samples/blueprint/helloworld/helloworld-itests/pom.xml
index b51afafff..37ed57c02 100644
--- a/samples/blueprint/helloworld/helloworld-itests/pom.xml
+++ b/samples/blueprint/helloworld/helloworld-itests/pom.xml
@@ -35,11 +35,11 @@
<cm.version>3.2.0-v20070116</cm.version>
<depends-maven-plugin.version>1.5.0</depends-maven-plugin.version>
<org.apache.aries.proxy.version>1.0.0</org.apache.aries.proxy.version>
+
<org.eclipse.osgi.services.version>3.2.100.v20100503</org.eclipse.osgi.services.version>
<org.eclipse.osgi.version>3.23.0</org.eclipse.osgi.version>
<pax-exam.version>4.13.5</pax-exam.version>
<pax-logging.version>1.12.12</pax-logging.version>
<pax-url.version>2.6.16</pax-url.version>
- <services.version>3.1.200-v20070605</services.version>
</properties>
<dependencies>
@@ -184,8 +184,8 @@
<dependency>
<groupId>org.eclipse.osgi</groupId>
- <artifactId>services</artifactId>
- <version>${services.version}</version>
+ <artifactId>org.eclipse.osgi.services</artifactId>
+ <version>${org.eclipse.osgi.services.version}</version>
<scope>test</scope>
</dependency>
diff --git
a/samples/blueprint/helloworld/helloworld-itests/src/test/java/org/apache/aries/samples/blueprint/helloworld/itests/HelloworldSampleTest.java
b/samples/blueprint/helloworld/helloworld-itests/src/test/java/org/apache/aries/samples/blueprint/helloworld/itests/HelloworldSampleTest.java
index cbf5f55af..e8b3ec059 100644
---
a/samples/blueprint/helloworld/helloworld-itests/src/test/java/org/apache/aries/samples/blueprint/helloworld/itests/HelloworldSampleTest.java
+++
b/samples/blueprint/helloworld/helloworld-itests/src/test/java/org/apache/aries/samples/blueprint/helloworld/itests/HelloworldSampleTest.java
@@ -175,7 +175,7 @@ public class HelloworldSampleTest extends
AbstractIntegrationTest {
// Bundles
mavenBundle("org.eclipse.equinox", "cm"),
- mavenBundle("org.eclipse.osgi", "services"),
+ mavenBundle("org.eclipse.osgi", "org.eclipse.osgi.services"),
mavenBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint" ),
mavenBundle("org.apache.aries.proxy",
"org.apache.aries.proxy"),
