From e112bfc3a1ac2c8d24af54d7725980b3cc106f67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20L=C3=A4ubrich?= <christoph@laeubi-soft.de>
Date: Tue, 5 Mar 2024 08:29:32 +0100
Subject: [PATCH] Update felix-resolver and add github validation

Currently the felix-resolver project requires to be build on a true java
8 / 6 JDK as there is no release support for java 6, it also uses some
older OSGi framework dependencies.

This now does the follwoing:
- increase from Java 1.6 > 1.8
- update to the latest OSGi dependencies
- set the version to 3.0.0-SNAPSHOT to account for upgrade of Java+OSGi
- add a github verification that builds at laest the resolver part.
---
 .github/workflows/maven.yml | 23 +++++++++++++++++++++++
 .gitignore                  |  2 ++
 resolver/pom.xml            | 22 ++++++++++++----------
 3 files changed, 37 insertions(+), 10 deletions(-)
 create mode 100644 .github/workflows/maven.yml

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
new file mode 100644
index 0000000000..59f0f4427c
--- /dev/null
+++ b/.github/workflows/maven.yml
@@ -0,0 +1,23 @@
+name: Java CI with Maven
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up JDK 17
+      uses: actions/setup-java@v3
+      with:
+        java-version: '17'
+        distribution: 'temurin'
+        cache: maven
+    - name: Resolver
+      run: mvn -B package --file resolver/pom.xml
diff --git a/.gitignore b/.gitignore
index 7692143cb7..262a166146 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,5 @@ dependency-reduced-pom.xml
 /.metadata/
 /workspace/
 .vscode
+bin/
+target_test-classes/
\ No newline at end of file
diff --git a/resolver/pom.xml b/resolver/pom.xml
index cc2844dfd9..e340780d05 100644
--- a/resolver/pom.xml
+++ b/resolver/pom.xml
@@ -29,7 +29,7 @@
   <description>
     Provide OSGi resolver service.
   </description>
-  <version>2.1.0-SNAPSHOT</version>
+  <version>3.0.0-SNAPSHOT</version>
   <artifactId>org.apache.felix.resolver</artifactId>
   <scm>
      <connection>scm:git:https://github.com/apache/felix-dev.git</connection>
@@ -38,15 +38,17 @@
     <tag>HEAD</tag>
   </scm>
   <dependencies>
-   <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>osgi.annotation</artifactId>
-      <version>6.0.1</version>
+    <dependency>
+        <groupId>org.osgi</groupId>
+        <artifactId>osgi.annotation</artifactId>
+        <version>8.1.0</version>
+        <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.core</artifactId>
-      <version>5.0.0</version>
+        <groupId>org.osgi</groupId>
+        <artifactId>osgi.core</artifactId>
+        <version>8.0.0</version>
+        <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
@@ -68,7 +70,7 @@
     </dependency>
   </dependencies>
   <properties>
-    <felix.java.version>6</felix.java.version>
+    <felix.java.version>8</felix.java.version>
   </properties>
   <build>
     <plugins>
@@ -114,7 +116,7 @@
           <excludes>
             <exclude>src/**/packageinfo</exclude>
             <exclude>src/main/appended-resources/**</exclude>
-			<exclude>src/test/resources/resolution.json</exclude>
+            <exclude>src/test/resources/resolution.json</exclude>
             <exclude>src/test/resources/felix-4914.json</exclude>
           </excludes>
         </configuration>