Merge pull request #26 from ideas-into-software/jakarta-javax-split

Jakarta-Javax split
geckoprojects-org · Nov 10, 2023 · 2a20571 · 2a20571
2 parents e20884c + d128b6f
commit 2a20571
Show file tree

Hide file tree

Showing 81 changed files with 1,175 additions and 240 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -46,7 +46,7 @@ jobs:
     - name: Gradle version
       run: ./gradlew --no-daemon --version
     - name: Build with Gradle
-      run: ./gradlew build -x testOSGi
+      run: ./gradlew build -x itest
     - name: Upload Test Reports
       if: ${{ always() && ((steps.build.outcome == 'success') || (steps.build.outcome == 'failure')) }}
       uses: actions/upload-artifact@v2

diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml
@@ -34,4 +34,4 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: ./gradlew build sonarqube -x test -x testOSGi --info --stacktrace
+        run: ./gradlew build sonarqube -x test -x itest --info --stacktrace
diff --git a/cnf/central.mvn b/cnf/central.mvn
@@ -4,6 +4,8 @@ biz.aQute:biz.aQute.gogo.commands.provider:1.8.0
 biz.aQute:biz.aQute.wrapper.hamcrest:1.9.0
 
 jakarta.ws.rs:jakarta.ws.rs-api:3.1.0
+jakarta.ws.rs:jakarta.ws.rs-api:2.1.6
+
 jakarta.annotation:jakarta.annotation-api:2.1.1
 jakarta.xml.bind:jakarta.xml.bind-api:4.0.0
 jakarta.activation:jakarta.activation-api:2.1.0
@@ -99,6 +101,7 @@ org.osgi:org.osgi.service.event:1.4.0
 org.osgi:org.osgi.service.http.whiteboard:1.1.0
 org.osgi:org.osgi.service.http:1.2.1
 org.osgi:org.osgi.service.jakartars:jar:2.0.0
+org.osgi:org.osgi.service.jaxrs:1.0.1
 org.osgi:org.osgi.service.jdbc:1.0.0
 org.osgi:org.osgi.service.log:1.5.0
 org.osgi:org.osgi.service.metatype.annotations:1.4.0

diff --git a/cnf/dim_release.mvn b/cnf/dim_release.mvn
@@ -1 +1,31 @@
 org.geckoprojects.emf.utils:org.gecko.emf.rest:2.0.0-SNAPSHOT
+org.geckoprojects.emf.utils:org.gecko.emf.bson:1.2.3-SNAPSHOT
+org.geckoprojects.emf.utils:org.gecko.emf.bson.tests:1.0.3-SNAPSHOT
+org.geckoprojects.emf.utils:org.gecko.emf.collections:2.1.3-SNAPSHOT
+org.geckoprojects.emf.utils:org.gecko.emf.csv:1.0.0-SNAPSHOT
+org.geckoprojects.emf.utils:org.gecko.emf.csv.tests:1.0.0-SNAPSHOT
+org.geckoprojects.emf.utils:org.gecko.emf.exporter:2.0.0-SNAPSHOT
+org.geckoprojects.emf.utils:org.gecko.emf.exporter.csv:1.0.1-SNAPSHOT
+org.geckoprojects.emf.utils:org.gecko.emf.exporter.csv.api:1.0.0-SNAPSHOT
+org.geckoprojects.emf.utils:org.gecko.emf.exporter.csv.tests:1.0.0-SNAPSHOT
+org.geckoprojects.emf.utils:org.gecko.emf.exporter.ods:1.0.2-SNAPSHOT
+org.geckoprojects.emf.utils:org.gecko.emf.exporter.ods.api:1.0.0-SNAPSHOT
+org.geckoprojects.emf.utils:org.gecko.emf.exporter.ods.tests:1.0.2-SNAPSHOT
+org.geckoprojects.emf.utils:org.gecko.emf.exporter.xlsx:1.0.0-SNAPSHOT
+org.geckoprojects.emf.utils:org.gecko.emf.exporter.xlsx.api:1.0.0-SNAPSHOT
+org.geckoprojects.emf.utils:org.gecko.emf.exporter.xlsx.tests:1.0.0-SNAPSHOT
+org.geckoprojects.emf.utils:org.gecko.emf.json:1.4.3-SNAPSHOT
+org.geckoprojects.emf.utils:org.gecko.emf.json.tests:1.0.3-SNAPSHOT
+org.geckoprojects.emf.utils:org.gecko.emf.ods:1.0.2-SNAPSHOT
+org.geckoprojects.emf.utils:org.gecko.emf.ods.tests:1.0.2-SNAPSHOT
+org.geckoprojects.emf.utils:org.gecko.emf.pushstreams:1.1.4-SNAPSHOT
+org.geckoprojects.emf.utils:org.gecko.emf.rest.jakartars:2.1.0-SNAPSHOT
+org.geckoprojects.emf.utils:org.gecko.emf.rest.jaxrs:2.1.0-SNAPSHOT
+org.geckoprojects.emf.utils:org.gecko.emf.trees.model:1.0.0-SNAPSHOT
+org.geckoprojects.emf.utils:org.gecko.emf.util.annotations:1.2.0-SNAPSHOT
+org.geckoprojects.emf.utils:org.gecko.emf.util.bnd.library.workspace:2.1.0-SNAPSHOT
+org.geckoprojects.emf.utils:org.gecko.emf.util.jakartars.bnd.library.workspace:2.1.0-SNAPSHOT
+org.geckoprojects.emf.utils:org.gecko.emf.util.jaxrs.bnd.library.workspace:2.1.0-SNAPSHOT
+org.geckoprojects.emf.utils:org.gecko.emf.util.model:2.1.3-SNAPSHOT
+org.geckoprojects.emf.utils:org.gecko.emf.xlsx:1.0.0-SNAPSHOT
+org.geckoprojects.emf.utils:org.gecko.emf.xlsx.tests:1.0.0-SNAPSHOT
diff --git a/gradle.properties b/gradle.properties
@@ -1,2 +1,3 @@
 bnd_version=6.4.0
 bnd_snapshots=https://bndtools.jfrog.io/ui/native/libs-release/
