diff --git a/ArduinoIDEPlugin/pom.xml b/ArduinoIDEPlugin/pom.xml index 55ef2e7e7..cdbf087c0 100644 --- a/ArduinoIDEPlugin/pom.xml +++ b/ArduinoIDEPlugin/pom.xml @@ -4,7 +4,7 @@ org.thingml org.thingml.root - 0.6.0-SNAPSHOT + 0.6.0 ../pom.xml diff --git a/compilers/c/pom.xml b/compilers/c/pom.xml index 0592531fb..e6192a2ce 100644 --- a/compilers/c/pom.xml +++ b/compilers/c/pom.xml @@ -10,7 +10,7 @@ compilers org.thingml - 0.6.0-SNAPSHOT + 0.6.0 ../pom.xml diff --git a/compilers/debugGUI/pom.xml b/compilers/debugGUI/pom.xml index f47af39dc..17a404de7 100644 --- a/compilers/debugGUI/pom.xml +++ b/compilers/debugGUI/pom.xml @@ -10,7 +10,7 @@ compilers org.thingml - 0.6.0-SNAPSHOT + 0.6.0 ../pom.xml diff --git a/compilers/framework/pom.xml b/compilers/framework/pom.xml index 9ef22df45..a55bd5c39 100644 --- a/compilers/framework/pom.xml +++ b/compilers/framework/pom.xml @@ -10,7 +10,7 @@ compilers org.thingml - 0.6.0-SNAPSHOT + 0.6.0 ../pom.xml diff --git a/compilers/java/pom.xml b/compilers/java/pom.xml index 5a254dbea..5c28a9007 100644 --- a/compilers/java/pom.xml +++ b/compilers/java/pom.xml @@ -10,7 +10,7 @@ compilers org.thingml - 0.6.0-SNAPSHOT + 0.6.0 ../pom.xml diff --git a/compilers/java/src/main/resources/pomtemplates/javapom.xml b/compilers/java/src/main/resources/pomtemplates/javapom.xml index 6730f18a0..e7b902c97 100644 --- a/compilers/java/src/main/resources/pomtemplates/javapom.xml +++ b/compilers/java/src/main/resources/pomtemplates/javapom.xml @@ -13,7 +13,7 @@ ${java.home}/lib/jsse.jar UTF-8 0.6.0-SNAPSHOT - 0.1.0-SNAPSHOT + 1.0.0 diff --git a/compilers/javascript/pom.xml b/compilers/javascript/pom.xml index ed740a10d..a1e15517f 100644 --- a/compilers/javascript/pom.xml +++ b/compilers/javascript/pom.xml @@ -10,7 +10,7 @@ compilers org.thingml - 0.6.0-SNAPSHOT + 0.6.0 ../pom.xml diff --git a/compilers/official-network-plugins/pom.xml b/compilers/official-network-plugins/pom.xml index c3698576a..8015bd72a 100644 --- a/compilers/official-network-plugins/pom.xml +++ b/compilers/official-network-plugins/pom.xml @@ -4,7 +4,7 @@ org.thingml compilers - 0.6.0-SNAPSHOT + 0.6.0 org.thingml official-network-plugins @@ -14,27 +14,27 @@ org.thingml compilers.c - 0.6.0-SNAPSHOT + ${thingml.version} org.thingml compilers.java - 0.6.0-SNAPSHOT + ${thingml.version} org.thingml compilers.javascript - 0.6.0-SNAPSHOT + ${thingml.version} org.thingml compilers.framework - 0.6.0-SNAPSHOT + ${thingml.version} org.thingml compilers.debugGUI - 0.6.0-SNAPSHOT + ${thingml.version} \ No newline at end of file diff --git a/compilers/pom.xml b/compilers/pom.xml index 96fc180af..bcd35c384 100644 --- a/compilers/pom.xml +++ b/compilers/pom.xml @@ -9,7 +9,7 @@ org.thingml org.thingml.root - 0.6.0-SNAPSHOT + 0.6.0 ../pom.xml diff --git a/compilers/registry/pom.xml b/compilers/registry/pom.xml index 89c866ca4..af0f8c07b 100644 --- a/compilers/registry/pom.xml +++ b/compilers/registry/pom.xml @@ -10,7 +10,7 @@ compilers org.thingml - 0.6.0-SNAPSHOT + 0.6.0 ../pom.xml diff --git a/compilers/thingmltools/pom.xml b/compilers/thingmltools/pom.xml index 0e5148029..6d7c74160 100644 --- a/compilers/thingmltools/pom.xml +++ b/compilers/thingmltools/pom.xml @@ -10,7 +10,7 @@ compilers org.thingml - 0.6.0-SNAPSHOT + 0.6.0 ../pom.xml diff --git a/compilers/uml/pom.xml b/compilers/uml/pom.xml index 024737b92..21206748a 100644 --- a/compilers/uml/pom.xml +++ b/compilers/uml/pom.xml @@ -10,7 +10,7 @@ compilers org.thingml - 0.6.0-SNAPSHOT + 0.6.0 ../pom.xml diff --git a/org.emftext.commons.antlr3_4_0/META-INF/MANIFEST.MF b/org.emftext.commons.antlr3_4_0/META-INF/MANIFEST.MF index 0540e7691..914fa3161 100644 --- a/org.emftext.commons.antlr3_4_0/META-INF/MANIFEST.MF +++ b/org.emftext.commons.antlr3_4_0/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ANTLR 3.3.0 Runtime Classes Bundle-SymbolicName: org.emftext.commons.antlr3_4_0;singleton:=true -Bundle-Version: 0.6.0.qualifier +Bundle-Version: 0.6.0 Bundle-Vendor: SINTEF Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/org.emftext.commons.antlr3_4_0/pom.xml b/org.emftext.commons.antlr3_4_0/pom.xml index 9a3c534f1..7044e657a 100644 --- a/org.emftext.commons.antlr3_4_0/pom.xml +++ b/org.emftext.commons.antlr3_4_0/pom.xml @@ -11,7 +11,7 @@ org.thingml.root org.thingml - 0.6.0-SNAPSHOT + 0.6.0 ../pom.xml diff --git a/org.thingml.eclipse.feature/feature.xml b/org.thingml.eclipse.feature/feature.xml index 09fd10e43..eba182c0c 100644 --- a/org.thingml.eclipse.feature/feature.xml +++ b/org.thingml.eclipse.feature/feature.xml @@ -19,7 +19,7 @@ diff --git a/org.thingml.eclipse.feature/pom_eclipse.xml b/org.thingml.eclipse.feature/pom_eclipse.xml index 10fb01303..b3250e12f 100644 --- a/org.thingml.eclipse.feature/pom_eclipse.xml +++ b/org.thingml.eclipse.feature/pom_eclipse.xml @@ -23,7 +23,7 @@ ../org.thingml.eclipse/pom_eclipse.xml org.thingml eclipse_parent - 0.6.0-SNAPSHOT + 0.6.0 org.thingml.eclipse.feature diff --git a/org.thingml.eclipse.ui/.classpath b/org.thingml.eclipse.ui/.classpath index 07869ec74..4ce06e7c4 100644 --- a/org.thingml.eclipse.ui/.classpath +++ b/org.thingml.eclipse.ui/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.thingml.eclipse.ui/META-INF/MANIFEST.MF b/org.thingml.eclipse.ui/META-INF/MANIFEST.MF index bbeecb6af..a0d660841 100644 --- a/org.thingml.eclipse.ui/META-INF/MANIFEST.MF +++ b/org.thingml.eclipse.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ThingML :: EclipseUI Bundle-SymbolicName: org.thingml.eclipse.ui;singleton:=true -Bundle-Version: 0.6.0.qualifier +Bundle-Version: 0.6.0 Bundle-Activator: org.thingml.eclipse.ui.Activator Bundle-Vendor: SINTEF Require-Bundle: org.eclipse.ui, @@ -15,4 +15,4 @@ Require-Bundle: org.eclipse.ui, Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Bundle-ActivationPolicy: lazy Bundle-ClassPath: ., - lib/org.thingml.editor.standaloneApp-0.6.0-SNAPSHOT-jar-with-dependencies.jar + lib/org.thingml.editor.standaloneApp-0.6.0-jar-with-dependencies.jar diff --git a/org.thingml.eclipse.ui/build.properties b/org.thingml.eclipse.ui/build.properties index 1e9341bd2..76082d845 100644 --- a/org.thingml.eclipse.ui/build.properties +++ b/org.thingml.eclipse.ui/build.properties @@ -19,6 +19,6 @@ output.. = bin/ bin.includes = plugin.xml,\ META-INF/,\ .,\ - lib/org.thingml.editor.standaloneApp-0.6.0-SNAPSHOT-jar-with-dependencies.jar,\ - icons/ + icons/,\ + lib/ bin.excludes = icons/sample.gif diff --git a/org.thingml.eclipse.ui/lib/org.thingml.editor.standaloneApp-0.6.0-SNAPSHOT-jar-with-dependencies.jar b/org.thingml.eclipse.ui/lib/org.thingml.editor.standaloneApp-0.6.0-jar-with-dependencies.jar similarity index 94% rename from org.thingml.eclipse.ui/lib/org.thingml.editor.standaloneApp-0.6.0-SNAPSHOT-jar-with-dependencies.jar rename to org.thingml.eclipse.ui/lib/org.thingml.editor.standaloneApp-0.6.0-jar-with-dependencies.jar index 3b78ed35e..599444417 100644 Binary files a/org.thingml.eclipse.ui/lib/org.thingml.editor.standaloneApp-0.6.0-SNAPSHOT-jar-with-dependencies.jar and b/org.thingml.eclipse.ui/lib/org.thingml.editor.standaloneApp-0.6.0-jar-with-dependencies.jar differ diff --git a/org.thingml.eclipse.ui/lib/org.thingml.editor.standaloneApp-0.6.0.jar b/org.thingml.eclipse.ui/lib/org.thingml.editor.standaloneApp-0.6.0.jar new file mode 100644 index 000000000..fce37f65a Binary files /dev/null and b/org.thingml.eclipse.ui/lib/org.thingml.editor.standaloneApp-0.6.0.jar differ diff --git a/org.thingml.eclipse.ui/pom_eclipse.xml b/org.thingml.eclipse.ui/pom_eclipse.xml index f25f78ae9..21a83404b 100644 --- a/org.thingml.eclipse.ui/pom_eclipse.xml +++ b/org.thingml.eclipse.ui/pom_eclipse.xml @@ -31,7 +31,7 @@ ../org.thingml.eclipse/pom_eclipse.xml org.thingml eclipse_parent - 0.6.0-SNAPSHOT + 0.6.0 org.thingml.eclipse.ui diff --git a/org.thingml.eclipse.updatesite/artifacts.jar b/org.thingml.eclipse.updatesite/artifacts.jar deleted file mode 100644 index 077da619d..000000000 Binary files a/org.thingml.eclipse.updatesite/artifacts.jar and /dev/null differ diff --git a/org.thingml.eclipse.updatesite/category.xml b/org.thingml.eclipse.updatesite/category.xml index 626f2ed09..83d8e4eee 100644 --- a/org.thingml.eclipse.updatesite/category.xml +++ b/org.thingml.eclipse.updatesite/category.xml @@ -1,24 +1,6 @@ - - - + - + \ No newline at end of file diff --git a/org.thingml.eclipse.updatesite/content.jar b/org.thingml.eclipse.updatesite/content.jar deleted file mode 100644 index 2016b410a..000000000 Binary files a/org.thingml.eclipse.updatesite/content.jar and /dev/null differ diff --git a/org.thingml.eclipse.updatesite/features/org.thingml.eclipse.feature_0.6.0.201208020847.jar b/org.thingml.eclipse.updatesite/features/org.thingml.eclipse.feature_0.6.0.201208020847.jar deleted file mode 100644 index 0a7d49b8c..000000000 Binary files a/org.thingml.eclipse.updatesite/features/org.thingml.eclipse.feature_0.6.0.201208020847.jar and /dev/null differ diff --git a/org.thingml.eclipse.updatesite/plugins/org.sintef.thingml.model_0.6.0.201208020847.jar b/org.thingml.eclipse.updatesite/plugins/org.sintef.thingml.model_0.6.0.201208020847.jar deleted file mode 100644 index 01e1b88f8..000000000 Binary files a/org.thingml.eclipse.updatesite/plugins/org.sintef.thingml.model_0.6.0.201208020847.jar and /dev/null differ diff --git a/org.thingml.eclipse.updatesite/plugins/org.sintef.thingml.resource.thingml.ui_0.6.0.201208020847.jar b/org.thingml.eclipse.updatesite/plugins/org.sintef.thingml.resource.thingml.ui_0.6.0.201208020847.jar deleted file mode 100644 index 34a19037c..000000000 Binary files a/org.thingml.eclipse.updatesite/plugins/org.sintef.thingml.resource.thingml.ui_0.6.0.201208020847.jar and /dev/null differ diff --git a/org.thingml.eclipse.updatesite/plugins/org.sintef.thingml.resource.thingml_0.6.0.201208020847.jar b/org.thingml.eclipse.updatesite/plugins/org.sintef.thingml.resource.thingml_0.6.0.201208020847.jar deleted file mode 100644 index c8b740d46..000000000 Binary files a/org.thingml.eclipse.updatesite/plugins/org.sintef.thingml.resource.thingml_0.6.0.201208020847.jar and /dev/null differ diff --git a/org.thingml.eclipse.updatesite/pom_eclipse.xml b/org.thingml.eclipse.updatesite/pom_eclipse.xml index bd73b7cef..70bcc54d6 100644 --- a/org.thingml.eclipse.updatesite/pom_eclipse.xml +++ b/org.thingml.eclipse.updatesite/pom_eclipse.xml @@ -31,7 +31,7 @@ ../org.thingml.eclipse/pom_eclipse.xml org.thingml eclipse_parent - 0.6.0-SNAPSHOT + 0.6.0 org.thingml.eclipse.updatesite diff --git a/org.thingml.eclipse.updatesite/site.xml b/org.thingml.eclipse.updatesite/site.xml index fa425f44d..d530016d4 100644 --- a/org.thingml.eclipse.updatesite/site.xml +++ b/org.thingml.eclipse.updatesite/site.xml @@ -1,23 +1,8 @@ - - + + + diff --git a/org.thingml.eclipse/pom_eclipse.xml b/org.thingml.eclipse/pom_eclipse.xml index 553e98167..852132c42 100644 --- a/org.thingml.eclipse/pom_eclipse.xml +++ b/org.thingml.eclipse/pom_eclipse.xml @@ -20,7 +20,7 @@ 4.0.0 org.thingml eclipse_parent - 0.6.0-SNAPSHOT + 0.6.0 pom ../org.thingml.model/pom_eclipse.xml @@ -33,7 +33,7 @@ - 0.23.1 + 0.24.0 @@ -46,7 +46,7 @@ emftext p2 - http://www.emftext.org/update + http://update.emftext.org/release diff --git a/org.thingml.editor.eclipse/META-INF/MANIFEST.MF b/org.thingml.editor.eclipse/META-INF/MANIFEST.MF index 62135df1e..7f51598ba 100644 --- a/org.thingml.editor.eclipse/META-INF/MANIFEST.MF +++ b/org.thingml.editor.eclipse/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: EMFText UI Plugin: thingml Bundle-SymbolicName: org.sintef.thingml.resource.thingml.ui;singleton:=true -Bundle-Version: 0.6.0.qualifier +Bundle-Version: 0.6.0 Bundle-Vendor: SINTEF Require-Bundle: org.eclipse.core.resources, org.emftext.access;resolution:=optional, diff --git a/org.thingml.editor.eclipse/pom.xml b/org.thingml.editor.eclipse/pom.xml index c13187109..537494045 100644 --- a/org.thingml.editor.eclipse/pom.xml +++ b/org.thingml.editor.eclipse/pom.xml @@ -10,7 +10,7 @@ org.thingml.root org.thingml - 0.6.0-SNAPSHOT + 0.6.0 ../pom.xml diff --git a/org.thingml.editor.eclipse/pom_eclipse.xml b/org.thingml.editor.eclipse/pom_eclipse.xml index 579d6839b..1e046e8ed 100644 --- a/org.thingml.editor.eclipse/pom_eclipse.xml +++ b/org.thingml.editor.eclipse/pom_eclipse.xml @@ -23,7 +23,7 @@ ../org.thingml.eclipse/pom_eclipse.xml org.thingml eclipse_parent - 0.6.0-SNAPSHOT + 0.6.0 org.sintef.thingml.resource.thingml.ui diff --git a/org.thingml.editor.standalone/pom.xml b/org.thingml.editor.standalone/pom.xml index 236ab55c5..9475fc324 100644 --- a/org.thingml.editor.standalone/pom.xml +++ b/org.thingml.editor.standalone/pom.xml @@ -9,7 +9,7 @@ org.thingml org.thingml.root - 0.6.0-SNAPSHOT + 0.6.0 ../pom.xml diff --git a/org.thingml.editor.standaloneApp/pom.xml b/org.thingml.editor.standaloneApp/pom.xml index 2d91b716b..b16732337 100644 --- a/org.thingml.editor.standaloneApp/pom.xml +++ b/org.thingml.editor.standaloneApp/pom.xml @@ -9,7 +9,7 @@ org.thingml org.thingml.root - 0.6.0-SNAPSHOT + 0.6.0 ../pom.xml diff --git a/org.thingml.editor.standaloneApp/pom_eclipse.xml b/org.thingml.editor.standaloneApp/pom_eclipse.xml index f6f42fe4f..a97fe2ba9 100644 --- a/org.thingml.editor.standaloneApp/pom_eclipse.xml +++ b/org.thingml.editor.standaloneApp/pom_eclipse.xml @@ -26,7 +26,7 @@ org.thingml org.thingml.root - 0.6.0-SNAPSHOT + 0.6.0 ../pom.xml diff --git a/org.thingml.model/META-INF/MANIFEST.MF b/org.thingml.model/META-INF/MANIFEST.MF index a020b214e..65fdb4562 100644 --- a/org.thingml.model/META-INF/MANIFEST.MF +++ b/org.thingml.model/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ThingML :: Model Bundle-SymbolicName: org.sintef.thingml.model;singleton:=true -Bundle-Version: 0.6.0.qualifier +Bundle-Version: 0.6.0 Bundle-ClassPath: . Bundle-Vendor: SINTEF Bundle-Localization: plugin diff --git a/org.thingml.model/pom.xml b/org.thingml.model/pom.xml index e0284af9a..5186d0109 100644 --- a/org.thingml.model/pom.xml +++ b/org.thingml.model/pom.xml @@ -8,7 +8,7 @@ org.thingml.root org.thingml - 0.6.0-SNAPSHOT + 0.6.0 ../pom.xml diff --git a/org.thingml.model/pom_eclipse.xml b/org.thingml.model/pom_eclipse.xml index 73b5b53ed..a56e7a2c8 100644 --- a/org.thingml.model/pom_eclipse.xml +++ b/org.thingml.model/pom_eclipse.xml @@ -23,7 +23,7 @@ ../org.thingml.eclipse/pom_eclipse.xml org.thingml eclipse_parent - 0.6.0-SNAPSHOT + 0.6.0 org.sintef.thingml.model diff --git a/org.thingml.parser/META-INF/MANIFEST.MF b/org.thingml.parser/META-INF/MANIFEST.MF index 17f3c3bb6..2b77eb339 100644 --- a/org.thingml.parser/META-INF/MANIFEST.MF +++ b/org.thingml.parser/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: EMFText Parser Plugin: thingml Bundle-SymbolicName: org.sintef.thingml.resource.thingml;singleton:=true -Bundle-Version: 0.6.0.qualifier +Bundle-Version: 0.6.0 Bundle-Vendor: SINTEF Require-Bundle: org.eclipse.core.runtime;resolution:=optional, org.eclipse.emf.ecore, diff --git a/org.thingml.parser/pom.xml b/org.thingml.parser/pom.xml index 20c88f7bf..331a115d6 100644 --- a/org.thingml.parser/pom.xml +++ b/org.thingml.parser/pom.xml @@ -9,7 +9,7 @@ org.thingml org.thingml.root - 0.6.0-SNAPSHOT + 0.6.0 ../pom.xml diff --git a/org.thingml.parser/pom_eclipse.xml b/org.thingml.parser/pom_eclipse.xml index aba537e9a..03f8efa18 100644 --- a/org.thingml.parser/pom_eclipse.xml +++ b/org.thingml.parser/pom_eclipse.xml @@ -23,7 +23,7 @@ ../org.thingml.eclipse/pom_eclipse.xml org.thingml eclipse_parent - 0.6.0-SNAPSHOT + 0.6.0 org.sintef.thingml.resource.thingml diff --git a/org.thingml.parser/version_eclipse/pom.xml b/org.thingml.parser/version_eclipse/pom.xml index 9fc23dab5..56702e975 100644 --- a/org.thingml.parser/version_eclipse/pom.xml +++ b/org.thingml.parser/version_eclipse/pom.xml @@ -10,7 +10,7 @@ org.thingml org.thingml.parser - 0.6.0-SNAPSHOT + 0.6.0 diff --git a/org.thingml.parser/version_standalone/pom.xml b/org.thingml.parser/version_standalone/pom.xml index 02beb19c7..8c49fc991 100644 --- a/org.thingml.parser/version_standalone/pom.xml +++ b/org.thingml.parser/version_standalone/pom.xml @@ -9,7 +9,7 @@ org.thingml org.thingml.parser - 0.6.0-SNAPSHOT + 0.6.0 ../pom.xml diff --git a/pom.xml b/pom.xml index 9c636756c..9681b416f 100644 --- a/pom.xml +++ b/pom.xml @@ -7,14 +7,13 @@ ThingML :: Root http://www.thingml.org - 0.6.0-SNAPSHOT + 0.6.0 UTF-8 ${project.version} 3.8.0 2.7.0 - 2.11.2 SINTEF @@ -196,16 +195,6 @@ http://maven.thingml.org/thirdparty/ - - kevoree-libs-release-local - http://maven2.kevoree.org/release - - - - kevoree-snapshots - http://maven2.kevoree.org/snapshots - - diff --git a/testJar/pom.xml b/testJar/pom.xml index 52dfc5295..442dbaf8a 100644 --- a/testJar/pom.xml +++ b/testJar/pom.xml @@ -11,7 +11,7 @@ org.thingml org.thingml.root - 0.6.0-SNAPSHOT + 0.6.0 ../pom.xml @@ -23,7 +23,7 @@ org.thingml - org.thingml.compilers + compilers.registry ${project.version} diff --git a/update_plugins.bat b/update_plugins.bat index a2084bf3d..2eaa45624 100644 --- a/update_plugins.bat +++ b/update_plugins.bat @@ -1,4 +1,4 @@ mvn clean install cd org.thingml.editor.standaloneApp mvn -f pom_eclipse.xml clean install -cp target/org.thingml.editor.standaloneApp-0.6.0-SNAPSHOT-jar-with-dependencies.jar ../org.thingml.eclipse.ui/lib/ \ No newline at end of file +cp target/org.thingml.editor.standaloneApp-0.6.0-jar-with-dependencies.jar ../org.thingml.eclipse.ui/lib/ \ No newline at end of file