From fb050ac0400c0af78ab2c1530ea18f1d85c508bb Mon Sep 17 00:00:00 2001
From: Scott Lewis <scottslewis@gmail.com>
Date: Thu, 8 May 2025 15:08:33 -0700
Subject: [PATCH 1/2] Update to action-java to v4

---
 .github/workflows/maven.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 659819fee..185afb2ca 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -15,9 +15,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up JDK 17
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v4
       with:
         java-version: '17'
         distribution: 'temurin'

From 8dd8f597208023e3a5e8cb4e286c3ae6468f1508 Mon Sep 17 00:00:00 2001
From: Scott Lewis <scottslewis@gmail.com>
Date: Thu, 8 May 2025 15:17:11 -0700
Subject: [PATCH 2/2] Update to rosgi + rosgi feature to use updated version of
 org.objectweb in build

---
 .../bundles/ch.ethz.iks.r_osgi.remote/META-INF/MANIFEST.MF     | 2 +-
 protocols/bundles/ch.ethz.iks.r_osgi.remote/pom.xml            | 3 +--
 .../org.eclipse.ecf.remoteservice.rosgi.feature/feature.xml    | 2 +-
 .../org.eclipse.ecf.remoteservice.rosgi.feature/pom.xml        | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/protocols/bundles/ch.ethz.iks.r_osgi.remote/META-INF/MANIFEST.MF b/protocols/bundles/ch.ethz.iks.r_osgi.remote/META-INF/MANIFEST.MF
index c8d93b3d3..20f30f199 100644
--- a/protocols/bundles/ch.ethz.iks.r_osgi.remote/META-INF/MANIFEST.MF
+++ b/protocols/bundles/ch.ethz.iks.r_osgi.remote/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %plugin.name
 Bundle-SymbolicName: ch.ethz.iks.r_osgi.remote
 Automatic-Module-Name: ch.ethz.iks.r_osgi.remote
-Bundle-Version: 1.3.0.qualifier
+Bundle-Version: 1.3.1.qualifier
 Bundle-Vendor: %plugin.provider
 Import-Package: org.eclipse.ecf.remoteservice;version="7.3.0",
  org.eclipse.ecf.remoteservice.asyncproxy;version="[1.0.0,3.0.0)",
diff --git a/protocols/bundles/ch.ethz.iks.r_osgi.remote/pom.xml b/protocols/bundles/ch.ethz.iks.r_osgi.remote/pom.xml
index 5fbbf3129..ec4557a70 100644
--- a/protocols/bundles/ch.ethz.iks.r_osgi.remote/pom.xml
+++ b/protocols/bundles/ch.ethz.iks.r_osgi.remote/pom.xml
@@ -8,8 +8,7 @@
     <version>1.0.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
-  <groupId>org.eclipse.ecf</groupId>
   <artifactId>ch.ethz.iks.r_osgi.remote</artifactId>
-  <version>1.3.0-SNAPSHOT</version>
+  <version>1.3.1-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/releng/features/org.eclipse.ecf.remoteservice.rosgi.feature/feature.xml b/releng/features/org.eclipse.ecf.remoteservice.rosgi.feature/feature.xml
index 240fc84ef..cd0c17c75 100644
--- a/releng/features/org.eclipse.ecf.remoteservice.rosgi.feature/feature.xml
+++ b/releng/features/org.eclipse.ecf.remoteservice.rosgi.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.ecf.remoteservice.rosgi.feature"
       label="ECF Remote Services R-OSGi Provider"
-      version="2.1.0.qualifier"
+      version="2.1.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/releng/features/org.eclipse.ecf.remoteservice.rosgi.feature/pom.xml b/releng/features/org.eclipse.ecf.remoteservice.rosgi.feature/pom.xml
index e0fb24b46..5bd939938 100644
--- a/releng/features/org.eclipse.ecf.remoteservice.rosgi.feature/pom.xml
+++ b/releng/features/org.eclipse.ecf.remoteservice.rosgi.feature/pom.xml
@@ -10,6 +10,6 @@
   </parent>
   
   <artifactId>org.eclipse.ecf.remoteservice.rosgi.feature</artifactId>
-  <version>2.1.0-SNAPSHOT</version>
+  <version>2.1.1-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>