+org.gradle.jvmargs=-XX:MaxMetaspaceSize=512m
diff --git a/org.gecko.emf.bson.tests/test.bndrun b/org.gecko.emf.bson.tests/test.bndrun
@@ -32,4 +32,5 @@
 	com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.14.1,2.14.2)',\
 	org.eclipse.emfcloud.emfjson-jackson;version='[2.2.0,2.2.1)',\
 	org.yaml.snakeyaml;version='[1.33.0,1.33.1)',\
-	com.fasterxml.jackson.datatype.jackson-datatype-jsr310;version='[2.14.1,2.14.2)'
+	com.fasterxml.jackson.datatype.jackson-datatype-jsr310;version='[2.14.1,2.14.2)',\
+	org.osgi.service.cm;version='[1.6.0,1.6.1)'
diff --git a/org.gecko.emf.bson/bnd.bnd b/org.gecko.emf.bson/bnd.bnd
@@ -7,6 +7,6 @@
 
 Bundle-Name: Gecko EMF Bson Extension
 Bundle-Description: Extension to de-/serialize EMF from/into Bson
-Bundle-Version: 1.2.2.SNAPSHOT
+Bundle-Version: 1.2.3.SNAPSHOT
 
 -library: enable-emf
diff --git a/org.gecko.emf.csv.tests/test.bndrun b/org.gecko.emf.csv.tests/test.bndrun
@@ -35,21 +35,24 @@
 	org.apache.commons.lang3;version='[3.12.0,3.12.1)',\
 	org.eclipse.emfcloud.emfjson-jackson;version='[2.2.0,2.2.1)',\
 	org.gecko.emf.exporter;version=snapshot,\
-	org.gecko.emf.json;version=snapshot,\
 	org.yaml.snakeyaml;version='[1.33.0,1.33.1)',\
 	com.fasterxml.jackson.datatype.jackson-datatype-jsr310;version='[2.14.1,2.14.2)',\
 	org.apache.commons.logging;version='[1.2.0,1.2.1)',\
 	slf4j.api;version='[1.7.36,1.7.37)',\
-	org.gecko.emf.csv;version=snapshot,\
 	org.gecko.emf.csv.tests;version=snapshot,\
 	org.gecko.emf.exporter.csv.api;version=snapshot,\
 	org.gecko.emf.exporter.csv;version=snapshot,\
 	com.google.guava;version='[32.1.2,32.1.3)',\
 	com.google.guava.failureaccess;version='[1.0.1,1.0.2)',\
 	de.siegmar.fastcsv;version='[2.2.2,2.2.3)',\
