brings back R_lang exporter

Signed-off-by: Juergen Albert <j.albert@data-in-motion.biz>
geckoprojects-org · Jan 10, 2024 · 96148df · 96148df
1 parent 936bcd4
commit 96148df
Show file tree

Hide file tree

Showing 121 changed files with 216,855 additions and 555 deletions.
diff --git a/cnf/baseline.mvn b/cnf/baseline.mvn
@@ -1,15 +1,30 @@
-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
+org.geckoprojects.emf.utils:org.gecko.emf.bson:1.2.3
+org.geckoprojects.emf.utils:org.gecko.emf.bson.tests:1.0.3
+org.geckoprojects.emf.utils:org.gecko.emf.collections:2.2.0
+org.geckoprojects.emf.utils:org.gecko.emf.csv:1.0.0
+org.geckoprojects.emf.utils:org.gecko.emf.csv.tests:1.0.0
+org.geckoprojects.emf.utils:org.gecko.emf.exporter:2.0.0
+org.geckoprojects.emf.utils:org.gecko.emf.exporter.csv:1.0.1
+org.geckoprojects.emf.utils:org.gecko.emf.exporter.csv.api:1.0.0
+org.geckoprojects.emf.utils:org.gecko.emf.exporter.csv.tests:1.0.0
+org.geckoprojects.emf.utils:org.gecko.emf.exporter.ods:1.0.2
+org.geckoprojects.emf.utils:org.gecko.emf.exporter.ods.api:1.0.0
+org.geckoprojects.emf.utils:org.gecko.emf.exporter.ods.tests:1.0.2
+org.geckoprojects.emf.utils:org.gecko.emf.exporter.xlsx:1.0.0
+org.geckoprojects.emf.utils:org.gecko.emf.exporter.xlsx.api:1.0.0
+org.geckoprojects.emf.utils:org.gecko.emf.exporter.xlsx.tests:1.0.0
+org.geckoprojects.emf.utils:org.gecko.emf.json:1.4.3
+org.geckoprojects.emf.utils:org.gecko.emf.json.tests:1.0.3
+org.geckoprojects.emf.utils:org.gecko.emf.ods:1.0.2
+org.geckoprojects.emf.utils:org.gecko.emf.ods.tests:1.0.2
+org.geckoprojects.emf.utils:org.gecko.emf.pushstreams:1.2.0
+org.geckoprojects.emf.utils:org.gecko.emf.rest.jakartars:2.1.0
+org.geckoprojects.emf.utils:org.gecko.emf.rest.jaxrs:2.1.0
+org.geckoprojects.emf.utils:org.gecko.emf.trees.model:1.0.0
+org.geckoprojects.emf.utils:org.gecko.emf.util.annotations:1.2.0
+org.geckoprojects.emf.utils:org.gecko.emf.util.bnd.library.workspace:2.1.0
+org.geckoprojects.emf.utils:org.gecko.emf.util.jakartars.bnd.library.workspace:2.1.0
+org.geckoprojects.emf.utils:org.gecko.emf.util.jaxrs.bnd.library.workspace:2.1.0
+org.geckoprojects.emf.utils:org.gecko.emf.util.model:2.2.0
+org.geckoprojects.emf.utils:org.gecko.emf.xlsx:1.0.0
+org.geckoprojects.emf.utils:org.gecko.emf.xlsx.tests:1.0.0
diff --git a/cnf/build.bnd b/cnf/build.bnd
@@ -11,17 +11,11 @@
 
 # Needed because we enabled library 'gecko-dimc' 	
 github-project: org.gecko.emf.util
-base-version: 2.1.0.SNAPSHOT
+base-version: 2.1.1.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=${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}
-
 javac.source: 11
 javac.target: 11
 
@@ -55,24 +49,5 @@ javac.target: 11
         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}
-
--jpms-module-info:
+-baselinerepo: Baseline
+-baseline: *
diff --git a/cnf/central.mvn b/cnf/central.mvn
@@ -1,5 +1,4 @@
-biz.aQute.bnd:aQute.libg:6.2.0
-biz.aQute.bnd:biz.aQute.bnd.annotation:6.2.0
+biz.aQute.bnd:biz.aQute.bnd.annotation:7.0.0
 biz.aQute:biz.aQute.gogo.commands.provider:1.8.0
 biz.aQute:biz.aQute.wrapper.hamcrest:1.9.0
 
