From 4b16fd74490671ee80ce57074814c2b1c8a3ac96 Mon Sep 17 00:00:00 2001 From: Yana Vasileva Date: Thu, 31 Aug 2023 17:39:03 +0200 Subject: [PATCH 1/9] chore(project): use jdk 11 source code level --- .ci.cambpm | 2 +- pom.xml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.ci.cambpm b/.ci.cambpm index e6dbfab05..0a24fc23d 100644 --- a/.ci.cambpm +++ b/.ci.cambpm @@ -1,2 +1,2 @@ @Library("camunda-ci") _ -buildMavenAndDeployToMavenCentral([jdk:8, extraJdks: ['jdk-11-latest'], mvn:3.5, licenseCheck:true, publishZipArtifactToCamundaOrg:true]) +buildMavenAndDeployToMavenCentral([jdk:11, mvn:3.5, licenseCheck:true, publishZipArtifactToCamundaOrg:true]) diff --git a/pom.xml b/pom.xml index 14a5b6354..313b648ef 100644 --- a/pom.xml +++ b/pom.xml @@ -6,6 +6,7 @@ org.camunda camunda-bpm-release-parent 2.2.7 + @@ -15,7 +16,7 @@ FEEL Scala Engine - 1.8 + 11 2.13.12 2.13.6 2.20.0 From ffec117f7fd275ba9111abdaf49887af34314d92 Mon Sep 17 00:00:00 2001 From: yanavasileva Date: Fri, 1 Sep 2023 13:00:07 +0200 Subject: [PATCH 2/9] remove java 8 from build-maven workflow --- .github/workflows/build-maven.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/build-maven.yml b/.github/workflows/build-maven.yml index 2377921ee..367e055a7 100644 --- a/.github/workflows/build-maven.yml +++ b/.github/workflows/build-maven.yml @@ -8,11 +8,6 @@ on: jobs: build: runs-on: ubuntu-latest - strategy: - matrix: - java: [ '8', '11' ] - - name: Java ${{ matrix.Java }} steps: - name: Checkout uses: actions/checkout@v4 @@ -21,7 +16,7 @@ jobs: uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: ${{ matrix.java }} + java-version: 11 - name: Cache uses: actions/cache@v3 From bdd2b360d59429581297104d81a7747db20a5631 Mon Sep 17 00:00:00 2001 From: Yana Vasileva Date: Thu, 7 Sep 2023 10:37:57 +0200 Subject: [PATCH 3/9] add jdk 17 to build maven --- .github/workflows/build-maven.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-maven.yml b/.github/workflows/build-maven.yml index 367e055a7..abc9ab788 100644 --- a/.github/workflows/build-maven.yml +++ b/.github/workflows/build-maven.yml @@ -8,6 +8,11 @@ on: jobs: build: runs-on: ubuntu-latest + strategy: + matrix: + java: [ '11', '17' ] + + name: Java ${{ matrix.Java }} steps: - name: Checkout uses: actions/checkout@v4 @@ -16,7 +21,7 @@ jobs: uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: 11 + java-version: ${{ matrix.java }} - name: Cache uses: actions/cache@v3 From 195f41fb02d9ec4a5e086f61c6b8e088f32b99ac Mon Sep 17 00:00:00 2001 From: Yana Vasileva Date: Thu, 7 Sep 2023 13:38:13 +0200 Subject: [PATCH 4/9] bump release parent --- pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 313b648ef..5b59f7e28 100644 --- a/pom.xml +++ b/pom.xml @@ -5,8 +5,7 @@ org.camunda camunda-bpm-release-parent - 2.2.7 - + 2.3.0-SNAPSHOT From a623a53f077c166562486bd3191e1a341494d9f2 Mon Sep 17 00:00:00 2001 From: Yana Vasileva Date: Thu, 7 Sep 2023 13:42:11 +0200 Subject: [PATCH 5/9] add extra jdk 17 to ci build --- .ci.cambpm | 2 +- pom.xml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.ci.cambpm b/.ci.cambpm index 0a24fc23d..5c9828fd3 100644 --- a/.ci.cambpm +++ b/.ci.cambpm @@ -1,2 +1,2 @@ @Library("camunda-ci") _ -buildMavenAndDeployToMavenCentral([jdk:11, mvn:3.5, licenseCheck:true, publishZipArtifactToCamundaOrg:true]) +buildMavenAndDeployToMavenCentral([jdk:11, mvn:3.5, extraJdks: ['jdk-17-latest'], licenseCheck:true, publishZipArtifactToCamundaOrg:true]) diff --git a/pom.xml b/pom.xml index 5b59f7e28..07afbffa8 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,6 @@ FEEL Scala Engine - 11 2.13.12 2.13.6 2.20.0 From 426d5ed6a2d02e0a968ee0c2ad8f3589fd92cc22 Mon Sep 17 00:00:00 2001 From: yanavasileva Date: Fri, 8 Sep 2023 09:35:39 +0200 Subject: [PATCH 6/9] Update .ci.cambpm --- .ci.cambpm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci.cambpm b/.ci.cambpm index 5c9828fd3..017524a04 100644 --- a/.ci.cambpm +++ b/.ci.cambpm @@ -1,2 +1,2 @@ @Library("camunda-ci") _ -buildMavenAndDeployToMavenCentral([jdk:11, mvn:3.5, extraJdks: ['jdk-17-latest'], licenseCheck:true, publishZipArtifactToCamundaOrg:true]) +buildMavenAndDeployToMavenCentral([jdk:11, extraJdks: ['jdk-17-latest'], mvn:3.5, licenseCheck:true, publishZipArtifactToCamundaOrg:true]) From fb5d833053aec0a45e0a97422be416044b834a89 Mon Sep 17 00:00:00 2001 From: Yana Vasileva Date: Mon, 11 Sep 2023 14:18:36 +0200 Subject: [PATCH 7/9] test --- .ci.cambpm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci.cambpm b/.ci.cambpm index 017524a04..5c9828fd3 100644 --- a/.ci.cambpm +++ b/.ci.cambpm @@ -1,2 +1,2 @@ @Library("camunda-ci") _ -buildMavenAndDeployToMavenCentral([jdk:11, extraJdks: ['jdk-17-latest'], mvn:3.5, licenseCheck:true, publishZipArtifactToCamundaOrg:true]) +buildMavenAndDeployToMavenCentral([jdk:11, mvn:3.5, extraJdks: ['jdk-17-latest'], licenseCheck:true, publishZipArtifactToCamundaOrg:true]) From ed38de78b7a51f0aa858e636716aa6269f09cb1a Mon Sep 17 00:00:00 2001 From: Yana Vasileva Date: Tue, 12 Sep 2023 11:30:15 +0200 Subject: [PATCH 8/9] cleanup --- .ci.cambpm | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci.cambpm b/.ci.cambpm index 5c9828fd3..017524a04 100644 --- a/.ci.cambpm +++ b/.ci.cambpm @@ -1,2 +1,2 @@ @Library("camunda-ci") _ -buildMavenAndDeployToMavenCentral([jdk:11, mvn:3.5, extraJdks: ['jdk-17-latest'], licenseCheck:true, publishZipArtifactToCamundaOrg:true]) +buildMavenAndDeployToMavenCentral([jdk:11, extraJdks: ['jdk-17-latest'], mvn:3.5, licenseCheck:true, publishZipArtifactToCamundaOrg:true]) diff --git a/pom.xml b/pom.xml index 07afbffa8..40118f9a3 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.camunda camunda-bpm-release-parent - 2.3.0-SNAPSHOT + 2.3.0 From 16306addda410d2bccc3b6c37c7ac8a7cdc4c6d1 Mon Sep 17 00:00:00 2001 From: yanavasileva Date: Wed, 13 Sep 2023 17:36:39 +0200 Subject: [PATCH 9/9] Update .ci.cambpm Co-authored-by: Philipp Ossler --- .ci.cambpm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci.cambpm b/.ci.cambpm index 017524a04..0a24fc23d 100644 --- a/.ci.cambpm +++ b/.ci.cambpm @@ -1,2 +1,2 @@ @Library("camunda-ci") _ -buildMavenAndDeployToMavenCentral([jdk:11, extraJdks: ['jdk-17-latest'], mvn:3.5, licenseCheck:true, publishZipArtifactToCamundaOrg:true]) +buildMavenAndDeployToMavenCentral([jdk:11, mvn:3.5, licenseCheck:true, publishZipArtifactToCamundaOrg:true])