fixed baselining issues

Signed-off-by: Juergen Albert <[email protected]>
geckoprojects-org · Mar 14, 2024 · 8f578a3 · 8f578a3
1 parent 34ae604
commit 8f578a3
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 16 deletions.
diff --git a/cnf/central.mvn b/cnf/central.mvn
@@ -80,7 +80,6 @@ org.osgi:osgi.annotation:8.1.0
 org.slf4j:slf4j-simple:1.7.36
 org.slf4j:slf4j-api:1.7.36
 
-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.eclipse.platform:org.eclipse.core.contenttype:3.9.100
@@ -97,3 +96,4 @@ org.eclipse.platform:org.eclipse.equinox.supplement:1.10.700
 org.eclipse.jdt:org.eclipse.jdt.core:3.26.0
 org.eclipse.platform:org.eclipse.osgi:3.18.500
 org.eclipse.platform:org.eclipse.text:3.13.100
+org.geckoprojects.bnd:org.gecko.bnd.dimc.library:1.4.6
diff --git a/cnf/ext/version.bnd b/cnf/ext/version.bnd
@@ -1 +1 @@
-base-version: 6.1.3
+base-version: 6.1.4
diff --git a/org.gecko.emf.osgi.codegen/bnd.bnd b/org.gecko.emf.osgi.codegen/bnd.bnd
@@ -28,8 +28,7 @@ src=${^src}
 
 -includeresource.resource: \
 	/=resources,\
-	templates,\
-	{resources/version.properties}
+	templates
 
 -privatepackage.add: \
 	org.eclipse.core.runtime;-split-package:=merge-first,\

diff --git a/org.gecko.emf.osgi.codegen/resources/version.properties b/org.gecko.emf.osgi.codegen/resources/version.properties
diff --git a/org.gecko.emf.osgi.codegen/src/org/gecko/emf/osgi/codegen/GeckoEmfGenerator.java b/org.gecko.emf.osgi.codegen/src/org/gecko/emf/osgi/codegen/GeckoEmfGenerator.java
@@ -25,7 +25,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import java.util.Properties;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.eclipse.core.runtime.IProgressMonitor;
@@ -131,12 +130,7 @@ public Optional<String> generate(
 				initializeLog(context.getBase(), context.get(PROP_LOGFILE));
 			}
 
-			Properties props = new Properties();
-			props.load(getClass().getResourceAsStream("/version.properties"));
-
-			String version = props.getProperty("version");
-
-			info("Running Gecko EMF Codegen Version " + version);
+			info("Running Gecko EMF Codegen Version " + VersionConstant.GECKOPROJECTS_EMF_VERSION);
 
 			String genFolder = context.get(PROP_OUTPUT);
 			File output = null;

diff --git a/org.gecko.emf.osgi.itest.minimal/.project b/org.gecko.emf.osgi.itest.minimal/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.gecko.emf.osgi.itest</name>
+	<name>org.gecko.emf.osgi.itest.minimal</name>
 	<comment></comment>
 	<projects>
 	</projects>

diff --git a/org.gecko.emf.osgi/src-gen/org/gecko/emf/osgi/constants/VersionConstant.java b/org.gecko.emf.osgi/src-gen/org/gecko/emf/osgi/constants/VersionConstant.java
@@ -20,6 +20,6 @@
  */
 public class VersionConstant {
 
-	public static final String GECKOPROJECTS_EMF_VERSION = "6.1.2"; //$NON-NLS-1$
+	public static final String GECKOPROJECTS_EMF_VERSION = "6.1.4"; //$NON-NLS-1$
 	public static final String GECKOPROJECTS_EMF_MAJOR_VERSION = "6"; //$NON-NLS-1$
 }
diff --git a/org.gecko.emf.osgi/src/org/gecko/emf/osgi/components/config/package-info.java b/org.gecko.emf.osgi/src/org/gecko/emf/osgi/components/config/package-info.java
@@ -11,5 +11,5 @@
  * Contributors:
  *     Data In Motion - initial API and implementation
  */
-@org.osgi.annotation.versioning.Version("6.0.4")
+@org.osgi.annotation.versioning.Version("6.0.5")
 package org.gecko.emf.osgi.components.config;
diff --git a/org.gecko.emf.osgi/src/org/gecko/emf/osgi/constants/package-info.java b/org.gecko.emf.osgi/src/org/gecko/emf/osgi/constants/package-info.java
@@ -16,5 +16,5 @@
  * @author mark
  * @since 15.12.2023
  */
-@org.osgi.annotation.versioning.Version("1.0.4")
+@org.osgi.annotation.versioning.Version("1.0.5")
 package org.gecko.emf.osgi.constants;