@@ -55,22 +54,12 @@ org.apache.servicemix.specs:org.apache.servicemix.specs.jsr311-api-1.1.1:2.9.0
 
 org.apache.sling:org.apache.sling.commons.johnzon:1.2.14
 
-org.assertj:assertj-core:3.22.0
-
 org.bouncycastle:bcpkix-jdk15on:1.64
 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
-org.junit.platform:junit-platform-commons:1.8.2
-org.junit.platform:junit-platform-engine:1.8.2
-org.junit.vintage:junit-vintage-engine:5.8.2
 
-org.mockito:mockito-core:4.2.0
-org.mockito:mockito-junit-jupiter:4.2.0
 
 org.opentest4j:opentest4j:1.2.0
 
@@ -158,8 +147,8 @@ org.freemarker:freemarker:2.3.31
 org.apiguardian:apiguardian-api:1.1.2
 
 org.geckoprojects.bnd:org.gecko.bnd.dimc.library:1.4.2-SNAPSHOT
-org.geckoprojects.bnd:org.gecko.bnd.osgitest.library:1.1.1
-org.geckoprojects.bnd:org.gecko.bnd.jacoco.library:1.1.1
+org.geckoprojects.bnd:org.gecko.bnd.osgitest.library:1.4.2-SNAPSHOT
+org.geckoprojects.bnd:org.gecko.bnd.jacoco.library:1.4.2-SNAPSHOT
 
 org.geckoprojects.emf:org.gecko.emf.osgi.bnd.library.workspace:5.0.0
 

diff --git a/cnf/dim_release.mvn b/cnf/dim_release.mvn
diff --git a/cnf/local/index.xml b/cnf/local/index.xml
@@ -1,5 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<repository xmlns="http://www.osgi.org/xmlns/repository/v1.0.0" name="Local" increment="1699736382673">
+<repository xmlns="http://www.osgi.org/xmlns/repository/v1.0.0" name="Local" increment="1704794632334">
+  <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>
   <resource>
     <capability namespace="osgi.identity">
       <attribute name="license" value="&quot;The Unlicense&quot;;link=&quot;https://github.com/miachm/SODS/blob/master/LICENSE&quot;"/>
@@ -42,42 +80,4 @@
       <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>
diff --git a/cnf/local/index.xml.sha b/cnf/local/index.xml.sha
diff --git a/org.gecko.emf.bson.tests/bnd.bnd b/org.gecko.emf.bson.tests/bnd.bnd
@@ -1,5 +1,5 @@
--enable-junit5: true
--library: enable-emf
+-library: enable-emf,\
+	enableOSGi-Test
 
 -buildpath: \
 	org.osgi.framework,\
@@ -13,4 +13,4 @@
 javac.source: 11
 javac.target: 11
 
-Bundle-Version: 1.0.3.SNAPSHOT
+Bundle-Version: 1.0.4.SNAPSHOT
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.3.SNAPSHOT
+Bundle-Version: 1.2.4.SNAPSHOT
 
 -library: enable-emf
diff --git a/org.gecko.emf.collections/bnd.bnd b/org.gecko.emf.collections/bnd.bnd
@@ -21,6 +21,6 @@ src src,src-gen
 
 Bundle-Name: Gecko EMF Collection Wrapper
 Bundle-Description: EMF Wrapper for several collection and iterable types
-Bundle-Version: 2.2.0.SNAPSHOT
+Bundle-Version: 2.2.1.SNAPSHOT
 
 -buildpath: org.osgi.service.condition
diff --git a/org.gecko.emf.csv.tests/bnd.bnd b/org.gecko.emf.csv.tests/bnd.bnd
@@ -1,16 +1,14 @@
--enable-junit5: true
--library: enable-emf
+-library: enable-emf,\
+	enableOSGi-Test
 
 javac.source: 11
 javac.target: 11
 
-Bundle-Version: 1.0.0.SNAPSHOT
+Bundle-Version: 1.0.1.SNAPSHOT
 
 -buildpath: \
-	org.gecko.emf.osgi.component,\
-	org.eclipse.emf.ecore.xmi,\
-	org.eclipse.emf.ecore,\
 	org.gecko.emf.osgi.example.model.basic,\
 	org.gecko.emf.exporter;version=latest,\
 	org.gecko.emf.exporter.csv.api;version=latest,\
