From 055d686d8c5eae00b448d85faa728ae078beb563 Mon Sep 17 00:00:00 2001 From: Mridula <66699525+mpeddada1@users.noreply.github.com> Date: Fri, 5 Apr 2024 13:26:39 -0400 Subject: [PATCH 1/5] chore: update docs for plugins 3.4.2 and core 0.27.0 (#4232) --- examples/dropwizard/pom.xml | 2 +- examples/helloworld/build.gradle | 2 +- examples/helloworld/pom.xml | 2 +- examples/java-agent/build.gradle | 2 +- examples/java-agent/pom.xml | 2 +- examples/ktor/build.gradle.kts | 2 +- examples/micronaut/build.gradle | 2 +- examples/multi-module/build.gradle | 2 +- examples/multi-module/pom.xml | 2 +- examples/spring-boot/build.gradle | 2 +- examples/spring-boot/pom.xml | 2 +- examples/vertx/build.gradle | 2 +- jib-core/CHANGELOG.md | 9 +++++++-- jib-core/README.md | 4 ++-- jib-core/examples/build.gradle/README.md | 2 +- jib-gradle-plugin/CHANGELOG.md | 11 ++++++++--- jib-gradle-plugin/README.md | 2 +- jib-maven-plugin/CHANGELOG.md | 9 +++++++-- 18 files changed, 38 insertions(+), 23 deletions(-) diff --git a/examples/dropwizard/pom.xml b/examples/dropwizard/pom.xml index 4a4e1f167f..ab09f99b0a 100644 --- a/examples/dropwizard/pom.xml +++ b/examples/dropwizard/pom.xml @@ -26,7 +26,7 @@ 1.5.0 /app - 3.4.1 + 3.4.2 diff --git a/examples/helloworld/build.gradle b/examples/helloworld/build.gradle index 4a5e74232e..c6c2225278 100644 --- a/examples/helloworld/build.gradle +++ b/examples/helloworld/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id 'com.google.cloud.tools.jib' version '3.4.1' + id 'com.google.cloud.tools.jib' version '3.4.2' } sourceCompatibility = 1.8 diff --git a/examples/helloworld/pom.xml b/examples/helloworld/pom.xml index a91b885bb7..924c67a136 100644 --- a/examples/helloworld/pom.xml +++ b/examples/helloworld/pom.xml @@ -9,7 +9,7 @@ UTF-8 - 3.4.1 + 3.4.2 3.8.0 diff --git a/examples/java-agent/build.gradle b/examples/java-agent/build.gradle index 5c14bbacc8..ae272cdffd 100644 --- a/examples/java-agent/build.gradle +++ b/examples/java-agent/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id 'com.google.cloud.tools.jib' version '3.4.1' + id 'com.google.cloud.tools.jib' version '3.4.2' id 'de.undercouch.download' version '4.0.0' id 'com.gorylenko.gradle-git-properties' version '2.2.0' } diff --git a/examples/java-agent/pom.xml b/examples/java-agent/pom.xml index 9c888cc209..7fc43504e5 100644 --- a/examples/java-agent/pom.xml +++ b/examples/java-agent/pom.xml @@ -9,7 +9,7 @@ UTF-8 - 3.4.1 + 3.4.2 3.8.0 1.4.2 3.0.1 diff --git a/examples/ktor/build.gradle.kts b/examples/ktor/build.gradle.kts index aa300a358c..963c3fd418 100644 --- a/examples/ktor/build.gradle.kts +++ b/examples/ktor/build.gradle.kts @@ -1,7 +1,7 @@ plugins { application kotlin("jvm") version "1.3.10" - id("com.google.cloud.tools.jib") version "3.4.1" + id("com.google.cloud.tools.jib") version "3.4.2" } group = "example" diff --git a/examples/micronaut/build.gradle b/examples/micronaut/build.gradle index f8870dfa15..c0f0842bbd 100644 --- a/examples/micronaut/build.gradle +++ b/examples/micronaut/build.gradle @@ -2,7 +2,7 @@ plugins { id "groovy" id "com.github.johnrengelman.shadow" version "5.2.0" id "application" - id 'com.google.cloud.tools.jib' version '3.4.1' + id 'com.google.cloud.tools.jib' version '3.4.2' } version "0.1" diff --git a/examples/multi-module/build.gradle b/examples/multi-module/build.gradle index 4c5b0c406d..ea07fc421f 100644 --- a/examples/multi-module/build.gradle +++ b/examples/multi-module/build.gradle @@ -2,5 +2,5 @@ plugins { id 'org.springframework.boot' version '2.0.3.RELEASE' apply false id 'io.spring.dependency-management' version '1.0.6.RELEASE' apply false - id 'com.google.cloud.tools.jib' version '3.4.1' apply false + id 'com.google.cloud.tools.jib' version '3.4.2' apply false } diff --git a/examples/multi-module/pom.xml b/examples/multi-module/pom.xml index d4623fddc7..135e9a8c5e 100644 --- a/examples/multi-module/pom.xml +++ b/examples/multi-module/pom.xml @@ -41,7 +41,7 @@ com.google.cloud.tools jib-maven-plugin - 3.4.1 + 3.4.2 diff --git a/examples/spring-boot/build.gradle b/examples/spring-boot/build.gradle index de0f8530f6..5ce5d12ef1 100644 --- a/examples/spring-boot/build.gradle +++ b/examples/spring-boot/build.gradle @@ -4,7 +4,7 @@ plugins { id 'idea' id 'org.springframework.boot' version '2.1.6.RELEASE' id 'io.spring.dependency-management' version '1.0.6.RELEASE' - id 'com.google.cloud.tools.jib' version '3.4.1' + id 'com.google.cloud.tools.jib' version '3.4.2' } repositories { diff --git a/examples/spring-boot/pom.xml b/examples/spring-boot/pom.xml index 37a5c3a6a6..6cf906c0da 100644 --- a/examples/spring-boot/pom.xml +++ b/examples/spring-boot/pom.xml @@ -29,7 +29,7 @@ com.google.cloud.tools jib-maven-plugin - 3.4.1 + 3.4.2 diff --git a/examples/vertx/build.gradle b/examples/vertx/build.gradle index fb31b56708..956df52ea2 100644 --- a/examples/vertx/build.gradle +++ b/examples/vertx/build.gradle @@ -1,6 +1,6 @@ plugins { id 'io.vertx.vertx-plugin' version '0.1.0' - id 'com.google.cloud.tools.jib' version '3.4.1' + id 'com.google.cloud.tools.jib' version '3.4.2' } repositories { diff --git a/jib-core/CHANGELOG.md b/jib-core/CHANGELOG.md index 32b9adcabb..b0f8762566 100644 --- a/jib-core/CHANGELOG.md +++ b/jib-core/CHANGELOG.md @@ -4,13 +4,18 @@ All notable changes to this project will be documented in this file. ## [unreleased] ### Added -- + +### Changed + +### Fixed + +## 0.27.0 ### Changed - deps: bump org.apache.commons:commons-compress from 1.21 to 1.26.0 ([#4204](https://github.com/GoogleContainerTools/jib/pull/4204)) ### Fixed -- fix: image builds should become reproducible once again ([#4204](https://github.com/GoogleContainerTools/jib/pull/4204)) +- fix: set PAX headers to address build reproducibility issue ([#4204](https://github.com/GoogleContainerTools/jib/pull/4204)) ## 0.26.0 diff --git a/jib-core/README.md b/jib-core/README.md index 81cd0b1f77..cc6baf2d24 100644 --- a/jib-core/README.md +++ b/jib-core/README.md @@ -22,7 +22,7 @@ Add Jib Core as a dependency using Maven: com.google.cloud.tools jib-core - 0.26.0 + 0.27.0 ``` @@ -30,7 +30,7 @@ Add Jib Core as a dependency using Gradle: ```groovy dependencies { - compile 'com.google.cloud.tools:jib-core:0.25.0' + compile 'com.google.cloud.tools:jib-core:0.27.0' } ``` diff --git a/jib-core/examples/build.gradle/README.md b/jib-core/examples/build.gradle/README.md index 2ab27e98e2..2211f37846 100644 --- a/jib-core/examples/build.gradle/README.md +++ b/jib-core/examples/build.gradle/README.md @@ -14,7 +14,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.google.cloud.tools:jib-core:0.25.0' + classpath 'com.google.cloud.tools:jib-core:0.27.0' } } diff --git a/jib-gradle-plugin/CHANGELOG.md b/jib-gradle-plugin/CHANGELOG.md index 0f5cfb9371..c91b85fee8 100644 --- a/jib-gradle-plugin/CHANGELOG.md +++ b/jib-gradle-plugin/CHANGELOG.md @@ -3,14 +3,19 @@ All notable changes to this project will be documented in this file. ## [unreleased] -### Added -- +### Added + +### Changed + +### Fixed + +## 3.4.2 ### Changed - deps: bump org.apache.commons:commons-compress from 1.21 to 1.26.0 ([#4204](https://github.com/GoogleContainerTools/jib/pull/4204)) ### Fixed -- fix: image builds should become reproducible once again ([#4204](https://github.com/GoogleContainerTools/jib/pull/4204)) +- fix: set PAX headers to address build reproducibility issue ([#4204](https://github.com/GoogleContainerTools/jib/pull/4204)) - fix: (WAR Containerization) modify default entrypoint to `java -jar /usr/local/jetty/start.jar --module=ee10-deploy` for Jetty 12+ compatibility ([#4216](https://github.com/GoogleContainerTools/jib/pull/4216)) ## 3.4.1 diff --git a/jib-gradle-plugin/README.md b/jib-gradle-plugin/README.md index 72f92b3d9e..6bdf8aca96 100644 --- a/jib-gradle-plugin/README.md +++ b/jib-gradle-plugin/README.md @@ -53,7 +53,7 @@ In your Gradle Java project, add the plugin to your `build.gradle`: ```groovy plugins { - id 'com.google.cloud.tools.jib' version '3.4.1' + id 'com.google.cloud.tools.jib' version '3.4.2' } ``` diff --git a/jib-maven-plugin/CHANGELOG.md b/jib-maven-plugin/CHANGELOG.md index a1f5ff8b60..77a8f26045 100644 --- a/jib-maven-plugin/CHANGELOG.md +++ b/jib-maven-plugin/CHANGELOG.md @@ -4,13 +4,18 @@ All notable changes to this project will be documented in this file. ## [unreleased] ### Added -- + +### Changed + +### Fixed + +## 3.4.2 ### Changed - deps: bump org.apache.commons:commons-compress from 1.21 to 1.26.0 ([#4204](https://github.com/GoogleContainerTools/jib/pull/4204)) ### Fixed -- fix: image builds should become reproducible once again ([#4204](https://github.com/GoogleContainerTools/jib/pull/4204)) +- fix: set PAX headers to address build reproducibility issue ([#4204](https://github.com/GoogleContainerTools/jib/pull/4204)) - fix: (WAR Containerization) modify default entrypoint to `java -jar /usr/local/jetty/start.jar --module=ee10-deploy` for Jetty 12+ compatibility ([#4216](https://github.com/GoogleContainerTools/jib/pull/4216)) ## 3.4.1 From 4af94a819ff1df6d7375a3a5caff2a611f376834 Mon Sep 17 00:00:00 2001 From: Mridula <66699525+mpeddada1@users.noreply.github.com> Date: Fri, 5 Apr 2024 21:29:41 -0400 Subject: [PATCH 2/5] maven release v3.4.2 (#4227) * [Gradle Release Plugin] - pre tag commit: 'v3.4.2-maven'. * [Gradle Release Plugin] - new version commit: 'v3.4.3-SNAPSHOT-maven'. --------- Co-authored-by: mpeddada1 --- jib-maven-plugin/gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jib-maven-plugin/gradle.properties b/jib-maven-plugin/gradle.properties index 54800605c2..22c5f533ee 100644 --- a/jib-maven-plugin/gradle.properties +++ b/jib-maven-plugin/gradle.properties @@ -1 +1 @@ -version = 3.4.2-SNAPSHOT +version = 3.4.3-SNAPSHOT From 97ed78631c516117cc8fc837d76c58ad8e668e6e Mon Sep 17 00:00:00 2001 From: Mridula <66699525+mpeddada1@users.noreply.github.com> Date: Fri, 5 Apr 2024 21:30:11 -0400 Subject: [PATCH 3/5] core release v0.27.0 (#4223) * [Gradle Release Plugin] - pre tag commit: 'v0.27.0-core'. * [Gradle Release Plugin] - new version commit: 'v0.27.1-SNAPSHOT-core'. --------- Co-authored-by: mpeddada1 --- jib-core/gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jib-core/gradle.properties b/jib-core/gradle.properties index 0535c30ed4..86ae6f81f5 100644 --- a/jib-core/gradle.properties +++ b/jib-core/gradle.properties @@ -1 +1 @@ -version = 0.26.1-SNAPSHOT +version = 0.27.1-SNAPSHOT From c7b191cc32f7a2e03ffb96605dd3f560eb128e9e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 May 2024 12:18:12 -0400 Subject: [PATCH 4/5] chore(deps): bump gradle/wrapper-validation-action from 2.1.2 to 3.3.2 (#4243) Bumps [gradle/wrapper-validation-action](https://github.com/gradle/wrapper-validation-action) from 2.1.2 to 3.3.2. - [Release notes](https://github.com/gradle/wrapper-validation-action/releases) - [Commits](https://github.com/gradle/wrapper-validation-action/compare/v2.1.2...v3.3.2) --- updated-dependencies: - dependency-name: gradle/wrapper-validation-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/gradle-wrapper-validation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml index e2689d6661..8b1220b701 100644 --- a/.github/workflows/gradle-wrapper-validation.yml +++ b/.github/workflows/gradle-wrapper-validation.yml @@ -7,4 +7,4 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: gradle/wrapper-validation-action@v2.1.2 + - uses: gradle/wrapper-validation-action@v3.3.2 From dcf4bb1e76b69db3fcc70771cf0aff3e23f32da0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 May 2024 12:19:14 -0400 Subject: [PATCH 5/5] chore(deps): bump org.apache.maven:maven-compat from 3.9.3 to 3.9.6 (#4189) Bumps [org.apache.maven:maven-compat](https://github.com/apache/maven) from 3.9.3 to 3.9.6. - [Release notes](https://github.com/apache/maven/releases) - [Commits](https://github.com/apache/maven/compare/maven-3.9.3...maven-3.9.6) --- updated-dependencies: - dependency-name: org.apache.maven:maven-compat dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 32f6f02523..bfa4d3807e 100644 --- a/build.gradle +++ b/build.gradle @@ -40,7 +40,7 @@ project.ext.dependencyStrings = [ MAVEN_API: 'org.apache.maven:maven-plugin-api:3.9.3', MAVEN_CORE: 'org.apache.maven:maven-core:3.9.3', - MAVEN_COMPAT: 'org.apache.maven:maven-compat:3.9.3', + MAVEN_COMPAT: 'org.apache.maven:maven-compat:3.9.6', MAVEN_PLUGIN_ANNOTATIONS: 'org.apache.maven.plugin-tools:maven-plugin-annotations:3.9.0', //test