diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 00da6e83e06d5c95d6284e2bcf1544fabf67f4b3..805e95d686783b6f719a3b614a64c1b9c264f02f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ variables: - RELEASE_DIR: "public/release_target_101" + RELEASE_DIR: "public/release_target_102" pages: stage: deploy diff --git a/de.hftstuttgart.cityunits.feature/feature.xml b/de.hftstuttgart.cityunits.feature/feature.xml index 8c8f2351760f0027390a8d4fe278e9a5b76e8a1e..648f9210c10de51a322458ec44afc91790d79167 100644 --- a/de.hftstuttgart.cityunits.feature/feature.xml +++ b/de.hftstuttgart.cityunits.feature/feature.xml @@ -2,7 +2,7 @@ <feature id="de.hftstuttgart.cityunits.feature" label="City Units" - version="1.0.1" + version="1.0.2" provider-name="HfT Stuttgart"> <description url="http://www.example.com/description"> diff --git a/de.hftstuttgart.cityunits.feature/pom.xml b/de.hftstuttgart.cityunits.feature/pom.xml index 312edf444449c1b77876f526a503402bfea16e71..17e371faabde130a59403ff7fc075c676a7ba363 100644 --- a/de.hftstuttgart.cityunits.feature/pom.xml +++ b/de.hftstuttgart.cityunits.feature/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>de.hftstuttgart</groupId> <artifactId>de.hftstuttgart.cityunits</artifactId> - <version>1.0.1</version> + <version>1.0.2</version> </parent> </project> \ No newline at end of file diff --git a/de.hftstuttgart.cityunits.model.edit/.classpath b/de.hftstuttgart.cityunits.model.edit/.classpath index 1f0469022c306ea5fefe4b29b6d0eee95d3db009..d116359246ee6800ba985bf91b14957149f7db34 100644 --- a/de.hftstuttgart.cityunits.model.edit/.classpath +++ b/de.hftstuttgart.cityunits.model.edit/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <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/"/> <classpathentry kind="output" path="target/classes"/> diff --git a/de.hftstuttgart.cityunits.model.edit/META-INF/MANIFEST.MF b/de.hftstuttgart.cityunits.model.edit/META-INF/MANIFEST.MF index a555b1425f67350d360fa933ac5a4c29041bf24c..1fefb7254b04ff417797df708e6b3499a90ca574 100644 --- a/de.hftstuttgart.cityunits.model.edit/META-INF/MANIFEST.MF +++ b/de.hftstuttgart.cityunits.model.edit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: de.hftstuttgart.cityunits.model.edit;singleton:=true Automatic-Module-Name: de.hftstuttgart.cityunits.model.edit -Bundle-Version: 1.0.1 +Bundle-Version: 1.0.2 Bundle-ClassPath: . Bundle-Activator: de.hftstuttgart.cityunits.model.quantities.provider.QuantitiesEditPlugin$Implementation Bundle-Vendor: %providerName diff --git a/de.hftstuttgart.cityunits.model.edit/pom.xml b/de.hftstuttgart.cityunits.model.edit/pom.xml index 960e3e2fd80f10fc691408f729723dc0d3e11a07..ac13c6fba986ea026098ce6c290b40ba04ba1667 100644 --- a/de.hftstuttgart.cityunits.model.edit/pom.xml +++ b/de.hftstuttgart.cityunits.model.edit/pom.xml @@ -11,7 +11,7 @@ <parent> <groupId>de.hftstuttgart</groupId> <artifactId>de.hftstuttgart.cityunits</artifactId> - <version>1.0.1</version> + <version>1.0.2</version> </parent> </project> \ No newline at end of file diff --git a/de.hftstuttgart.cityunits.model/.classpath b/de.hftstuttgart.cityunits.model/.classpath index eabb7bcf36f82dda5d6f14a60a76a6acc5fad082..d116359246ee6800ba985bf91b14957149f7db34 100644 --- a/de.hftstuttgart.cityunits.model/.classpath +++ b/de.hftstuttgart.cityunits.model/.classpath @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <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"/> + <classpathentry kind="src" path="src/"/> <classpathentry kind="output" path="target/classes"/> </classpath> diff --git a/de.hftstuttgart.cityunits.model/META-INF/MANIFEST.MF b/de.hftstuttgart.cityunits.model/META-INF/MANIFEST.MF index 91ed620b8fcc97eb29bfa7df1d38d86f3fb4bc71..bedbe0223bffe0ab67eae804432f8e464f40fb69 100644 --- a/de.hftstuttgart.cityunits.model/META-INF/MANIFEST.MF +++ b/de.hftstuttgart.cityunits.model/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: de.hftstuttgart.cityunits.model;singleton:=true -Bundle-Version: 1.0.1 +Bundle-Version: 1.0.2 Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/de.hftstuttgart.cityunits.model/pom.xml b/de.hftstuttgart.cityunits.model/pom.xml index c428f26dd55ddffb3b746f6e599507e007540b5f..7de7acca7c05779a7821dcf9ca34c85737345415 100644 --- a/de.hftstuttgart.cityunits.model/pom.xml +++ b/de.hftstuttgart.cityunits.model/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>de.hftstuttgart</groupId> <artifactId>de.hftstuttgart.cityunits</artifactId> - <version>1.0.1</version> + <version>1.0.2</version> </parent> </project> \ No newline at end of file diff --git a/de.hftstuttgart.cityunits.p2site/pom.xml b/de.hftstuttgart.cityunits.p2site/pom.xml index b95612163312adce8060e31631aa322c24706b2c..4f4285e76ad9766c51f8b4cee32ab1ea1ce8f14f 100644 --- a/de.hftstuttgart.cityunits.p2site/pom.xml +++ b/de.hftstuttgart.cityunits.p2site/pom.xml @@ -6,6 +6,6 @@ <parent> <groupId>de.hftstuttgart</groupId> <artifactId>de.hftstuttgart.cityunits</artifactId> - <version>1.0.1</version> + <version>1.0.2</version> </parent> </project> \ No newline at end of file diff --git a/de.hftstuttgart.cityunits.p2site/site.xml b/de.hftstuttgart.cityunits.p2site/site.xml index 294ae624bae9028d9e72ef11bc554dd4ef61b16e..c511614cf8fa5f11b6b450599a79bb266f473726 100644 --- a/de.hftstuttgart.cityunits.p2site/site.xml +++ b/de.hftstuttgart.cityunits.p2site/site.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <site> - <feature url="features/de.hftstuttgart.cityunits.feature_1.0.1.jar" id="de.hftstuttgart.cityunits.feature" version="1.0.1"> + <feature url="features/de.hftstuttgart.cityunits.feature_1.0.2.jar" id="de.hftstuttgart.cityunits.feature" version="1.0.2"> <category name="de.hftstuttgart.cityunits"/> </feature> <category-def name="de.hftstuttgart.cityunits" label="HfT Stuttgart City Units"> diff --git a/de.hftstuttgart.cityunits.target/pom.xml b/de.hftstuttgart.cityunits.target/pom.xml index a81eb1856161c405b0c7030fe5e0572b011c80ec..5412a8a83be2e34aeb220fa9b6a1eca7bc5eb019 100644 --- a/de.hftstuttgart.cityunits.target/pom.xml +++ b/de.hftstuttgart.cityunits.target/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>de.hftstuttgart</groupId> <artifactId>de.hftstuttgart.cityunits</artifactId> - <version>1.0.1</version> + <version>1.0.2</version> </parent> </project> \ No newline at end of file diff --git a/de.hftstuttgart.cityunits.tests/.classpath b/de.hftstuttgart.cityunits.tests/.classpath index 001da8902510b835c8332e9eb264f5bb02ccb7d3..130799695e1630a3df54346636c73fff54c56c35 100644 --- a/de.hftstuttgart.cityunits.tests/.classpath +++ b/de.hftstuttgart.cityunits.tests/.classpath @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-15"> <attributes> <attribute name="maven.pomderived" value="true"/> </attributes> </classpathentry> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src"> + <classpathentry kind="src" path="src/"> <attributes> <attribute name="test" value="true"/> </attributes> diff --git a/de.hftstuttgart.cityunits.tests/META-INF/MANIFEST.MF b/de.hftstuttgart.cityunits.tests/META-INF/MANIFEST.MF index e1203fc9a097f6825a1f5d4601de87d9b44cde9f..c7cbb5f3d7af421300fae0ec72ae5ea62969a7d8 100644 --- a/de.hftstuttgart.cityunits.tests/META-INF/MANIFEST.MF +++ b/de.hftstuttgart.cityunits.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Tests Bundle-SymbolicName: de.hftstuttgart.cityunits.tests -Bundle-Version: 1.0.1 +Bundle-Version: 1.0.2 Automatic-Module-Name: de.hft.stuttgart.cityunits.tests Import-Package: de.hftstuttgart.cityunits.model, org.junit;version="4.13.0", diff --git a/de.hftstuttgart.cityunits.tests/pom.xml b/de.hftstuttgart.cityunits.tests/pom.xml index 73db23e3256b6bcefcc8f370e15e8097af5f5eee..ea290f5478979da90c677a8bf08191d417a7640d 100644 --- a/de.hftstuttgart.cityunits.tests/pom.xml +++ b/de.hftstuttgart.cityunits.tests/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>de.hftstuttgart</groupId> <artifactId>de.hftstuttgart.cityunits</artifactId> - <version>1.0.1</version> + <version>1.0.2</version> </parent> </project> \ No newline at end of file diff --git a/de.hftstuttgart.cityunits.ui.renderer/.classpath b/de.hftstuttgart.cityunits.ui.renderer/.classpath index 423c9748708b92edc302dfc7f28ae3e0556be1ff..f5ef1792a59e6de6676b179a830f4eee417366cc 100644 --- a/de.hftstuttgart.cityunits.ui.renderer/.classpath +++ b/de.hftstuttgart.cityunits.ui.renderer/.classpath @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-15"> <attributes> <attribute name="module" value="true"/> </attributes> diff --git a/de.hftstuttgart.cityunits.ui.renderer/META-INF/MANIFEST.MF b/de.hftstuttgart.cityunits.ui.renderer/META-INF/MANIFEST.MF index d5199eb72e3473bc55ed91f7aeecb0261f217c50..7549dc24147cf015c6e5d1fc29d3eec08f85b6a1 100644 --- a/de.hftstuttgart.cityunits.ui.renderer/META-INF/MANIFEST.MF +++ b/de.hftstuttgart.cityunits.ui.renderer/META-INF/MANIFEST.MF @@ -2,10 +2,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: QuantityControl Bundle-SymbolicName: de.hftstuttgart.cityunits.ui.renderer;singleton:=true -Bundle-Version: 1.0.1 +Bundle-Version: 1.0.2 Bundle-Vendor: HfT Stuttgart -Export-Package: de.hftstuttgart.cityunits.ui.renderer;version="1.0.1" -Require-Bundle: de.hftstuttgart.cityunits.model;bundle-version="1.0.1", +Export-Package: de.hftstuttgart.cityunits.ui.renderer;version="1.0.2" +Require-Bundle: de.hftstuttgart.cityunits.model;bundle-version="1.0.2", org.eclipse.emf.ecp.edit.swt;bundle-version="[1.24.0,2.0.0)", org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.24.0,2.0.0)", org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.24.0,2.0.0)", diff --git a/de.hftstuttgart.cityunits.ui.renderer/pom.xml b/de.hftstuttgart.cityunits.ui.renderer/pom.xml index f599ab856e4017491f3e8079c6b40e9a622167ac..7b5138b3c1b1d833fe3a80465f2f03612cde6735 100644 --- a/de.hftstuttgart.cityunits.ui.renderer/pom.xml +++ b/de.hftstuttgart.cityunits.ui.renderer/pom.xml @@ -9,6 +9,6 @@ <parent> <groupId>de.hftstuttgart</groupId> <artifactId>de.hftstuttgart.cityunits</artifactId> - <version>1.0.1</version> + <version>1.0.2</version> </parent> </project> \ No newline at end of file diff --git a/pom.xml b/pom.xml index 5209b3e659c31ab786978a63069c67e33f722850..71b619332dfdae0b4d5e9fe135586272c072f4f6 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>de.hftstuttgart</groupId> <artifactId>de.hftstuttgart.cityunits</artifactId> - <version>1.0.1</version> + <version>1.0.2</version> <packaging>pom</packaging> <name>City Units Parent POM</name> @@ -36,7 +36,7 @@ <artifact> <groupId>de.hftstuttgart</groupId> <artifactId>de.hftstuttgart.cityunits.target</artifactId> - <version>1.0.1</version> + <version>1.0.2</version> </artifact> </target> <environments>