From 55453c931129560c1f8bb02f20a1f85a6b5a0400 Mon Sep 17 00:00:00 2001 From: Alexey Andreev Date: Thu, 16 Feb 2017 21:37:42 +0300 Subject: [PATCH] Set version to 0.5.0-SNAPSHOT. Add configuration to deploy to bintray. Update version number during Travis build. --- .travis.yml | 8 ++++++ classlib/pom.xml | 2 +- core/pom.xml | 2 +- extras-slf4j/pom.xml | 2 +- html4j/pom.xml | 2 +- interop/core/pom.xml | 2 +- jso/apis/pom.xml | 2 +- jso/core/pom.xml | 2 +- jso/impl/pom.xml | 2 +- metaprogramming/api/pom.xml | 2 +- metaprogramming/impl/pom.xml | 2 +- platform/pom.xml | 2 +- pom.xml | 13 ++++++++- samples/async/pom.xml | 2 +- samples/benchmark/pom.xml | 2 +- samples/hello/pom.xml | 2 +- samples/kotlin/pom.xml | 2 +- samples/pom.xml | 2 +- samples/scala/pom.xml | 2 +- samples/storage/pom.xml | 2 +- samples/video/pom.xml | 2 +- tests/pom.xml | 2 +- tools/chrome-rdp/pom.xml | 2 +- tools/cli/pom.xml | 2 +- tools/core/pom.xml | 2 +- .../eclipse/core-plugin/META-INF/MANIFEST.MF | 8 +++--- tools/eclipse/core-plugin/build.properties | 6 ++-- tools/eclipse/core-plugin/dep-pom.xml | 2 +- tools/eclipse/core-plugin/pom.xml | 2 +- tools/eclipse/feature/feature.xml | 6 ++-- tools/eclipse/feature/pom.xml | 2 +- tools/eclipse/m2e-feature/feature.xml | 2 +- tools/eclipse/m2e-feature/pom.xml | 2 +- tools/eclipse/m2e-plugin/META-INF/MANIFEST.MF | 2 +- tools/eclipse/m2e-plugin/pom.xml | 2 +- tools/eclipse/plugin/META-INF/MANIFEST.MF | 2 +- tools/eclipse/plugin/pom.xml | 2 +- tools/eclipse/pom.xml | 2 +- tools/eclipse/updatesite/pom.xml | 2 +- tools/idea/jps-common/pom.xml | 2 +- tools/junit/pom.xml | 2 +- tools/maven/plugin/pom.xml | 2 +- tools/maven/pom.xml | 2 +- tools/maven/webapp/pom.xml | 2 +- travis-settings.xml | 28 +++++++++++++++++++ 45 files changed, 97 insertions(+), 50 deletions(-) create mode 100644 travis-settings.xml diff --git a/.travis.yml b/.travis.yml index 1de572b60..307ea2c49 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,10 @@ branches: - /^release-.+$/ env: - MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=256m" +before_install: + - OLD_VERSION=`mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version` + - NEW_VERSION=${OLD_VERSION%-SNAPSHOT}-build-$TRAVIS_BUILD_NUMBER + - mvn versions:set -DnewVersion=$NEW_VERSION script: > mvn -e test \ -Dteavm.junit.target=target/js-tests \ @@ -17,5 +21,9 @@ script: > -Dteavm.junit.js.threads=1 \ -Dteavm.junit.optimized=true \ -Dteavm.junit.minified=true +after_success: > + if [ "${TRAVIS_PULL_REQUEST:-false}" != "false" ]; then + mvn deploy --settings travis-settings.xml -P deploy-to-bintray + fi after_script: - rm -rf $HOME/.m2/repository/org/teavm \ No newline at end of file diff --git a/classlib/pom.xml b/classlib/pom.xml index 07c593131..4fc9f815c 100644 --- a/classlib/pom.xml +++ b/classlib/pom.xml @@ -20,7 +20,7 @@ org.teavm teavm - 1.0.0-SNAPSHOT + 0.5.0-SNAPSHOT teavm-classlib diff --git a/core/pom.xml b/core/pom.xml index c238f589e..3b3a15f4f 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -20,7 +20,7 @@ org.teavm teavm - 1.0.0-SNAPSHOT + 0.5.0-SNAPSHOT teavm-core diff --git a/extras-slf4j/pom.xml b/extras-slf4j/pom.xml index 5691d1594..a6889b47f 100644 --- a/extras-slf4j/pom.xml +++ b/extras-slf4j/pom.xml @@ -20,7 +20,7 @@ org.teavm teavm - 1.0.0-SNAPSHOT + 0.5.0-SNAPSHOT teavm-extras-slf4j diff --git a/html4j/pom.xml b/html4j/pom.xml index 1ff7d9579..50dee2bfc 100644 --- a/html4j/pom.xml +++ b/html4j/pom.xml @@ -19,7 +19,7 @@ org.teavm teavm - 1.0.0-SNAPSHOT + 0.5.0-SNAPSHOT teavm-html4j diff --git a/interop/core/pom.xml b/interop/core/pom.xml index dbcdcfbc6..6dbaf3f8e 100644 --- a/interop/core/pom.xml +++ b/interop/core/pom.xml @@ -23,7 +23,7 @@ org.teavm teavm - 1.0.0-SNAPSHOT + 0.5.0-SNAPSHOT ../.. teavm-interop diff --git a/jso/apis/pom.xml b/jso/apis/pom.xml index ad807c4ed..1f8107810 100644 --- a/jso/apis/pom.xml +++ b/jso/apis/pom.xml @@ -20,7 +20,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs org.teavm teavm - 1.0.0-SNAPSHOT + 0.5.0-SNAPSHOT ../.. teavm-jso-apis diff --git a/jso/core/pom.xml b/jso/core/pom.xml index 24d9e5008..b132c201f 100644 --- a/jso/core/pom.xml +++ b/jso/core/pom.xml @@ -20,7 +20,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs org.teavm teavm - 1.0.0-SNAPSHOT + 0.5.0-SNAPSHOT ../.. teavm-jso diff --git a/jso/impl/pom.xml b/jso/impl/pom.xml index e125f9f95..a9ffa2800 100644 --- a/jso/impl/pom.xml +++ b/jso/impl/pom.xml @@ -20,7 +20,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs org.teavm teavm - 1.0.0-SNAPSHOT + 0.5.0-SNAPSHOT ../.. teavm-jso-impl diff --git a/metaprogramming/api/pom.xml b/metaprogramming/api/pom.xml index a001bd06e..29a485d04 100644 --- a/metaprogramming/api/pom.xml +++ b/metaprogramming/api/pom.xml @@ -23,7 +23,7 @@ org.teavm teavm - 1.0.0-SNAPSHOT + 0.5.0-SNAPSHOT ../.. teavm-metaprogramming-api diff --git a/metaprogramming/impl/pom.xml b/metaprogramming/impl/pom.xml index 606cdb9e7..a3d81e259 100644 --- a/metaprogramming/impl/pom.xml +++ b/metaprogramming/impl/pom.xml @@ -21,7 +21,7 @@ teavm org.teavm - 1.0.0-SNAPSHOT + 0.5.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/platform/pom.xml b/platform/pom.xml index 0de71dc3e..aa8837413 100644 --- a/platform/pom.xml +++ b/platform/pom.xml @@ -20,7 +20,7 @@ org.teavm teavm - 1.0.0-SNAPSHOT + 0.5.0-SNAPSHOT teavm-platform diff --git a/pom.xml b/pom.xml index 43fd9719a..2a3b3e54f 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ org.teavm teavm - 1.0.0-SNAPSHOT + 0.5.0-SNAPSHOT pom TeaVM @@ -319,5 +319,16 @@ + + + deploy-to-bintray + + + bintray-teavm + Bintray Preview Repository + https://api.bintray.com/maven/konsoletyper/teavm-preview/teavm/;publish=1 + + + diff --git a/samples/async/pom.xml b/samples/async/pom.xml index 448846aa3..814a17d70 100644 --- a/samples/async/pom.xml +++ b/samples/async/pom.xml @@ -19,7 +19,7 @@ org.teavm teavm-samples - 1.0.0-SNAPSHOT + 0.5.0-SNAPSHOT teavm-samples-async diff --git a/samples/benchmark/pom.xml b/samples/benchmark/pom.xml index c6d0cc3a2..b28f6667c 100644 --- a/samples/benchmark/pom.xml +++ b/samples/benchmark/pom.xml @@ -20,7 +20,7 @@ org.teavm teavm-samples - 1.0.0-SNAPSHOT + 0.5.0-SNAPSHOT teavm-samples-benchmark war diff --git a/samples/hello/pom.xml b/samples/hello/pom.xml index fc90e3a70..97384af28 100644 --- a/samples/hello/pom.xml +++ b/samples/hello/pom.xml @@ -20,7 +20,7 @@ org.teavm teavm-samples - 1.0.0-SNAPSHOT + 0.5.0-SNAPSHOT teavm-samples-hello diff --git a/samples/kotlin/pom.xml b/samples/kotlin/pom.xml index 4aac3bffa..4ea584068 100644 --- a/samples/kotlin/pom.xml +++ b/samples/kotlin/pom.xml @@ -20,7 +20,7 @@ org.teavm teavm-samples - 1.0.0-SNAPSHOT + 0.5.0-SNAPSHOT teavm-samples-kotlin diff --git a/samples/pom.xml b/samples/pom.xml index 8e21f2b67..01f830f20 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -20,7 +20,7 @@ org.teavm teavm - 1.0.0-SNAPSHOT + 0.5.0-SNAPSHOT teavm-samples diff --git a/samples/scala/pom.xml b/samples/scala/pom.xml index b3db29c55..075735493 100644 --- a/samples/scala/pom.xml +++ b/samples/scala/pom.xml @@ -4,7 +4,7 @@ org.teavm teavm-samples - 1.0.0-SNAPSHOT + 0.5.0-SNAPSHOT war diff --git a/samples/storage/pom.xml b/samples/storage/pom.xml index 8e02c7704..fa130914b 100644 --- a/samples/storage/pom.xml +++ b/samples/storage/pom.xml @@ -20,7 +20,7 @@ org.teavm teavm-samples - 1.0.0-SNAPSHOT + 0.5.0-SNAPSHOT teavm-samples-storage diff --git a/samples/video/pom.xml b/samples/video/pom.xml index d50248df8..641cdc5cc 100644 --- a/samples/video/pom.xml +++ b/samples/video/pom.xml @@ -20,7 +20,7 @@ org.teavm teavm-samples - 1.0.0-SNAPSHOT + 0.5.0-SNAPSHOT teavm-samples-video diff --git a/tests/pom.xml b/tests/pom.xml index e1030c042..b381c339a 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -20,7 +20,7 @@ org.teavm teavm - 1.0.0-SNAPSHOT + 0.5.0-SNAPSHOT teavm-tests diff --git a/tools/chrome-rdp/pom.xml b/tools/chrome-rdp/pom.xml index d54683a54..92fc8ae80 100644 --- a/tools/chrome-rdp/pom.xml +++ b/tools/chrome-rdp/pom.xml @@ -20,7 +20,7 @@ org.teavm teavm - 1.0.0-SNAPSHOT + 0.5.0-SNAPSHOT ../.. teavm-chrome-rdp diff --git a/tools/cli/pom.xml b/tools/cli/pom.xml index dbc3924f7..c03b4ed0e 100644 --- a/tools/cli/pom.xml +++ b/tools/cli/pom.xml @@ -20,7 +20,7 @@ org.teavm teavm - 1.0.0-SNAPSHOT + 0.5.0-SNAPSHOT ../.. teavm-cli diff --git a/tools/core/pom.xml b/tools/core/pom.xml index 2b7a43911..fd241dff5 100644 --- a/tools/core/pom.xml +++ b/tools/core/pom.xml @@ -20,7 +20,7 @@ org.teavm teavm - 1.0.0-SNAPSHOT + 0.5.0-SNAPSHOT ../.. teavm-tooling diff --git a/tools/eclipse/core-plugin/META-INF/MANIFEST.MF b/tools/eclipse/core-plugin/META-INF/MANIFEST.MF index dae8f0af7..a73ad7e5c 100644 --- a/tools/eclipse/core-plugin/META-INF/MANIFEST.MF +++ b/tools/eclipse/core-plugin/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: TeaVM plugin for Eclipse Bundle-SymbolicName: teavm-eclipse-core-plugin;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 0.5.0.qualifier Bundle-Vendor: Alexey Andreev Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Bundle-ClassPath: ., @@ -37,9 +37,9 @@ Bundle-ClassPath: ., lib/org.apache.aries.spifly.weaver-internal-1.0.1.jar, lib/org.apache.aries.util-1.0.0.jar, lib/slf4j-api-1.7.7.jar, - lib/teavm-chrome-rdp-1.0.0-SNAPSHOT.jar, - lib/teavm-core-1.0.0-SNAPSHOT.jar, - lib/teavm-tooling-1.0.0-SNAPSHOT.jar, + lib/teavm-chrome-rdp-0.5.0-SNAPSHOT.jar, + lib/teavm-core-0.5.0-SNAPSHOT.jar, + lib/teavm-tooling-0.5.0-SNAPSHOT.jar, lib/websocket-api-9.2.1.v20140609.jar, lib/websocket-client-9.2.1.v20140609.jar, lib/websocket-common-9.2.1.v20140609.jar, diff --git a/tools/eclipse/core-plugin/build.properties b/tools/eclipse/core-plugin/build.properties index 6ba7b3689..32ec7ac47 100644 --- a/tools/eclipse/core-plugin/build.properties +++ b/tools/eclipse/core-plugin/build.properties @@ -34,9 +34,9 @@ bin.includes = META-INF/,\ lib/org.apache.aries.spifly.weaver-internal-1.0.1.jar,\ lib/org.apache.aries.util-1.0.0.jar,\ lib/slf4j-api-1.7.7.jar,\ - lib/teavm-chrome-rdp-1.0.0-SNAPSHOT.jar,\ - lib/teavm-core-1.0.0-SNAPSHOT.jar,\ - lib/teavm-tooling-1.0.0-SNAPSHOT.jar,\ + lib/teavm-chrome-rdp-0.5.0-SNAPSHOT.jar,\ + lib/teavm-core-0.5.0-SNAPSHOT.jar,\ + lib/teavm-tooling-0.5.0-SNAPSHOT.jar,\ lib/websocket-api-9.2.1.v20140609.jar,\ lib/websocket-client-9.2.1.v20140609.jar,\ lib/websocket-common-9.2.1.v20140609.jar,\ diff --git a/tools/eclipse/core-plugin/dep-pom.xml b/tools/eclipse/core-plugin/dep-pom.xml index 541094bed..0df1ebe48 100644 --- a/tools/eclipse/core-plugin/dep-pom.xml +++ b/tools/eclipse/core-plugin/dep-pom.xml @@ -19,7 +19,7 @@ org.teavm teavm-eclipse-core-deps - 1.0.0-SNAPSHOT + 0.5.0-SNAPSHOT pom TeaVM dependencies for Eclipse plugin diff --git a/tools/eclipse/core-plugin/pom.xml b/tools/eclipse/core-plugin/pom.xml index 5dcc9ec9e..708b53ab7 100644 --- a/tools/eclipse/core-plugin/pom.xml +++ b/tools/eclipse/core-plugin/pom.xml @@ -20,7 +20,7 @@ org.teavm teavm-eclipse - 1.0.0-SNAPSHOT + 0.5.0-SNAPSHOT teavm-eclipse-core-plugin eclipse-plugin diff --git a/tools/eclipse/feature/feature.xml b/tools/eclipse/feature/feature.xml index 225e398a9..16a76a49f 100644 --- a/tools/eclipse/feature/feature.xml +++ b/tools/eclipse/feature/feature.xml @@ -2,7 +2,7 @@ @@ -233,14 +233,14 @@ id="teavm-eclipse-plugin" download-size="0" install-size="0" - version="1.0.0.qualifier" + version="0.5.0.qualifier" unpack="false"/> diff --git a/tools/eclipse/feature/pom.xml b/tools/eclipse/feature/pom.xml index 6f11e0674..15e6ca325 100644 --- a/tools/eclipse/feature/pom.xml +++ b/tools/eclipse/feature/pom.xml @@ -21,7 +21,7 @@ org.teavm teavm-eclipse - 1.0.0-SNAPSHOT + 0.5.0-SNAPSHOT teavm-eclipse-feature diff --git a/tools/eclipse/m2e-feature/feature.xml b/tools/eclipse/m2e-feature/feature.xml index 054cff3e2..1488451ae 100644 --- a/tools/eclipse/m2e-feature/feature.xml +++ b/tools/eclipse/m2e-feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/tools/eclipse/m2e-feature/pom.xml b/tools/eclipse/m2e-feature/pom.xml index 7e4a85c44..34b43dddb 100644 --- a/tools/eclipse/m2e-feature/pom.xml +++ b/tools/eclipse/m2e-feature/pom.xml @@ -21,7 +21,7 @@ org.teavm teavm-eclipse - 1.0.0-SNAPSHOT + 0.5.0-SNAPSHOT teavm-eclipse-m2e-feature diff --git a/tools/eclipse/m2e-plugin/META-INF/MANIFEST.MF b/tools/eclipse/m2e-plugin/META-INF/MANIFEST.MF index 3746f0b8d..07dde2774 100644 --- a/tools/eclipse/m2e-plugin/META-INF/MANIFEST.MF +++ b/tools/eclipse/m2e-plugin/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: TeaVM plugin for m2e Bundle-SymbolicName: teavm-eclipse-m2e-plugin;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 0.5.0.qualifier Bundle-Vendor: Alexey Andreev Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: teavm-eclipse-plugin;bundle-version="0.0.0", diff --git a/tools/eclipse/m2e-plugin/pom.xml b/tools/eclipse/m2e-plugin/pom.xml index 60ea4f08e..054672054 100644 --- a/tools/eclipse/m2e-plugin/pom.xml +++ b/tools/eclipse/m2e-plugin/pom.xml @@ -21,7 +21,7 @@ org.teavm teavm-eclipse - 1.0.0-SNAPSHOT + 0.5.0-SNAPSHOT teavm-eclipse-m2e-plugin diff --git a/tools/eclipse/plugin/META-INF/MANIFEST.MF b/tools/eclipse/plugin/META-INF/MANIFEST.MF index 0e6dbcbbe..990519175 100644 --- a/tools/eclipse/plugin/META-INF/MANIFEST.MF +++ b/tools/eclipse/plugin/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: TeaVM plugin for Eclipse Bundle-SymbolicName: teavm-eclipse-plugin;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 0.5.0.qualifier Bundle-Vendor: Alexey Andreev Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Activator: org.teavm.eclipse.TeaVMEclipsePlugin diff --git a/tools/eclipse/plugin/pom.xml b/tools/eclipse/plugin/pom.xml index fbc1511ac..d0de77c9e 100644 --- a/tools/eclipse/plugin/pom.xml +++ b/tools/eclipse/plugin/pom.xml @@ -21,7 +21,7 @@ org.teavm teavm-eclipse - 1.0.0-SNAPSHOT + 0.5.0-SNAPSHOT teavm-eclipse-plugin diff --git a/tools/eclipse/pom.xml b/tools/eclipse/pom.xml index ae34e7e49..87a47c220 100644 --- a/tools/eclipse/pom.xml +++ b/tools/eclipse/pom.xml @@ -20,7 +20,7 @@ org.teavm teavm-eclipse pom - 1.0.0-SNAPSHOT + 0.5.0-SNAPSHOT TeaVM Eclipse integration Aggregate project containing all plugins for integration TeaVM with Eclipse diff --git a/tools/eclipse/updatesite/pom.xml b/tools/eclipse/updatesite/pom.xml index 76a804820..040f3967c 100644 --- a/tools/eclipse/updatesite/pom.xml +++ b/tools/eclipse/updatesite/pom.xml @@ -21,7 +21,7 @@ org.teavm teavm-eclipse - 1.0.0-SNAPSHOT + 0.5.0-SNAPSHOT teavm-eclipse-updatesite diff --git a/tools/idea/jps-common/pom.xml b/tools/idea/jps-common/pom.xml index 4c578101c..50f43b681 100644 --- a/tools/idea/jps-common/pom.xml +++ b/tools/idea/jps-common/pom.xml @@ -21,7 +21,7 @@ org.teavm teavm - 1.0.0-SNAPSHOT + 0.5.0-SNAPSHOT ../../.. pom diff --git a/tools/junit/pom.xml b/tools/junit/pom.xml index 3fe0b0e0c..76e68887f 100644 --- a/tools/junit/pom.xml +++ b/tools/junit/pom.xml @@ -20,7 +20,7 @@ teavm org.teavm - 1.0.0-SNAPSHOT + 0.5.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/tools/maven/plugin/pom.xml b/tools/maven/plugin/pom.xml index 0fb943d79..1164947d9 100644 --- a/tools/maven/plugin/pom.xml +++ b/tools/maven/plugin/pom.xml @@ -20,7 +20,7 @@ org.teavm teavm-maven - 1.0.0-SNAPSHOT + 0.5.0-SNAPSHOT teavm-maven-plugin maven-plugin diff --git a/tools/maven/pom.xml b/tools/maven/pom.xml index e7fd6ae4e..36809080b 100644 --- a/tools/maven/pom.xml +++ b/tools/maven/pom.xml @@ -20,7 +20,7 @@ org.teavm teavm - 1.0.0-SNAPSHOT + 0.5.0-SNAPSHOT ../.. teavm-maven diff --git a/tools/maven/webapp/pom.xml b/tools/maven/webapp/pom.xml index 404096841..4c61e3893 100644 --- a/tools/maven/webapp/pom.xml +++ b/tools/maven/webapp/pom.xml @@ -5,7 +5,7 @@ org.teavm teavm-maven - 1.0.0-SNAPSHOT + 0.5.0-SNAPSHOT teavm-maven-webapp TeaVM maven web application archetype diff --git a/travis-settings.xml b/travis-settings.xml new file mode 100644 index 000000000..371f7c160 --- /dev/null +++ b/travis-settings.xml @@ -0,0 +1,28 @@ + + + + + + bintray-teavm + ${env.BINTRAY_LOGIN} + ${env.BINTRAY_API_KEY} + + +