devel build

Signed-off-by: Mark Hoffmann <m.hoffmann@data-in-motion.biz>

.github/workflows/build.yml

@@ -27,7 +27,7 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest, windows-latest ]
-        java: [ 17 ]
+        java: [ 11, 17 ]
         runner: [ 'xvfb-run --auto-servernum {0}' ]
     name: JDK${{ matrix.java }} ${{ matrix.os }}
     runs-on: ${{ matrix.os }}

.github/workflows/sonar.yml → .github/workflows/sonar.yml_deactivated

@@ -14,12 +14,11 @@ jobs:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-        distribution: "temurin"
-        java-version: ${{ matrix.java }}
-        cache: "gradle"
+          java-version: 17
+          distribution: temurin
       - name: Cache SonarCloud packages
         uses: actions/cache@v3
         with:
@@ -36,4 +35,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
+        run: ./gradlew build sonar --info

Jenkinsfile

@@ -2,7 +2,7 @@ pipeline  {
     agent any
 
     tools {
-        jdk 'OpenJDK17'
+        jdk 'OpenJDK11'
     }
     options {
         buildDiscarder(logRotator(numToKeepStr: '5'))

cnf/central.mvn

@@ -138,11 +138,11 @@ org.slf4j:slf4j-simple:1.7.36
 org.slf4j:slf4j-api:1.7.36
 org.freemarker:freemarker:2.3.32
 
-org.geckoprojects.bnd:org.gecko.bnd.dimc.library:1.4.4
-org.geckoprojects.bnd:org.gecko.bnd.jacoco.library:1.4.4
-org.geckoprojects.bnd:org.gecko.bnd.osgitest.library:1.4.4
-org.geckoprojects.emf:org.gecko.emf.osgi.bnd.library.workspace:6.0.0
-org.geckoprojects.emf:org.gecko.emf.osgi.example.model.basic:6.0.0
+org.geckoprojects.bnd:org.gecko.bnd.dimc.library:1.5.0
+org.geckoprojects.bnd:org.gecko.bnd.jacoco.library:1.5.0
+org.geckoprojects.bnd:org.gecko.bnd.osgitest.library:1.5.0
+org.geckoprojects.emf:org.gecko.emf.osgi.bnd.library.workspace:6.0.2
+org.geckoprojects.emf:org.gecko.emf.osgi.example.model.basic:6.0.2
 org.geckoprojects.emf.utils:org.gecko.emf.collections:2.2.2
 org.mongodb:mongo-java-driver:3.12.14
 org.geckoprojects.emf:org.gecko.emf.pushstreams:1.0.15

org.gecko.emf.mongo.test/src/org/gecko/emf/mongo/tests/CustomArrayDataTypeTest.java

@@ -77,7 +77,7 @@ public void doAfter() {
 	@Test
 	public void testSimpleArray() throws IOException, InvalidSyntaxException, InterruptedException {
 
-		ResourceSet resourceSet = rsAware.getService();
+		ResourceSet resourceSet = rsAware.waitForService(2000l);
 
 		System.out.println("Dropping DB");
 		MongoCollection<Document> geoCollection = client.getDatabase("test").getCollection("Geometry");
@@ -135,8 +135,8 @@ public void testSimpleArray() throws IOException, InvalidSyntaxException, Interr
 
 	@Test
 	public void testMultiDimensionalArray() throws IOException, InvalidSyntaxException, InterruptedException {
-		ResourceSet resourceSet = rsAware.getService();
-
+		ResourceSet resourceSet = rsAware.waitForService(2000l);
+		
 		System.out.println("Dropping DB");
 		MongoCollection<Document> geoCollection = client.getDatabase("test").getCollection("Geometry");
 		geoCollection.drop();

org.gecko.emf.mongo.test/test.bndrun

@@ -26,17 +26,20 @@
 	org.eclipse.emf.ecore;version='[2.33.0,2.33.1)',\
 	org.eclipse.emf.ecore.xmi;version='[2.18.0,2.18.1)',\
 	org.gecko.emf.mongo.component;version=snapshot,\
-	org.gecko.emf.osgi.api;version='[6.0.0,6.0.1)',\
-	org.gecko.emf.osgi.example.model.basic;version='[6.0.0,6.0.1)',\
 	org.gecko.mongo.osgi.component;version=snapshot,\
 	org.mongodb.mongo-java-driver;version='[3.12.14,3.12.15)',\
 	org.osgi.service.component;version='[1.5.1,1.5.2)',\
 	org.osgi.service.log;version='[1.5.0,1.5.1)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
 	org.apache.felix.metatype;version='[1.2.4,1.2.5)',\
-	org.gecko.emf.osgi.component;version='[6.0.0,6.0.1)',\
 	org.osgi.util.converter;version='[1.0.9,1.0.10)',\
 	org.osgi.test.junit5.cm;version='[1.2.1,1.2.2)',\
 	org.gecko.emf.collections;version='[2.2.2,2.2.3)',\
-	org.gecko.mongo.osgi.api;version=snapshot
+	org.gecko.mongo.osgi.api;version=snapshot,\
+	org.gecko.emf.mongo.pushstream;version=snapshot,\
+	org.gecko.emf.pushstreams;version='[1.0.15,1.0.16)',\
+	org.osgi.util.pushstream;version='[1.1.0,1.1.1)',\
+	org.gecko.emf.osgi.api;version='[6.0.2,6.0.3)',\
+	org.gecko.emf.osgi.component;version='[6.0.2,6.0.3)',\
+	org.gecko.emf.osgi.example.model.basic;version='[6.0.2,6.0.3)'

org.gecko.emf.repository.mongo.tests/test.bndrun

@@ -27,8 +27,6 @@
 	org.eclipse.emf.ecore.xmi;version='[2.18.0,2.18.1)',\
 	org.gecko.emf.collections;version='[2.2.2,2.2.3)',\
 	org.gecko.emf.mongo.component;version=snapshot,\
-	org.gecko.emf.osgi.api;version='[6.0.0,6.0.1)',\
-	org.gecko.emf.osgi.component;version='[6.0.0,6.0.1)',\
 	org.gecko.emf.repository.api;version=snapshot,\
 	org.gecko.emf.repository.mongo;version=snapshot,\
 	org.osgi.util.converter;version='[1.0.9,1.0.10)',\
@@ -37,12 +35,14 @@
 	junit-platform-commons;version='[1.10.1,1.10.2)',\
 	net.bytebuddy.byte-buddy;version='[1.14.9,1.14.10)',\
 	net.bytebuddy.byte-buddy-agent;version='[1.14.9,1.14.10)',\
-	org.gecko.emf.osgi.example.model.basic;version='[6.0.0,6.0.1)',\
 	org.gecko.emf.repository.mongo.tests;version=snapshot,\
 	org.gecko.mongo.osgi.api;version=snapshot,\
 	org.mockito.junit-jupiter;version='[4.11.0,4.11.1)',\
 	org.mockito.mockito-core;version='[4.11.0,4.11.1)',\
 	org.objenesis;version='[3.3.0,3.3.1)',\
 	org.opentest4j;version='[1.3.0,1.3.1)',\
 	org.osgi.test.common;version='[1.2.1,1.2.2)',\
-	org.osgi.test.junit5;version='[1.2.1,1.2.2)'
+	org.osgi.test.junit5;version='[1.2.1,1.2.2)',\
+	org.gecko.emf.osgi.api;version='[6.0.2,6.0.3)',\
+	org.gecko.emf.osgi.component;version='[6.0.2,6.0.3)',\
+	org.gecko.emf.osgi.example.model.basic;version='[6.0.2,6.0.3)'

org.gecko.emf.repository.tests/test.bndrun

@@ -19,15 +19,13 @@
 	org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
 	org.eclipse.emf.common;version='[2.28.0,2.28.1)',\
 	org.eclipse.emf.ecore;version='[2.33.0,2.33.1)',\
-	org.gecko.emf.osgi.api;version='[6.0.0,6.0.1)',\
 	org.gecko.emf.repository.api;version=snapshot,\
 	junit-jupiter-api;version='[5.10.1,5.10.2)',\
 	junit-jupiter-params;version='[5.10.1,5.10.2)',\
 	junit-platform-commons;version='[1.10.1,1.10.2)',\
 	net.bytebuddy.byte-buddy;version='[1.14.9,1.14.10)',\
 	net.bytebuddy.byte-buddy-agent;version='[1.14.9,1.14.10)',\
 	org.eclipse.emf.ecore.xmi;version='[2.18.0,2.18.1)',\
-	org.gecko.emf.osgi.example.model.basic;version='[6.0.0,6.0.1)',\
 	org.gecko.emf.repository.tests;version=snapshot,\
 	org.mockito.junit-jupiter;version='[4.11.0,4.11.1)',\
 	org.mockito.mockito-core;version='[4.11.0,4.11.1)',\
@@ -36,7 +34,9 @@
 	org.osgi.test.common;version='[1.2.1,1.2.2)',\
 	org.osgi.test.junit5;version='[1.2.1,1.2.2)',\
 	org.apache.felix.metatype;version='[1.2.4,1.2.5)',\
-	org.gecko.emf.osgi.component;version='[6.0.0,6.0.1)',\
 	org.osgi.service.log;version='[1.5.0,1.5.1)',\
 	org.osgi.util.converter;version='[1.0.9,1.0.10)',\
-	org.gecko.emf.repository.file;version=snapshot
+	org.gecko.emf.repository.file;version=snapshot,\
+	org.gecko.emf.osgi.api;version='[6.0.2,6.0.3)',\
+	org.gecko.emf.osgi.component;version='[6.0.2,6.0.3)',\
+	org.gecko.emf.osgi.example.model.basic;version='[6.0.2,6.0.3)'