-	org.apache.commons.commons-text
+	org.apache.commons.commons-text,\
+	org.gecko.emf.csv
diff --git a/org.gecko.emf.csv.tests/test.bndrun b/org.gecko.emf.csv.tests/test.bndrun
@@ -6,43 +6,47 @@
 -runbundles.junit5: ${test.runbundles}
 
 -runbundles: \
-	junit-jupiter-api;version='[5.8.2,5.8.3)',\
-	junit-platform-commons;version='[1.8.2,1.8.3)',\
 	org.apache.felix.configadmin;version='[1.9.22,1.9.23)',\
 	org.gecko.emf.osgi.example.model.basic;version='[4.1.1,4.1.2)',\
-	org.opentest4j;version='[1.2.0,1.2.1)',\
 	org.osgi.util.function;version='[1.1.0,1.1.1)',\
 	org.osgi.util.promise;version='[1.2.0,1.2.1)',\
-	assertj-core;version='[3.22.0,3.22.1)',\
-	junit-jupiter-params;version='[5.8.2,5.8.3)',\
-	org.osgi.test.common;version='[1.1.0,1.1.1)',\
-	org.osgi.test.junit5;version='[1.1.0,1.1.1)',\
 	org.apache.commons.commons-text;version='[1.10.0,1.10.1)',\
 	org.apache.commons.lang3;version='[3.12.0,3.12.1)',\
 	org.gecko.emf.exporter;version=snapshot,\
 	org.apache.commons.logging;version='[1.2.0,1.2.1)',\
 	slf4j.api;version='[1.7.36,1.7.37)',\
-	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)',\
 	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
 	org.apache.felix.scr;version='[2.2.6,2.2.7)',\
 	org.eclipse.emf.common;version='[2.28.0,2.28.1)',\
 	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.csv;version=snapshot,\
 	org.gecko.emf.osgi.api;version='[5.0.0,5.0.1)',\
 	org.gecko.emf.osgi.component;version='[5.0.0,5.0.1)',\
 	org.osgi.service.component;version='[1.5.0,1.5.1)',\
 	org.osgi.util.converter;version='[1.0.8,1.0.9)',\
-	slf4j.jcl;version='[1.7.36,1.7.37)'
+	slf4j.simple;version='[1.7.25,1.7.26)',\
+	assertj-core;version='[3.24.2,3.24.3)',\
+	de.siegmar.fastcsv;version='[2.2.2,2.2.3)',\
+	junit-jupiter-api;version='[5.10.1,5.10.2)',\
+	junit-jupiter-engine;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)',\
+	junit-platform-engine;version='[1.10.1,1.10.2)',\
+	junit-platform-launcher;version='[1.10.1,1.10.2)',\
+	net.bytebuddy.byte-buddy;version='[1.14.9,1.14.10)',\
+	org.gecko.emf.exporter.csv;version=snapshot,\
+	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)',\
+	com.github.miachm.sods;version='[1.6.2,1.6.3)',\
+	org.gecko.emf.csv;version=snapshot,\
+	org.gecko.emf.csv.tests;version=snapshot,\
+	org.gecko.emf.exporter.ods;version=snapshot
 
--runrequires: \
-	bnd.identity;id='org.gecko.emf.exporter.csv',\
-	bnd.identity;id='org.gecko.emf.csv.tests'
+-runrequires: bnd.identity;id='org.gecko.emf.csv.tests';version:Version='1.0.1.202401101117-SNAPSHOT'
 
 -runee: JavaSE-17
 

diff --git a/org.gecko.emf.csv/bnd.bnd b/org.gecko.emf.csv/bnd.bnd
@@ -1,7 +1,9 @@
-Bundle-Version: 1.0.0.SNAPSHOT
+Bundle-Version: 1.0.1.SNAPSHOT
 Bundle-Name: Gecko EMF CSV Extension
 Bundle-Description: Extension to save EMF objects to CSV
 
 -library: enable-emf
 
--buildpath: org.gecko.emf.exporter;version=latest
+-buildpath: \
+	org.gecko.emf.exporter;version=latest,\
+	org.gecko.emf.exporter.csv.api;version=snapshot