-	slf4j.jcl;version='[1.7.36,1.7.37)',\
-	org.gecko.emf.pushstreams;version=snapshot,\
-	org.gecko.emf.xlsx;version=snapshot
+	org.osgi.service.component;version='[1.4.0,1.4.1)',\
+	org.gecko.emf.exporter;version='[1.0.1,1.0.2)',\
+	org.gecko.emf.csv;version='[1.0.0,1.0.1)',\
+	org.gecko.emf.json;version='[1.4.2,1.4.3)',\
+	org.gecko.emf.util.model;version=snapshot,\
+	org.gecko.emf.xlsx;version='[1.0.0,1.0.1)',\
+	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+	slf4j.simple;version='[1.7.25,1.7.26)'
 
 -runrequires: \
 	bnd.identity;id='org.gecko.emf.exporter.csv',\

diff --git a/org.gecko.emf.csv/bnd.bnd b/org.gecko.emf.csv/bnd.bnd
@@ -4,5 +4,4 @@ Bundle-Description: Extension to save EMF objects to CSV
 
 -library: enable-emf
 
--buildpath: \
-	org.gecko.emf.exporter
+-buildpath: org.gecko.emf.exporter;version=latest
diff --git a/org.gecko.emf.exporter.csv.api/bnd.bnd b/org.gecko.emf.exporter.csv.api/bnd.bnd
@@ -5,7 +5,7 @@ Bundle-Description: CSV (Comma-separated values) Exporter API for EMF
 -library: enable-emf
 
 -buildpath: \
-	org.gecko.emf.exporter,\
+	org.gecko.emf.exporter;version=latest,\
 	de.siegmar.fastcsv,\
 	org.apache.commons.commons-text,\
 	slf4j.api

diff --git a/org.gecko.emf.exporter.csv.tests/test.bndrun b/org.gecko.emf.exporter.csv.tests/test.bndrun
@@ -52,20 +52,22 @@
 	org.apache.commons.commons-text;version='[1.10.0,1.10.1)',\
 	org.apache.commons.lang3;version='[3.12.0,3.12.1)',\
 	org.eclipse.emfcloud.emfjson-jackson;version='[2.2.0,2.2.1)',\
-	org.gecko.emf.json;version=snapshot,\
-	org.gecko.emf.util.model;version=snapshot,\
 	com.fasterxml.jackson.datatype.jackson-datatype-jsr310;version='[2.14.1,2.14.2)',\
 	org.apache.commons.logging;version='[1.2.0,1.2.1)',\
 	slf4j.api;version='[1.7.36,1.7.37)',\
-	org.gecko.emf.exporter.csv;version=snapshot,\
 	org.gecko.emf.exporter.csv.api;version=snapshot,\
 	org.gecko.emf.exporter.csv.tests;version=snapshot,\
 	com.google.guava;version='[32.1.2,32.1.3)',\
 	com.google.guava.failureaccess;version='[1.0.1,1.0.2)',\
 	org.gecko.emf.trees.model;version=snapshot,\
-	slf4j.jcl;version='[1.7.36,1.7.37)',\
 	de.siegmar.fastcsv;version='[2.2.2,2.2.3)',\
-	org.gecko.emf.pushstreams;version=snapshot,\
-	org.gecko.emf.xlsx;version=snapshot
+	org.osgi.service.component;version='[1.4.0,1.4.1)',\
+	org.gecko.emf.exporter;version='[1.0.1,1.0.2)',\
+	org.gecko.emf.exporter.csv;version='[1.0.1,1.0.2)',\
+	org.gecko.emf.json;version='[1.4.2,1.4.3)',\
+	org.gecko.emf.util.model;version=snapshot,\
+	org.gecko.emf.xlsx;version='[1.0.0,1.0.1)',\
+	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+	slf4j.simple;version='[1.7.25,1.7.26)'
 
 
diff --git a/org.gecko.emf.exporter.ods.api/bnd.bnd b/org.gecko.emf.exporter.ods.api/bnd.bnd
@@ -5,7 +5,7 @@ Bundle-Description: ODS (OpenDocument Spreadsheet) Exporter API for EMF
 -library: enable-emf
 
 -buildpath: \
-	org.gecko.emf.exporter,\
+	org.gecko.emf.exporter;version=latest,\
 	com.github.miachm.sods,\
 	org.apache.commons.commons-text;version='1.10',\
 	slf4j.api

diff --git a/org.gecko.emf.exporter.ods.tests/test.bndrun b/org.gecko.emf.exporter.ods.tests/test.bndrun
@@ -43,7 +43,6 @@
 	org.osgi.test.junit5;version='[1.1.0,1.1.1)',\
 	org.yaml.snakeyaml;version='[1.33.0,1.33.1)',\
 	org.gecko.emf.exporter;version=snapshot,\
