diff --git a/pom.xml b/pom.xml index 787816b82..ff08bd0bf 100644 --- a/pom.xml +++ b/pom.xml @@ -311,11 +311,5 @@ teavm-samples - - enable-eclipse - - tools/eclipse - - diff --git a/set-version.sh b/set-version.sh index 8ec81a4c5..f0467ef05 100755 --- a/set-version.sh +++ b/set-version.sh @@ -2,7 +2,15 @@ mvn versions:set -DnewVersion=$1 -DgenerateBackupPoms=false pushd tools/eclipse -mvn tycho-versions:set-version -DnewVersion=$1 -cd core-plugin +mvn org.eclipse.tycho:tycho-versions-plugin:0.21.0:set-version -DnewVersion=$1 + +pushd core-plugin mvn -f dep-pom.xml versions:set -DnewVersion=$1 -DgenerateBackupPoms=false +sed -r -i -e "s/lib\/(teavm(-[a-z]+)+)-.+\.jar/\1-$1.jar/" build.properties +sed -r -i -e "s/lib\/(teavm(-[a-z]+)+)-.+\.jar/\1-$1.jar/" META-INF/MANIFEST.MF +popd + +pushd m2e-plugin +sed -r -i -e "s/.+<\/versionRange>/$1<\/versionRange>/" lifecycle-mapping-metadata.xml +popd popd \ No newline at end of file diff --git a/tools/eclipse/core-plugin/dep-pom.xml b/tools/eclipse/core-plugin/dep-pom.xml index 39bd7426e..7987d8052 100644 --- a/tools/eclipse/core-plugin/dep-pom.xml +++ b/tools/eclipse/core-plugin/dep-pom.xml @@ -17,17 +17,17 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - - org.teavm - teavm - 1.0.0-SNAPSHOT - ../.. - + org.teavm teavm-eclipse-core-deps + 1.0.0-SNAPSHOT pom TeaVM dependencies for Eclipse plugin + + 9.2.1.v20140609 + + javax.interceptor diff --git a/tools/eclipse/m2e-plugin/lifecycle-mapping-metadata.xml b/tools/eclipse/m2e-plugin/lifecycle-mapping-metadata.xml index d84bb97e2..592a7e3db 100644 --- a/tools/eclipse/m2e-plugin/lifecycle-mapping-metadata.xml +++ b/tools/eclipse/m2e-plugin/lifecycle-mapping-metadata.xml @@ -5,7 +5,7 @@ org.teavm teavm-maven-plugin - 1.0.0.qualifier + 0.0.0 compile diff --git a/tools/eclipse/pom.xml b/tools/eclipse/pom.xml index e191d3d28..ae34e7e49 100644 --- a/tools/eclipse/pom.xml +++ b/tools/eclipse/pom.xml @@ -17,14 +17,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - - org.teavm - teavm - 1.0.0-SNAPSHOT - ../.. - + org.teavm teavm-eclipse pom + 1.0.0-SNAPSHOT TeaVM Eclipse integration Aggregate project containing all plugins for integration TeaVM with Eclipse