From b8cf10b128679f018832589ed2e1f9ef14c2946e Mon Sep 17 00:00:00 2001 From: Poytr1 Date: Wed, 13 Feb 2019 22:40:45 +0800 Subject: [PATCH 1/2] Bundle OpenJDK 11 && Update kibana version --- .ci/Dockerfile | 2 +- .ci/script/docker/cleanup.sh | 2 - .ci/script/docker/deploy_package.sh | 25 +++++- org.elastic.jdt.ls.product/pom.xml | 83 ++++++++++++++++++- ...sembly.xml => publish-assembly-darwin.xml} | 13 +-- .../publish-assembly-linux.xml | 27 ++++++ .../publish-assembly-windows.xml | 27 ++++++ pom.xml | 23 ++--- 8 files changed, 175 insertions(+), 27 deletions(-) rename org.elastic.jdt.ls.product/{publish-assembly.xml => publish-assembly-darwin.xml} (65%) create mode 100644 org.elastic.jdt.ls.product/publish-assembly-linux.xml create mode 100644 org.elastic.jdt.ls.product/publish-assembly-windows.xml diff --git a/.ci/Dockerfile b/.ci/Dockerfile index a4c3f89c..2400f90e 100644 --- a/.ci/Dockerfile +++ b/.ci/Dockerfile @@ -1,4 +1,4 @@ -FROM node:10.14.1 +FROM node:10.15.1 ARG KIBANA_VERSION diff --git a/.ci/script/docker/cleanup.sh b/.ci/script/docker/cleanup.sh index 00307cdb..39d91ee3 100755 --- a/.ci/script/docker/cleanup.sh +++ b/.ci/script/docker/cleanup.sh @@ -5,7 +5,5 @@ docker rm -v $(docker ps -a -q) docker volume prune -f [ -e ./repository ] && rm -rf ./repository -[ -e ./build ] && rm -rf ./build -[ -e ./lib ] && rm -rf ./lib exit 0 \ No newline at end of file diff --git a/.ci/script/docker/deploy_package.sh b/.ci/script/docker/deploy_package.sh index dfbb5655..0a4e594f 100755 --- a/.ci/script/docker/deploy_package.sh +++ b/.ci/script/docker/deploy_package.sh @@ -3,7 +3,7 @@ set -e if [ $# -eq 0 ]; then echo "deploy snapshot package.." - KIBANA_VERSION=7.0.0 + KIBANA_VERSION=8.0.0 DESTINATION=snapshot/ CMD="./mvnw clean verify -B -e && \\" elif [ $# -eq 2 ]; then @@ -40,6 +40,23 @@ docker run \ /bin/bash -c "set -x && \ $CMD ./mvnw -DskipTests=true clean deploy -DaltDeploymentRepository=dev::default::file:./repository -B -e -Pserver-distro && \ - mv org.elastic.jdt.ls.product/distro/jdt-language-server* lib && \ - yarn kbn bootstrap && echo $KIBANA_VERSION | yarn build && \ - aws s3 cp build/java_languageserver-*.zip s3://download.elasticsearch.org/code/java-langserver/$DESTINATION" \ No newline at end of file + yarn kbn bootstrap && \ + mv org.elastic.jdt.ls.product/distro/jdt-language-server*linux* lib && \ + jq '.version=\"\\(.version)-linux\"' package.json > tmp && mv tmp package.json && \ + echo $KIBANA_VERSION | yarn build && \ + aws s3 cp build/java_languageserver-*.zip s3://download.elasticsearch.org/code/java-langserver/$DESTINATION && \ + [ -e ./build ] && rm -rf ./build && \ + [ -e ./lib ] && rm -rf ./lib && \ + mv org.elastic.jdt.ls.product/distro/jdt-language-server*darwin* lib && \ + jq '.version=\"\\(.version)-darwin\"' package.json > tmp && mv tmp package.json && \ + echo $KIBANA_VERSION | yarn build && \ + aws s3 cp build/java_languageserver-*.zip s3://download.elasticsearch.org/code/java-langserver/$DESTINATION && \ + [ -e ./build ] && rm -rf ./build && \ + [ -e ./lib ] && rm -rf ./lib && \ + mv org.elastic.jdt.ls.product/distro/jdt-language-server*windows* lib && \ + jq '.version=\"\\(.version)-windows\"' package.json > tmp && mv tmp package.json && \ + echo $KIBANA_VERSION | yarn build && \ + aws s3 cp build/java_languageserver-*.zip s3://download.elasticsearch.org/code/java-langserver/$DESTINATION && \ + [ -e ./build ] && rm -rf ./build && \ + [ -e ./lib ] && rm -rf ./lib" + \ No newline at end of file diff --git a/org.elastic.jdt.ls.product/pom.xml b/org.elastic.jdt.ls.product/pom.xml index 07274c92..c235d104 100644 --- a/org.elastic.jdt.ls.product/pom.xml +++ b/org.elastic.jdt.ls.product/pom.xml @@ -123,6 +123,49 @@ + + com.googlecode.maven-download-plugin + download-maven-plugin + 1.4.1 + + + install-openJDK-osx + package + + wget + + + https://download.java.net/java/GA/jdk11/9/GPL/openjdk-${jdkVersion}_osx-x64_bin.tar.gz + true + ${project.build.directory}/jdks/openjdk-${jdkVersion}_osx + + + + install-openJDK-linux + package + + wget + + + https://download.java.net/java/GA/jdk11/9/GPL/openjdk-${jdkVersion}_linux-x64_bin.tar.gz + true + ${project.build.directory}/jdks/openjdk-${jdkVersion}_linux + + + + install-openJDK-windows + package + + wget + + + https://download.java.net/java/GA/jdk11/9/GPL/openjdk-${jdkVersion}_windows-x64_bin.zip + true + ${project.build.directory}/jdks/openjdk-${jdkVersion}_windows + + + + @@ -187,7 +230,41 @@ 2.6 - pack-for-distribution + pack-for-distribution-linux + package + + single + + + distro + + jdt-language-server-${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}-linux-${timestamp} + false + posix + + publish-assembly-linux.xml + + + + + pack-for-distribution-darwin + package + + single + + + distro + + jdt-language-server-${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}-darwin-${timestamp} + false + posix + + publish-assembly-darwin.xml + + + + + pack-for-distribution-windows package single @@ -195,11 +272,11 @@ distro - jdt-language-server-${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}-${timestamp} + jdt-language-server-${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}-windows-${timestamp} false posix - publish-assembly.xml + publish-assembly-windows.xml diff --git a/org.elastic.jdt.ls.product/publish-assembly.xml b/org.elastic.jdt.ls.product/publish-assembly-darwin.xml similarity index 65% rename from org.elastic.jdt.ls.product/publish-assembly.xml rename to org.elastic.jdt.ls.product/publish-assembly-darwin.xml index a58ea722..8a5bf18d 100644 --- a/org.elastic.jdt.ls.product/publish-assembly.xml +++ b/org.elastic.jdt.ls.product/publish-assembly-darwin.xml @@ -8,14 +8,15 @@ false - ${basedir}/target/repository + ${basedir}/target / - config_linux/** - config_mac/** - config_win/** - features/** - plugins/** + repository/config_linux/** + repository/config_mac/** + repository/config_win/** + repository/features/** + repository/plugins/** + jdks/openjdk-*_osx/** **/*.pack.gz diff --git a/org.elastic.jdt.ls.product/publish-assembly-linux.xml b/org.elastic.jdt.ls.product/publish-assembly-linux.xml new file mode 100644 index 00000000..230cad2b --- /dev/null +++ b/org.elastic.jdt.ls.product/publish-assembly-linux.xml @@ -0,0 +1,27 @@ + + publish + + dir + + false + + + ${basedir}/target + / + + repository/config_linux/** + repository/config_mac/** + repository/config_win/** + repository/features/** + repository/plugins/** + jdks/openjdk-*_linux/** + + + **/*.pack.gz + + 755 + + + diff --git a/org.elastic.jdt.ls.product/publish-assembly-windows.xml b/org.elastic.jdt.ls.product/publish-assembly-windows.xml new file mode 100644 index 00000000..d660f8b9 --- /dev/null +++ b/org.elastic.jdt.ls.product/publish-assembly-windows.xml @@ -0,0 +1,27 @@ + + publish + + dir + + false + + + ${basedir}/target + / + + repository/config_linux/** + repository/config_mac/** + repository/config_win/** + repository/features/** + repository/plugins/** + jdks/openjdk-*_windows/** + + + **/*.pack.gz + + 755 + + + diff --git a/pom.xml b/pom.xml index 572872b8..f362d0ae 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ JDT Language Server UTF-8 - 1.2.0 + 1.3.0 ${tycho-version} scm:git:https://github.com/elastic/java-langserver.git reuseReports @@ -20,6 +20,7 @@ true true + 11.0.2 org.elastic.jdt.ls.target @@ -366,15 +367,15 @@ cbi-release https://repo.eclipse.org/content/repositories/cbi-releases/ + + sonatype-public-repository + https://oss.sonatype.org/content/groups/public + + true + + + true + + - From 23576b61c729e32c969fed51d686075f5b15af52 Mon Sep 17 00:00:00 2001 From: Poytr1 Date: Thu, 14 Feb 2019 12:17:42 +0800 Subject: [PATCH 2/2] Add configuation of jdkMajor and jdkBuild version & Fix release script --- .ci/script/docker/deploy_package.sh | 30 ++++++++++++----------------- org.elastic.jdt.ls.product/pom.xml | 6 +++--- pom.xml | 2 ++ 3 files changed, 17 insertions(+), 21 deletions(-) diff --git a/.ci/script/docker/deploy_package.sh b/.ci/script/docker/deploy_package.sh index 0a4e594f..d1d40c90 100755 --- a/.ci/script/docker/deploy_package.sh +++ b/.ci/script/docker/deploy_package.sh @@ -41,22 +41,16 @@ docker run \ $CMD ./mvnw -DskipTests=true clean deploy -DaltDeploymentRepository=dev::default::file:./repository -B -e -Pserver-distro && \ yarn kbn bootstrap && \ - mv org.elastic.jdt.ls.product/distro/jdt-language-server*linux* lib && \ - jq '.version=\"\\(.version)-linux\"' package.json > tmp && mv tmp package.json && \ - echo $KIBANA_VERSION | yarn build && \ - aws s3 cp build/java_languageserver-*.zip s3://download.elasticsearch.org/code/java-langserver/$DESTINATION && \ - [ -e ./build ] && rm -rf ./build && \ - [ -e ./lib ] && rm -rf ./lib && \ - mv org.elastic.jdt.ls.product/distro/jdt-language-server*darwin* lib && \ - jq '.version=\"\\(.version)-darwin\"' package.json > tmp && mv tmp package.json && \ - echo $KIBANA_VERSION | yarn build && \ - aws s3 cp build/java_languageserver-*.zip s3://download.elasticsearch.org/code/java-langserver/$DESTINATION && \ - [ -e ./build ] && rm -rf ./build && \ - [ -e ./lib ] && rm -rf ./lib && \ - mv org.elastic.jdt.ls.product/distro/jdt-language-server*windows* lib && \ - jq '.version=\"\\(.version)-windows\"' package.json > tmp && mv tmp package.json && \ - echo $KIBANA_VERSION | yarn build && \ - aws s3 cp build/java_languageserver-*.zip s3://download.elasticsearch.org/code/java-langserver/$DESTINATION && \ - [ -e ./build ] && rm -rf ./build && \ - [ -e ./lib ] && rm -rf ./lib" + jq '.version=\"\\(.version)-linux\"' package.json > package-linux.json && \ + jq '.version=\"\\(.version)-darwin\"' package.json > package-darwin.json && \ + jq '.version=\"\\(.version)-windows\"' package.json > package-windows.json && \ + for PLATFORM in linux darwin windows + do + mv org.elastic.jdt.ls.product/distro/jdt-language-server*\$PLATFORM* lib + mv package-\$PLATFORM.json package.json + echo $KIBANA_VERSION | yarn build + aws s3 cp build/java_languageserver-*.zip s3://download.elasticsearch.org/code/java-langserver/$DESTINATION + [ -e ./build ] && rm -rf ./build + [ -e ./lib ] && rm -rf ./lib + done" \ No newline at end of file diff --git a/org.elastic.jdt.ls.product/pom.xml b/org.elastic.jdt.ls.product/pom.xml index c235d104..4f72ce89 100644 --- a/org.elastic.jdt.ls.product/pom.xml +++ b/org.elastic.jdt.ls.product/pom.xml @@ -135,7 +135,7 @@ wget - https://download.java.net/java/GA/jdk11/9/GPL/openjdk-${jdkVersion}_osx-x64_bin.tar.gz + https://download.java.net/java/GA/jdk${jdkMajor}/${jdkBuild}/GPL/openjdk-${jdkVersion}_osx-x64_bin.tar.gz true ${project.build.directory}/jdks/openjdk-${jdkVersion}_osx @@ -147,7 +147,7 @@ wget - https://download.java.net/java/GA/jdk11/9/GPL/openjdk-${jdkVersion}_linux-x64_bin.tar.gz + https://download.java.net/java/GA/jdk${jdkMajor}/${jdkBuild}/GPL/openjdk-${jdkVersion}_linux-x64_bin.tar.gz true ${project.build.directory}/jdks/openjdk-${jdkVersion}_linux @@ -159,7 +159,7 @@ wget - https://download.java.net/java/GA/jdk11/9/GPL/openjdk-${jdkVersion}_windows-x64_bin.zip + https://download.java.net/java/GA/jdk${jdkMajor}/${jdkBuild}/GPL/openjdk-${jdkVersion}_windows-x64_bin.zip true ${project.build.directory}/jdks/openjdk-${jdkVersion}_windows diff --git a/pom.xml b/pom.xml index f362d0ae..315074a3 100644 --- a/pom.xml +++ b/pom.xml @@ -21,6 +21,8 @@ true true 11.0.2 + 11 + 9 org.elastic.jdt.ls.target