Merge pull request #27 from geckoprojects-org/jakarta

Latest from ''jakarta" branch
geckoprojects-org · Jan 8, 2024 · ce7add4 · ce7add4
2 parents f376565 + 19969b7
commit ce7add4
Show file tree

Hide file tree

Showing 284 changed files with 654,725 additions and 570 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -27,25 +27,26 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest, windows-latest ]
-        java: [ 11, 15 ]
+        java: [ 11, 17 ]
         runner: [ 'xvfb-run --auto-servernum {0}' ]
     name: JDK${{ matrix.java }} ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     steps:
     - name: Git Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: Gradle Wrapper Validation
       uses: gradle/wrapper-validation-action@v1
     - name: Set up Java ${{ matrix.java }}
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v3
       with:
+        distribution: 'temurin'
         java-version: ${{ matrix.java }}
     - name: Grant execute permission for gradlew
       run: chmod +x ./gradlew
     - name: Gradle version
       run: ./gradlew --no-daemon --version
     - name: Build with Gradle
-      run: ./gradlew build 
+      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/license.yml b/.github/workflows/license.yml
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/.gitignore b/.gitignore
@@ -4,5 +4,5 @@ generated/
 /.metadata/
 /build/
 cnf/release/
-cnf/local/
-src-gen
+src-gen
+**/ARCHIVE/**
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -43,5 +43,23 @@ pipeline  {
                 sh "cp -r cnf/release/* $JENKINS_HOME/repo.gecko/snapshot/org.gecko.emf.util"
             }
         }
+        stage('Props') {
+            when { 
+                branch 'jakarta'
+            }
+            steps  {
+                echo "I am building on ${env.JOB_NAME}"
+                sh "./gradlew org.gecko.emf.bson:bndproperties -Drelease.dir=$JENKINS_HOME/repo.gecko/jakarta/org.gecko.emf.util --info --stacktrace -Dmaven.repo.local=${WORKSPACE}/.m2"
+            }
+        }
+        stage('Jakarta branch release') {
+            when { 
+                branch 'jakarta'
+            }
+            steps  {
+                echo "I am building on ${env.JOB_NAME}"
+                sh "./gradlew clean build release -Drelease.dir=$JENKINS_HOME/repo.gecko/jakarta/org.gecko.emf.util --info --stacktrace -Dmaven.repo.local=${WORKSPACE}/.m2"
+            }
+        }
     }
 }
diff --git a/cnf/.settings/org.eclipse.core.resources.prefs b/cnf/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/cnf/baseline.mvn b/cnf/baseline.mvn
@@ -0,0 +1,15 @@
+org.geckoprojects.emf.utils:org.gecko.emf.bson:1.2.2
+org.geckoprojects.emf.utils:org.gecko.emf.bson.tests:1.0.2
+org.geckoprojects.emf.utils:org.gecko.emf.collections:2.1.2
+org.geckoprojects.emf.utils:org.gecko.emf.exporter:1.0.1
+org.geckoprojects.emf.utils:org.gecko.emf.exporter.ods:1.0.1
+org.geckoprojects.emf.utils:org.gecko.emf.exporter.ods.tests:1.0.1
+org.geckoprojects.emf.utils:org.gecko.emf.json:1.4.2
+org.geckoprojects.emf.utils:org.gecko.emf.json.tests:1.0.2
+org.geckoprojects.emf.utils:org.gecko.emf.ods:1.0.1
+org.geckoprojects.emf.utils:org.gecko.emf.ods.tests:1.0.1
+org.geckoprojects.emf.utils:org.gecko.emf.pushstreams:1.1.2
+org.geckoprojects.emf.utils:org.gecko.emf.rest:2.0.2
+org.geckoprojects.emf.utils:org.gecko.emf.util.annotations:1.1.1
+org.geckoprojects.emf.utils:org.gecko.emf.util.bnd.library.workspace:2.0.2
+org.geckoprojects.emf.utils:org.gecko.emf.util.model:2.1.2
diff --git a/cnf/build.bnd b/cnf/build.bnd
@@ -11,29 +11,28 @@
 
 # Needed because we enabled library 'gecko-dimc' 	
 github-project: org.gecko.emf.util
-base-version: 1.0.0.SNAPSHOT
+base-version: 2.1.0.SNAPSHOT
 
 # Maven Central Group-Id
 -groupid: org.geckoprojects.emf.utils
 
 # No simultanious release - We only release new version to Maven Central
-#releaseNotNeeded: ${findproviders;osgi.identity;(&(osgi.identity=${bsn})(version=${version}));REPOS}
+releaseNotNeeded: ${findproviders;osgi.identity;(&(osgi.identity=${bsn})(version=${versionmask;===;${Bundle-Version}}));REPOS}
 
 # If release not needed is empty, no Bundle has been found and for maven we do a release to the remote Repo. If not, we only do a release to the local .m2 Repo
-#-maven-release.local: ${if;${def;releaseNotNeeded};local;remote}
+-maven-release.local: ${if;${def;releaseNotNeeded};local;remote}
 
 javac.source: 11
 javac.target: 11
 
--require-bnd "(version>=6.2.0)"
+-require-bnd "(version>=6.4.0)"
 
 -plugin.Central: \
     aQute.bnd.repository.maven.provider.MavenBndRepository; \
         snapshotUrl="https://oss.sonatype.org/content/repositories/snapshots/"; \
         releaseUrl=https://repo.maven.apache.org/maven2/; \
         index=${.}/central.mvn; \
         readOnly=true; \
-        poll.time=-1; \
         name="Central"
 
 -plugin.Local: \
@@ -47,4 +46,31 @@ javac.target: 11
 		name = Temp; \
 		pretty = true; \
 		local = ${build}/cache/temp
+
+-plugin.baseline:\
+    aQute.bnd.repository.maven.provider.MavenBndRepository; \
+        snapshotUrl="https://oss.sonatype.org/content/repositories/snapshots/"; \
+        releaseUrl=https://repo.maven.apache.org/maven2/; \
+        index=${.}/baseline.mvn; \
+        readOnly=true;\
+		name=Baseline
+
+-diffignore: *.xml,\
+	*/pom.properties,\
+	Git-SHA,\
+	Bundle-Vendor,\
+	Bundle-License,\
+	Bundle-DocURL,\
+	Bundle-SCM,\
+	Bundle-Developers,\
+	Bundle-Copyright,\
+	Bundle-ContactAddress,\
+	META-INF/maven/*,\
+	OSGI-OPT/*
+
+#-baselinerepo: Baseline
+#-baseline: *
 
+#X-Test: ${if;${def;releaseNotNeeded};local;remote}
+X-Test: ${-maven-release.local}
+X-Test2: ${-maven-release}
diff --git a/cnf/central.mvn b/cnf/central.mvn
@@ -3,15 +3,12 @@ biz.aQute.bnd:biz.aQute.bnd.annotation:6.2.0
 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.ws.rs:jakarta.ws.rs-api:3.0.0
-jakarta.annotation:jakarta.annotation-api:2.0.0
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.3
-#jakarta.xml.bind:jakarta.xml.bind-api:3.0.1
-jakarta.activation:jakarta.activation-api:1.2.2
-#jakarta.activation:jakarta.activation-api:2.0.1
 
-javax.json:javax.json-api:1.1.4
+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
 
 org.apache.cxf:cxf-rt-transports-http:3.2.7
 org.apache.cxf:cxf-core:3.2.7
@@ -65,7 +62,6 @@ org.bouncycastle:bcprov-jdk15on:1.64
 org.bouncycastle:bctls-jdk15on:1.64
 org.bouncycastle:bcutil-jdk15on:1.69
 
-
 org.junit.jupiter:junit-jupiter-api:5.6.3
 org.junit.jupiter:junit-jupiter-engine:5.6.3
 org.junit.jupiter:junit-jupiter-params:5.6.3
@@ -103,7 +99,8 @@ org.osgi:org.osgi.service.coordinator:1.0.2
 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.jaxrs:jar:1.0.0
+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
@@ -127,8 +124,16 @@ org.osgi:org.osgi.util.tracker:1.5.3
 org.osgi:org.osgi.util.xml:1.0.1
 org.osgi:osgi.annotation:8.0.0
 org.osgi:osgi.core:8.0.0
-org.slf4j:slf4j-api:1.7.30
-org.slf4j:slf4j-simple:1.7.30
+
+org.slf4j:slf4j-api:1.7.36
+org.slf4j:slf4j-simple:1.7.36
+org.slf4j:jul-to-slf4j:1.7.36
+org.slf4j:log4j-over-slf4j:1.7.36
+org.slf4j:osgi-over-slf4j:1.7.36
+org.slf4j:slf4j-ext:1.7.36
+org.slf4j:slf4j-jcl:1.7.36
+
+commons-logging:commons-logging:1.2
 
 org.eclipse.emf:org.eclipse.emf.common:2.23.0
 org.eclipse.emf:org.eclipse.emf.ecore:2.25.0
@@ -155,17 +160,30 @@ org.geckoprojects.bnd:org.gecko.bnd.dimc.library:1.1.1
 org.geckoprojects.bnd:org.gecko.bnd.osgitest.library:1.1.1
 org.geckoprojects.bnd:org.gecko.bnd.jacoco.library:1.1.1
 
-#org.geckoprojects.emf:org.gecko.emf.osgi.api:4.1.1.202202162308
 org.geckoprojects.emf:org.gecko.emf.osgi.bnd.library.workspace:4.1.1-SNAPSHOT
 
-com.fasterxml.jackson.core:jackson-core:2.13.2
-com.fasterxml.jackson.core:jackson-databind:2.13.2
-com.fasterxml.jackson.core:jackson-annotations:2.13.2
-com.fasterxml.jackson.dataformat:jackson-dataformat-properties:2.13.2
-com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.2
-com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.2
-org.eclipse.emfcloud:emfjson-jackson:2.1.0
+com.fasterxml.jackson.core:jackson-core:2.14.1
+com.fasterxml.jackson.core:jackson-databind:2.14.1
+com.fasterxml.jackson.core:jackson-annotations:2.14.1
+com.fasterxml.jackson.dataformat:jackson-dataformat-properties:2.14.1
+com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.14.1
+com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.14.1
+org.eclipse.emfcloud:emfjson-jackson:2.2.0
 de.undercouch:bson4jackson:2.13.1
-org.yaml:snakeyaml:1.30
-#org.emfjson:emfjson-jackson:1.3.0
-org.geckoprojects.emf:org.gecko.emf.osgi.example.model.basic:4.1.1.202202162309
+org.yaml:snakeyaml:1.33
+org.geckoprojects.emf:org.gecko.emf.osgi.example.model.basic:4.1.1-SNAPSHOT
+
+org.apache.commons:commons-text:1.10.0
+org.apache.commons:commons-lang3:3.12.0
+
+com.google.guava:guava:32.1.2-jre
+com.google.guava:failureaccess:1.0.1
+
+# maintainer of https://github.com/miachm/SODS did not merge https://github.com/miachm/SODS/pull/63 yet, so e.g. 'com.github.miachm.sods.LinkedValue' is missing
+#com.github.miachm.sods:SODS:1.6.2
+
+org.apache.servicemix.bundles:org.apache.servicemix.bundles.poi:5.2.2_3
+org.apache.commons:commons-compress:1.21
+org.apache.logging.log4j:log4j-api:2.18.0
+org.apache.logging.log4j:log4j-core:2.18.0
+org.apache.logging.log4j:log4j-to-slf4j:2.18.0
diff --git a/cnf/dim_release.mvn b/cnf/dim_release.mvn
@@ -0,0 +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/cnf/local/com.github.miachm.sods/com.github.miachm.sods-1.6.2.jar b/cnf/local/com.github.miachm.sods/com.github.miachm.sods-1.6.2.jar
diff --git a/cnf/local/de.siegmar.fastcsv/de.siegmar.fastcsv-2.2.2.jar b/cnf/local/de.siegmar.fastcsv/de.siegmar.fastcsv-2.2.2.jar
diff --git a/cnf/local/index.xml b/cnf/local/index.xml
@@ -0,0 +1,83 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<repository xmlns="http://www.osgi.org/xmlns/repository/v1.0.0" name="Local" increment="1693406042958">
+  <resource>
+    <capability namespace="osgi.identity">
+      <attribute name="license" value="&quot;The Unlicense&quot;;link=&quot;https://github.com/miachm/SODS/blob/master/LICENSE&quot;"/>
+      <attribute name="osgi.identity" value="com.github.miachm.sods"/>
+      <attribute name="documentation" value="https://github.com/miachm/SODS"/>
+      <attribute name="description" value="A library for load/save ODS files in java."/>
+      <attribute name="type" value="osgi.bundle"/>
+      <attribute name="version" value="1.6.2" type="Version"/>
+    </capability>
+    <capability namespace="osgi.wiring.package">
+      <attribute name="bundle-symbolic-name" value="com.github.miachm.sods"/>
+      <attribute name="bundle-version" value="1.6.2" type="Version"/>
+      <attribute name="osgi.wiring.package" value="com.github.miachm.sods"/>
+      <attribute name="version" value="1.6.2" type="Version"/>
+      <attribute name="bnd.hashes" value="1324511984,1731897767,2096514,65290051,2023997302,822061019,1624016101,-266320387,663506998,-1291886874,520469601,1895597947,351111864,-1115736232,82941713,-1440044159,-1284638927,228265771,-1821040144,-70786291,861476502,677306575,1812804717,2479866,78727453,1567574187,82362,97316887,79850815,1620534404,-482667636,1193265721,2039393584,80227729,465601004,477953699,1916493886,924543180,-1736520349,355567514,1511059808,-1059699121,-1060180405" type="List&lt;Long&gt;"/>
+    </capability>
+    <capability namespace="osgi.wiring.bundle">
+      <attribute name="bundle-version" value="1.6.2" type="Version"/>
+      <attribute name="osgi.wiring.bundle" value="com.github.miachm.sods"/>
+    </capability>
+    <capability namespace="osgi.wiring.host">
+      <attribute name="bundle-version" value="1.6.2" type="Version"/>
+      <attribute name="osgi.wiring.host" value="com.github.miachm.sods"/>
+    </capability>
+    <capability namespace="osgi.content">
+      <attribute name="size" value="151075" type="Long"/>
+      <attribute name="mime" value="application/vnd.osgi.bundle"/>
+      <attribute name="url" value="com.github.miachm.sods/com.github.miachm.sods-1.6.2.jar"/>
+      <attribute name="osgi.content" value="58C4B54B56F663FA5853983614034A85FA30FB9730D3F3948803372BB5EE6341"/>
+    </capability>
+    <requirement namespace="osgi.wiring.package">
+      <directive name="filter" value="(osgi.wiring.package=javax.xml.namespace)"/>
+      <attribute name="osgi.wiring.package" value="javax.xml.namespace"/>
+    </requirement>
+    <requirement namespace="osgi.wiring.package">
+      <directive name="filter" value="(osgi.wiring.package=javax.xml.stream)"/>
+      <attribute name="osgi.wiring.package" value="javax.xml.stream"/>
+    </requirement>
+    <requirement namespace="osgi.ee">
+      <directive name="filter" value="(&amp;(osgi.ee=JavaSE)(version=1.8))"/>
+    </requirement>
+  </resource>
+  <resource>
+    <capability namespace="osgi.identity">
+      <attribute name="osgi.identity" value="de.siegmar.fastcsv"/>
+      <attribute name="type" value="osgi.bundle"/>
+      <attribute name="version" value="2.2.2" type="Version"/>
+    </capability>
+    <capability namespace="osgi.wiring.package">
+      <attribute name="bundle-symbolic-name" value="de.siegmar.fastcsv"/>
+      <attribute name="bundle-version" value="2.2.2" type="Version"/>
+      <attribute name="osgi.wiring.package" value="de.siegmar.fastcsv.reader"/>
+      <attribute name="version" value="2.2.2" type="Version"/>
+      <attribute name="bnd.hashes" value="-1901923904,-1690706222,-73316078,-1593229662,1809435209,2027955732,758076521,-354192348,939712043,919553531,245419856,759928429,1600268336,2000715872,-1321348323" type="List&lt;Long&gt;"/>
+    </capability>
+    <capability namespace="osgi.wiring.package">
+      <attribute name="bundle-symbolic-name" value="de.siegmar.fastcsv"/>
+      <attribute name="bundle-version" value="2.2.2" type="Version"/>
+      <attribute name="osgi.wiring.package" value="de.siegmar.fastcsv.writer"/>
+      <attribute name="version" value="2.2.2" type="Version"/>
+      <attribute name="bnd.hashes" value="-202213534,-1521398322,1964840441,-1165707181,696269295" type="List&lt;Long&gt;"/>
+    </capability>
+    <capability namespace="osgi.wiring.bundle">
+      <attribute name="bundle-version" value="2.2.2" type="Version"/>
+      <attribute name="osgi.wiring.bundle" value="de.siegmar.fastcsv"/>
+    </capability>
+    <capability namespace="osgi.wiring.host">
+      <attribute name="bundle-version" value="2.2.2" type="Version"/>
+      <attribute name="osgi.wiring.host" value="de.siegmar.fastcsv"/>
+    </capability>
+    <capability namespace="osgi.content">
+      <attribute name="size" value="54004" type="Long"/>
+      <attribute name="mime" value="application/vnd.osgi.bundle"/>
+      <attribute name="url" value="de.siegmar.fastcsv/de.siegmar.fastcsv-2.2.2.jar"/>
+      <attribute name="osgi.content" value="3CC1BE03964BC0617D0C0C4420A8A6F6F0CC6EF8C40148BB0BA4364BB14817B9"/>
+    </capability>
+    <requirement namespace="osgi.ee">
+      <directive name="filter" value="(&amp;(osgi.ee=JavaSE)(version=1.8))"/>
+    </requirement>
+  </resource>
+</repository>