-	org.gecko.emf.exporter.ods;version=snapshot,\
 	org.gecko.emf.exporter.ods.tests;version=snapshot,\
 	com.fasterxml.jackson.core.jackson-annotations;version='[2.14.1,2.14.2)',\
 	com.fasterxml.jackson.core.jackson-core;version='[2.14.1,2.14.2)',\
@@ -54,15 +53,18 @@
 	org.apache.commons.commons-text;version='[1.10.0,1.10.1)',\
 	org.apache.commons.lang3;version='[3.12.0,3.12.1)',\
 	org.eclipse.emfcloud.emfjson-jackson;version='[2.2.0,2.2.1)',\
-	org.gecko.emf.json;version=snapshot,\
-	org.gecko.emf.util.model;version=snapshot,\
 	com.fasterxml.jackson.datatype.jackson-datatype-jsr310;version='[2.14.1,2.14.2)',\
 	com.github.miachm.sods;version='[1.6.2,1.6.3)',\
 	org.apache.commons.logging;version='[1.2.0,1.2.1)',\
 	slf4j.api;version='[1.7.36,1.7.37)',\
 	com.google.guava;version='[32.1.2,32.1.3)',\
 	com.google.guava.failureaccess;version='[1.0.1,1.0.2)',\
 	org.gecko.emf.trees.model;version=snapshot,\
-	slf4j.jcl;version='[1.7.36,1.7.37)',\
-	org.gecko.emf.pushstreams;version=snapshot,\
-	org.gecko.emf.xlsx;version=snapshot
+	org.osgi.service.component;version='[1.4.0,1.4.1)',\
+	org.gecko.emf.exporter;version='[1.0.1,1.0.2)',\
+	org.gecko.emf.exporter.ods;version='[1.0.2,1.0.3)',\
+	org.gecko.emf.json;version='[1.4.2,1.4.3)',\
+	org.gecko.emf.util.model;version=snapshot,\
+	org.gecko.emf.xlsx;version='[1.0.0,1.0.1)',\
+	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+	slf4j.simple;version='[1.7.25,1.7.26)'
diff --git a/org.gecko.emf.exporter.xlsx.api/bnd.bnd b/org.gecko.emf.exporter.xlsx.api/bnd.bnd
@@ -5,7 +5,7 @@ Bundle-Description: XLSX (Microsoft Excel Open XML Spreadsheet) Exporter API for
 -library: enable-emf
 
 -buildpath: \
-	org.gecko.emf.exporter,\
+	org.gecko.emf.exporter;version=latest,\
 	org.apache.servicemix.bundles.poi,\
 	org.apache.commons.commons-text,\
 	slf4j.api

diff --git a/org.gecko.emf.exporter.xlsx.tests/test.bndrun b/org.gecko.emf.exporter.xlsx.tests/test.bndrun
@@ -55,18 +55,20 @@
 	org.apache.commons.commons-text;version='[1.10.0,1.10.1)',\
 	org.apache.commons.lang3;version='[3.12.0,3.12.1)',\
 	org.eclipse.emfcloud.emfjson-jackson;version='[2.2.0,2.2.1)',\
-	org.gecko.emf.json;version=snapshot,\
-	org.gecko.emf.util.model;version=snapshot,\
 	com.fasterxml.jackson.datatype.jackson-datatype-jsr310;version='[2.14.1,2.14.2)',\
 	org.apache.commons.logging;version='[1.2.0,1.2.1)',\
 	slf4j.api;version='[1.7.36,1.7.37)',\
 	com.google.guava;version='[32.1.2,32.1.3)',\
 	com.google.guava.failureaccess;version='[1.0.1,1.0.2)',\
 	org.apache.commons.commons-compress;version='[1.21.0,1.21.1)',\
 	org.apache.servicemix.bundles.poi;version='[5.2.2,5.2.3)',\
-	org.gecko.emf.exporter.xlsx;version=snapshot,\
 	org.gecko.emf.exporter.xlsx.tests;version=snapshot,\
 	org.gecko.emf.trees.model;version=snapshot,\
