From 23973fa32cd16a39bc0ea11d34f689a844a56cec Mon Sep 17 00:00:00 2001 From: Kai Brassel <mail@khbrassel.de> Date: Wed, 2 Jun 2021 12:14:29 +0200 Subject: [PATCH] Don't rely on a special version of de.hftstuttgart.cityunits --- .../META-INF/MANIFEST.MF | 6 +++--- de.hftstuttgart.energycomponents.edit/.classpath | 4 ++-- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../energycomponents.target.target | 8 ++++---- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/de.hftstuttgart.energycomponents.application/META-INF/MANIFEST.MF b/de.hftstuttgart.energycomponents.application/META-INF/MANIFEST.MF index f152871..7f9f2a2 100644 --- a/de.hftstuttgart.energycomponents.application/META-INF/MANIFEST.MF +++ b/de.hftstuttgart.energycomponents.application/META-INF/MANIFEST.MF @@ -21,9 +21,9 @@ Require-Bundle: javax.inject;bundle-version="1.0.0", de.hftstuttgart.energycomponents.model;bundle-version="0.0.0", de.hftstuttgart.energycomponents.edit;bundle-version="0.0.0", de.hftstuttgart.energycomponents.viewmodel;bundle-version="0.0.0", - de.hftstuttgart.cityunits.model;bundle-version="1.0.1", - de.hftstuttgart.cityunits.model.edit;bundle-version="1.0.1", - de.hftstuttgart.cityunits.ui.renderer;bundle-version="1.0.1", + de.hftstuttgart.cityunits.model;bundle-version="0.0.0", + de.hftstuttgart.cityunits.model.edit;bundle-version="0.0.0", + de.hftstuttgart.cityunits.ui.renderer;bundle-version="0.0.0", tech.units.indriya;bundle-version="2.1.1" Import-Package: javax.annotation;version="1.3.5" Automatic-Module-Name: de.hftstuttgart.energycomponents.application diff --git a/de.hftstuttgart.energycomponents.edit/.classpath b/de.hftstuttgart.energycomponents.edit/.classpath index 201ac1d..0f765a7 100644 --- a/de.hftstuttgart.energycomponents.edit/.classpath +++ b/de.hftstuttgart.energycomponents.edit/.classpath @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-15"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src-gen"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="src" path="src-gen/"/> <classpathentry kind="output" path="target/classes"/> </classpath> diff --git a/de.hftstuttgart.energycomponents.edit/META-INF/MANIFEST.MF b/de.hftstuttgart.energycomponents.edit/META-INF/MANIFEST.MF index d85dfc5..90968ad 100644 --- a/de.hftstuttgart.energycomponents.edit/META-INF/MANIFEST.MF +++ b/de.hftstuttgart.energycomponents.edit/META-INF/MANIFEST.MF @@ -13,6 +13,6 @@ Require-Bundle: org.eclipse.core.runtime, de.hftstuttgart.energycomponents.model;visibility:=reexport, de.hftstuttgart.energycomponents.model;visibility:=reexport, org.eclipse.emf.edit;visibility:=reexport, - de.hftstuttgart.cityunits.model;bundle-version="1.0.1";visibility:=reexport, + de.hftstuttgart.cityunits.model;visibility:=reexport, de.hftstuttgart.cityunits.model.edit;visibility:=reexport Bundle-ActivationPolicy: lazy diff --git a/de.hftstuttgart.energycomponents.model/META-INF/MANIFEST.MF b/de.hftstuttgart.energycomponents.model/META-INF/MANIFEST.MF index 5b11b0d..e751bda 100644 --- a/de.hftstuttgart.energycomponents.model/META-INF/MANIFEST.MF +++ b/de.hftstuttgart.energycomponents.model/META-INF/MANIFEST.MF @@ -12,5 +12,5 @@ Export-Package: de.hftstuttgart.energycomponents, de.hftstuttgart.energycomponents.util Require-Bundle: org.eclipse.core.runtime, org.eclipse.emf.ecore;visibility:=reexport, - de.hftstuttgart.cityunits.model;bundle-version="1.0.1";visibility:=reexport + de.hftstuttgart.cityunits.model;bundle-version="0.0.0";visibility:=reexport Bundle-ActivationPolicy: lazy diff --git a/de.hftstuttgart.energycomponents.target/energycomponents.target.target b/de.hftstuttgart.energycomponents.target/energycomponents.target.target index 29a4420..7ab3f03 100644 --- a/de.hftstuttgart.energycomponents.target/energycomponents.target.target +++ b/de.hftstuttgart.energycomponents.target/energycomponents.target.target @@ -15,14 +15,14 @@ <repository location="https://transfer.hft-stuttgart.de/pages/neqmodplus/indriya-p2/release_target_211/"/> <unit id="de.hft-stuttgart.indriya.feature.feature.group" version="0.0.0"/> </location> - <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit"> - <repository location="https://transfer.hft-stuttgart.de/pages/neqmodplus/de.hft-stuttgart.cityunits/release_target_101/"/> - <unit id="de.hftstuttgart.cityunits.feature.feature.group" version="0.0.0"/> - </location> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit"> <repository location="https://download.eclipse.org/justj/jres/15/updates/milestone"/> <unit id="org.eclipse.justj.openjdk.hotspot.jre.full.stripped.feature.group" version="15.0.2.v20210201-0955"/> </location> + <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit"> + <repository location="https://transfer.hft-stuttgart.de/pages/neqmodplus/de.hft-stuttgart.cityunits/release_target_102/"/> + <unit id="de.hftstuttgart.cityunits.feature.feature.group" version="1.0.2"/> + </location> </locations> <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/OpenJDK 15"/> </target> \ No newline at end of file -- GitLab