Skip to content

Commit

Permalink
bumped Version and reintroduced baselining
Browse files Browse the repository at this point in the history
Signed-off-by: Juergen Albert <j.albert@data-in-motion.biz>
  • Loading branch information
juergen-albert committed Aug 30, 2023
1 parent f5d269c commit cb20aea
Show file tree
Hide file tree
Showing 17 changed files with 44 additions and 17 deletions.
16 changes: 16 additions & 0 deletions cnf/baseline.mvn
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
org.geckoprojects.emf.utils:org.gecko.emf.util.model:2.1.1
org.geckoprojects.emf.utils:org.gecko.emf.util.bnd.library.workspace:2.0.1
org.geckoprojects.emf.utils:org.gecko.emf.util.annotations:1.1.0
org.geckoprojects.emf.utils:org.gecko.emf.rest:2.0.1
org.geckoprojects.emf.utils:org.gecko.emf.pushstreams:1.1.1
org.geckoprojects.emf.utils:org.gecko.emf.ods.tests:1.0.0
org.geckoprojects.emf.utils:org.gecko.emf.ods:1.0.0
org.geckoprojects.emf.utils:org.gecko.emf.json.tests:1.0.1
org.geckoprojects.emf.utils:org.gecko.emf.json:1.4.1
org.geckoprojects.emf.utils:org.gecko.emf.exporter.ods.tests:1.0.0
org.geckoprojects.emf.utils:org.gecko.emf.exporter.ods:1.0.0
org.geckoprojects.emf.utils:org.gecko.emf.exporter:1.0.0
org.geckoprojects.emf.utils:org.gecko.emf.collections:2.1.1
org.geckoprojects.emf.utils:org.gecko.emf.bson.tests:1.0.1
org.geckoprojects.emf.utils:org.gecko.emf.bson:1.2.1
org.geckoprojects.emf.utils:org.gecko.emf.jaxrs:1.0.0
16 changes: 13 additions & 3 deletions cnf/build.bnd
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

# Needed because we enabled library 'gecko-dimc'
github-project: org.gecko.emf.util
base-version: 2.0.1.SNAPSHOT
base-version: 2.0.2.SNAPSHOT

# Maven Central Group-Id
-groupid: org.geckoprojects.emf.utils
Expand All @@ -25,15 +25,14 @@ releaseNotNeeded: ${findproviders;osgi.identity;(&(osgi.identity=${bsn})(version
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: \
Expand All @@ -47,4 +46,15 @@ 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

-baselinerepo: Baseline
-baseline: *

2 changes: 1 addition & 1 deletion cnf/local/index.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<repository xmlns="http://www.osgi.org/xmlns/repository/v1.0.0" name="Local" increment="1693178725374">
<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;"/>
Expand Down
1 change: 1 addition & 0 deletions cnf/local/index.xml.sha
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0fbc4a168cad428991f05ce0a5fa7233fb8833eba78a266609684e5b83714a24
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
bnd_version=6.3.0-RC1
bnd_version=6.4.0
bnd_snapshots=https://bndtools.jfrog.io/ui/native/libs-release/
2 changes: 1 addition & 1 deletion org.gecko.emf.bson.tests/bnd.bnd
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
javac.source: 11
javac.target: 11

Bundle-Version: 1.0.1.SNAPSHOT
Bundle-Version: 1.0.2.SNAPSHOT
2 changes: 1 addition & 1 deletion org.gecko.emf.bson/bnd.bnd
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@

Bundle-Name: Gecko EMF Bson Extension
Bundle-Description: Extension to de-/serialize EMF from/into Bson
Bundle-Version: 1.2.1.SNAPSHOT
Bundle-Version: 1.2.2.SNAPSHOT

-library: enable-emf
2 changes: 1 addition & 1 deletion org.gecko.emf.collections/bnd.bnd
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ src src,src-gen

Bundle-Name: Gecko EMF Collection Wrapper
Bundle-Description: EMF Wrapper for several collection and iterable types
Bundle-Version: 2.1.1.SNAPSHOT
Bundle-Version: 2.1.2.SNAPSHOT
2 changes: 1 addition & 1 deletion org.gecko.emf.exporter.ods.tests/bnd.bnd
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
javac.source: 11
javac.target: 11

Bundle-Version: 1.0.0.SNAPSHOT
Bundle-Version: 1.0.1.SNAPSHOT

-buildpath: \
org.gecko.emf.osgi.component,\
Expand Down
2 changes: 1 addition & 1 deletion org.gecko.emf.exporter/bnd.bnd
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Bundle-Version: 1.0.0.SNAPSHOT
Bundle-Version: 1.0.1.SNAPSHOT
Bundle-Name: Gecko EMF Exporter
Bundle-Description: Exporter for EMF

Expand Down
2 changes: 1 addition & 1 deletion org.gecko.emf.json.tests/bnd.bnd
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
javac.source: 11
javac.target: 11

Bundle-Version: 1.0.1.SNAPSHOT
Bundle-Version: 1.0.2.SNAPSHOT
-buildpath: \
org.eclipse.emfcloud.emfjson-jackson;version=latest,\
org.gecko.emf.osgi.component,\
Expand Down
2 changes: 1 addition & 1 deletion org.gecko.emf.json/bnd.bnd
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Bundle-Version: 1.4.1.SNAPSHOT
Bundle-Version: 1.4.2.SNAPSHOT
Bundle-Name: Gecko EMF Json Extension
Bundle-Description: Extension to save and load EMF objects in/to JSON using JacksonXML

Expand Down
2 changes: 1 addition & 1 deletion org.gecko.emf.ods.tests/bnd.bnd
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
javac.source: 11
javac.target: 11

Bundle-Version: 1.0.0.SNAPSHOT
Bundle-Version: 1.0.1.SNAPSHOT

-buildpath: \
org.gecko.emf.osgi.component,\
Expand Down
2 changes: 1 addition & 1 deletion org.gecko.emf.ods/bnd.bnd
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Bundle-Version: 1.0.0.SNAPSHOT
Bundle-Version: 1.0.1.SNAPSHOT
Bundle-Name: Gecko EMF ODS Extension
Bundle-Description: Extension to save EMF objects to ODS using SODS

Expand Down
2 changes: 1 addition & 1 deletion org.gecko.emf.pushstreams/bnd.bnd
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ javac.target: 11
-buildpath: ,\
org.osgi.util.pushstream

Bundle-Version: 1.1.1.SNAPSHOT
Bundle-Version: 1.1.2.SNAPSHOT
2 changes: 1 addition & 1 deletion org.gecko.emf.util.annotations/bnd.bnd
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Bundle-Version: 1.1.0-SNAPSHOT
Bundle-Version: 1.1.1-SNAPSHOT

-buildpath: \
org.gecko.emf.bson;version=snapshot,\
Expand Down
2 changes: 1 addition & 1 deletion org.gecko.emf.util.model/bnd.bnd
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ src src,src-gen

-library: enable-emf

Bundle-Version: 2.1.1.SNAPSHOT
Bundle-Version: 2.1.2.SNAPSHOT

0 comments on commit cb20aea

Please sign in to comment.