-	slf4j.jcl;version='[1.7.36,1.7.37)',\
-	org.gecko.emf.pushstreams;version=snapshot,\
-	org.gecko.emf.xlsx;version=snapshot
+	org.osgi.service.component;version='[1.4.0,1.4.1)',\
+	org.gecko.emf.exporter;version='[1.0.1,1.0.2)',\
+	org.gecko.emf.exporter.xlsx;version='[1.0.0,1.0.1)',\
+	org.gecko.emf.json;version='[1.4.2,1.4.3)',\
+	org.gecko.emf.util.model;version=snapshot,\
+	org.gecko.emf.xlsx;version='[1.0.0,1.0.1)',\
+	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+	slf4j.simple;version='[1.7.25,1.7.26)'
diff --git a/org.gecko.emf.exporter/bnd.bnd b/org.gecko.emf.exporter/bnd.bnd
@@ -1,4 +1,4 @@
-Bundle-Version: 1.0.1.SNAPSHOT
+Bundle-Version: 2.0.0.SNAPSHOT
 Bundle-Name: Gecko EMF Exporter
 Bundle-Description: Exporter for EMF
 

diff --git a/org.gecko.emf.exporter/src/org/gecko/emf/exporter/package-info.java b/org.gecko.emf.exporter/src/org/gecko/emf/exporter/package-info.java
@@ -1,3 +1,3 @@
-@org.osgi.annotation.versioning.Version("1.0.0")
+@org.osgi.annotation.versioning.Version("2.0.0")
 @org.osgi.annotation.bundle.Export
 package org.gecko.emf.exporter;
diff --git a/org.gecko.emf.json.tests/bnd.bnd b/org.gecko.emf.json.tests/bnd.bnd
@@ -4,7 +4,7 @@
 javac.source: 11
 javac.target: 11
 
-Bundle-Version: 1.0.2.SNAPSHOT
+Bundle-Version: 1.0.3.SNAPSHOT
 -buildpath: \
 	org.eclipse.emfcloud.emfjson-jackson;version=latest,\
 	org.gecko.emf.osgi.component,\

diff --git a/org.gecko.emf.json.tests/test.bndrun b/org.gecko.emf.json.tests/test.bndrun
@@ -16,7 +16,6 @@
 	org.eclipse.emf.common;version='[2.23.0,2.23.1)',\
 	org.eclipse.emf.ecore;version='[2.25.0,2.25.1)',\
 	org.eclipse.emf.ecore.xmi;version='[2.16.0,2.16.1)',\
-	org.gecko.emf.json;version=snapshot,\
 	org.gecko.emf.json.tests;version=snapshot,\
 	org.gecko.emf.osgi.api;version='[4.1.1,4.1.2)',\
 	org.gecko.emf.osgi.component;version='[4.1.1,4.1.2)',\
@@ -45,11 +44,15 @@
 	org.apache.commons.logging;version='[1.2.0,1.2.1)',\
 	org.gecko.emf.exporter;version=snapshot,\
 	slf4j.api;version='[1.7.36,1.7.37)',\
-	slf4j.jcl;version='[1.7.36,1.7.37)',\
 	com.github.miachm.sods;version='[1.6.2,1.6.3)',\
 	org.gecko.emf.exporter.ods;version=snapshot,\
-	org.gecko.emf.pushstreams;version=snapshot,\
-	org.gecko.emf.xlsx;version=snapshot
+	org.osgi.service.component;version='[1.4.0,1.4.1)',\
+	org.gecko.emf.exporter;version='[1.0.1,1.0.2)',\
+	org.gecko.emf.json;version='[1.4.2,1.4.3)',\
+	org.gecko.emf.util.model;version=snapshot,\
+	org.gecko.emf.xlsx;version='[1.0.0,1.0.1)',\
+	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+	slf4j.simple;version='[1.7.25,1.7.26)'
 
 
 

diff --git a/org.gecko.emf.json/bnd.bnd b/org.gecko.emf.json/bnd.bnd
@@ -1,4 +1,4 @@
-Bundle-Version: 1.4.2.SNAPSHOT
+Bundle-Version: 1.4.3.SNAPSHOT
 Bundle-Name: Gecko EMF Json Extension
 Bundle-Description: Extension to save and load EMF objects in/to JSON using JacksonXML
 

diff --git a/org.gecko.emf.ods.tests/test.bndrun b/org.gecko.emf.ods.tests/test.bndrun
@@ -35,8 +35,6 @@
 	org.apache.commons.lang3;version='[3.12.0,3.12.1)',\
 	org.eclipse.emfcloud.emfjson-jackson;version='[2.2.0,2.2.1)',\
 	org.gecko.emf.exporter;version=snapshot,\
