diff --git a/README.adoc b/README.adoc index 25931a4f..1d4b998b 100644 --- a/README.adoc +++ b/README.adoc @@ -77,7 +77,7 @@ The `initializr-service-sample` showcases a basic custom instance with dedicated [[build]] == Building from Source -You need Java 1.8 and a bash-like shell. +You need Java 17 and a bash-like shell. [[building]] === Building diff --git a/ci/images/ci-image-jdk11/Dockerfile b/ci/images/ci-image-jdk11/Dockerfile deleted file mode 100644 index bd5e407e..00000000 --- a/ci/images/ci-image-jdk11/Dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -FROM ubuntu:focal-20220922 - -ADD setup.sh /setup.sh -ADD get-jdk-url.sh /get-jdk-url.sh -RUN ./setup.sh java11 - -ENV JAVA_HOME /opt/openjdk -ENV PATH $JAVA_HOME/bin:$PATH \ No newline at end of file diff --git a/ci/images/ci-image-jdk17/Dockerfile b/ci/images/ci-image-jdk17/Dockerfile deleted file mode 100644 index ac540af4..00000000 --- a/ci/images/ci-image-jdk17/Dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -FROM ubuntu:focal-20220922 - -ADD setup.sh /setup.sh -ADD get-jdk-url.sh /get-jdk-url.sh -RUN ./setup.sh java17 - -ENV JAVA_HOME /opt/openjdk -ENV PATH $JAVA_HOME/bin:$PATH \ No newline at end of file diff --git a/ci/images/ci-image/Dockerfile b/ci/images/ci-image/Dockerfile index edffbc3b..ac540af4 100644 --- a/ci/images/ci-image/Dockerfile +++ b/ci/images/ci-image/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:focal-20220922 ADD setup.sh /setup.sh ADD get-jdk-url.sh /get-jdk-url.sh -RUN ./setup.sh java8 +RUN ./setup.sh java17 ENV JAVA_HOME /opt/openjdk ENV PATH $JAVA_HOME/bin:$PATH \ No newline at end of file diff --git a/ci/images/get-jdk-url.sh b/ci/images/get-jdk-url.sh index 5c84b1b6..c74a827f 100755 --- a/ci/images/get-jdk-url.sh +++ b/ci/images/get-jdk-url.sh @@ -2,12 +2,6 @@ set -e case "$1" in - java8) - echo "https://github.com/bell-sw/Liberica/releases/download/8u345+1/bellsoft-jdk8u345+1-linux-amd64.tar.gz" - ;; - java11) - echo "https://github.com/bell-sw/Liberica/releases/download/11.0.16.1+1/bellsoft-jdk11.0.16.1+1-linux-amd64.tar.gz" - ;; java17) echo "https://github.com/bell-sw/Liberica/releases/download/17.0.4.1+1/bellsoft-jdk17.0.4.1+1-linux-amd64.tar.gz" ;; diff --git a/ci/pipeline.yml b/ci/pipeline.yml index 7bc6f8ca..96e68b15 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -121,18 +121,6 @@ resources: source: <<: *registry-image-resource-source repository: ((docker-hub-organization))/initializr-ci -- name: ci-image-jdk11 - type: registry-image - icon: docker - source: - <<: *registry-image-resource-source - repository: ((docker-hub-organization))/initializr-ci-jdk11 -- name: ci-image-jdk17 - type: registry-image - icon: docker - source: - <<: *registry-image-resource-source - repository: ((docker-hub-organization))/initializr-ci-jdk17 - name: artifactory-repo type: artifactory-resource icon: package-variant @@ -149,22 +137,6 @@ resources: access_token: ((github-ci-status-token)) branch: ((branch)) context: build -- name: repo-status-jdk11-build - type: github-status-resource - icon: eye-check-outline - source: - repository: ((github-repo-name)) - access_token: ((github-ci-status-token)) - branch: ((branch)) - context: jdk11-build -- name: repo-status-jdk17-build - type: github-status-resource - icon: eye-check-outline - source: - repository: ((github-repo-name)) - access_token: ((github-ci-status-token)) - branch: ((branch)) - context: jdk17-build - name: slack-alert type: slack-notification icon: slack @@ -189,32 +161,10 @@ jobs: vars: ci-image-name: ci-image <<: *registry-mirror-vars - - task: build-ci-image-jdk11 - privileged: true - file: git-repo/ci/tasks/build-ci-image.yml - output_mapping: - image: ci-image-jdk11 - vars: - ci-image-name: ci-image-jdk11 - <<: *registry-mirror-vars - - task: build-ci-image-jdk17 - privileged: true - file: git-repo/ci/tasks/build-ci-image.yml - output_mapping: - image: ci-image-jdk17 - vars: - ci-image-name: ci-image-jdk17 - <<: *registry-mirror-vars - in_parallel: - put: ci-image params: image: ci-image/image.tar - - put: ci-image-jdk11 - params: - image: ci-image-jdk11/image.tar - - put: ci-image-jdk17 - params: - image: ci-image-jdk17/image.tar - name: build serial: true public: true @@ -248,58 +198,6 @@ jobs: - put: slack-alert params: <<: *slack-success-params -- name: jdk11-build - serial: true - public: true - plan: - - get: ci-image-jdk11 - - get: git-repo - - get: daily - trigger: true - - put: repo-status-jdk11-build - params: { state: "pending", commit: "git-repo" } - - do: - - task: build-project - image: ci-image-jdk11 - <<: *build-project-task-params - on_failure: - do: - - put: repo-status-jdk11-build - params: { state: "failure", commit: "git-repo" } - - put: slack-alert - params: - <<: *slack-fail-params - - put: repo-status-jdk11-build - params: { state: "success", commit: "git-repo" } - - put: slack-alert - params: - <<: *slack-success-params -- name: jdk17-build - serial: true - public: true - plan: - - get: ci-image-jdk17 - - get: git-repo - - get: daily - trigger: true - - put: repo-status-jdk17-build - params: { state: "pending", commit: "git-repo" } - - do: - - task: build-project - image: ci-image-jdk17 - <<: *build-project-task-params - on_failure: - do: - - put: repo-status-jdk17-build - params: { state: "failure", commit: "git-repo" } - - put: slack-alert - params: - <<: *slack-fail-params - - put: repo-status-jdk17-build - params: { state: "success", commit: "git-repo" } - - put: slack-alert - params: - <<: *slack-success-params - name: build-pull-requests serial: true public: true @@ -413,7 +311,7 @@ jobs: body: generated-changelog/changelog.md groups: - name: "build" - jobs: ["build", "jdk11-build", "jdk17-build", "windows-build"] + jobs: ["build", "windows-build"] - name: "releases" jobs: ["stage-release", "promote-release", "create-github-release"] - name: "ci-images" diff --git a/initializr-parent/pom.xml b/initializr-parent/pom.xml index 0edbea65..ad32035f 100644 --- a/initializr-parent/pom.xml +++ b/initializr-parent/pom.xml @@ -14,7 +14,7 @@ ${basedir}/.. - 1.8 + 17 1.21 1.10.0 1.7.3