-	org.gecko.emf.json;version=snapshot,\
-	org.gecko.emf.ods;version=snapshot,\
 	org.gecko.emf.ods.tests;version=snapshot,\
 	org.yaml.snakeyaml;version='[1.33.0,1.33.1)',\
 	com.fasterxml.jackson.datatype.jackson-datatype-jsr310;version='[2.14.1,2.14.2)',\
@@ -46,9 +44,14 @@
 	com.google.guava.failureaccess;version='[1.0.1,1.0.2)',\
 	com.github.miachm.sods;version='[1.6.2,1.6.3)',\
 	org.gecko.emf.exporter.ods;version=snapshot,\
-	slf4j.jcl;version='[1.7.36,1.7.37)',\
-	org.gecko.emf.pushstreams;version=snapshot,\
-	org.gecko.emf.xlsx;version=snapshot
+	org.osgi.service.component;version='[1.4.0,1.4.1)',\
+	org.gecko.emf.exporter;version='[1.0.1,1.0.2)',\
+	org.gecko.emf.ods;version='[1.0.2,1.0.3)',\
+	org.gecko.emf.json;version='[1.4.2,1.4.3)',\
+	org.gecko.emf.util.model;version=snapshot,\
+	org.gecko.emf.xlsx;version='[1.0.0,1.0.1)',\
+	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+	slf4j.simple;version='[1.7.25,1.7.26)'
 
 -runrequires: \
 	bnd.identity;id='org.gecko.emf.exporter.ods',\

diff --git a/org.gecko.emf.ods/bnd.bnd b/org.gecko.emf.ods/bnd.bnd
@@ -1,8 +1,8 @@
-Bundle-Version: 1.0.1.SNAPSHOT
+Bundle-Version: 1.0.2.SNAPSHOT
 Bundle-Name: Gecko EMF ODS Extension
 Bundle-Description: Extension to save EMF objects to ODS using SODS
 
 -library: enable-emf
 
 -buildpath: \
-	org.gecko.emf.exporter
+	org.gecko.emf.exporter;version=latest
diff --git a/org.gecko.emf.rest/.settings/org.eclipse.core.resources.prefs b/org.gecko.emf.rest/.settings/org.eclipse.core.resources.prefs
@@ -1,4 +1,3 @@
 eclipse.preferences.version=1
 encoding/<project>=UTF-8
 encoding/bnd.bnd=UTF-8
-encoding/launch.bndrun=UTF-8
diff --git a/org.gecko.emf.rest/bnd.bnd b/org.gecko.emf.rest/bnd.bnd
@@ -6,14 +6,17 @@ javac.target: 11
 -dsannotations-options: inherit
 
 -buildpath: \
-	jakarta.ws.rs-api;version=latest,\
+	jakarta.ws.rs-api;version='3.1.0',\
+	jakarta.ws.rs-api;version='2.1.6',\
 	org.osgi.service.jakartars;version=latest,\
+	org.osgi.service.jaxrs;version=latest,\
 	org.osgi.service.component;version=latest,\
 	org.eclipse.emfcloud.emfjson-jackson;version=latest,\
 	org.gecko.emf.json;version=project,\
 	org.gecko.emf.osgi.model.info
-
-Bundle-Name: Gecko EMF JakartaRs Extension
+
 Bundle-Description: Extension to load and save EMF EObjects using a MessageBodyReader or -Writer
 
 Provide-Capability: emf.rest;emf.rest=osgi
+
+-sub: *.bnd
diff --git a/org.gecko.emf.rest/jakartars.bnd b/org.gecko.emf.rest/jakartars.bnd
@@ -0,0 +1,12 @@
+
+Bundle-Name: Gecko EMF JakartaRs Extension
+
+Private-Package: \
+	org.gecko.emf.rest.common.internal,\
+	org.gecko.emf.rest.jakartars.internal
+
+Export-Package: \
+	org.gecko.emf.rest.common,\
+	org.gecko.emf.rest.jakartars,\
+	org.gecko.emf.rest.annotations,\
+	org.gecko.emf.rest.annotations.json
diff --git a/org.gecko.emf.rest/jaxrs.bnd b/org.gecko.emf.rest/jaxrs.bnd
@@ -0,0 +1,12 @@
+
+Bundle-Name: Gecko EMF JaxRs Extension
+
+Private-Package: \
+	org.gecko.emf.rest.common.internal,\
+	org.gecko.emf.rest.jaxrs.internal
+
+Export-Package: \
+	org.gecko.emf.rest.common,\
+	org.gecko.emf.rest.jaxrs,\
+	org.gecko.emf.rest.annotations,\
+	org.gecko.emf.rest.annotations.json