Merge branch 'master' into jib-cli-0.13.0

GoogleContainerTools · May 7, 2024 · 9d2a121 · 9d2a121
2 parents b8f44d9 + dcf4bb1
commit 9d2a121
Show file tree

Hide file tree

Showing 22 changed files with 42 additions and 27 deletions.
diff --git 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
diff --git 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

diff --git a/examples/dropwizard/pom.xml b/examples/dropwizard/pom.xml
@@ -26,7 +26,7 @@
         <dropwizard-template-config.version>1.5.0</dropwizard-template-config.version>
 
         <jib.container.appRoot>/app</jib.container.appRoot>
-        <jib-maven-plugin.version>3.4.1</jib-maven-plugin.version>
+        <jib-maven-plugin.version>3.4.2</jib-maven-plugin.version>
     </properties>
 
     <dependencyManagement>

diff --git 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
@@ -9,7 +9,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <jib-maven-plugin.version>3.4.1</jib-maven-plugin.version>
+    <jib-maven-plugin.version>3.4.2</jib-maven-plugin.version>
     <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
   </properties>
 

diff --git 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
@@ -9,7 +9,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <jib-maven-plugin.version>3.4.1</jib-maven-plugin.version>
+    <jib-maven-plugin.version>3.4.2</jib-maven-plugin.version>
     <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
     <download-maven-plugin.version>1.4.2</download-maven-plugin.version>
     <git-commit-id-plugin.version>3.0.1</git-commit-id-plugin.version>

diff --git 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
@@ -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
@@ -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
@@ -41,7 +41,7 @@
         <plugin>
           <groupId>com.google.cloud.tools</groupId>
           <artifactId>jib-maven-plugin</artifactId>
-          <version>3.4.1</version>
+          <version>3.4.2</version>
         </plugin>
       </plugins>
     </pluginManagement>

diff --git 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
@@ -29,7 +29,7 @@
             <plugin>
                 <groupId>com.google.cloud.tools</groupId>
                 <artifactId>jib-maven-plugin</artifactId>
-                <version>3.4.1</version>
+                <version>3.4.2</version>
             </plugin>
         </plugins>
     </build>

diff --git 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
@@ -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
@@ -22,15 +22,15 @@ Add Jib Core as a dependency using Maven:
 <dependency>
   <groupId>com.google.cloud.tools</groupId>
   <artifactId>jib-core</artifactId>
-  <version>0.26.0</version>
+  <version>0.27.0</version>
 </dependency>
 ```
 
 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
@@ -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-core/gradle.properties b/jib-core/gradle.properties
@@ -1 +1 @@
-version = 0.26.1-SNAPSHOT
+version = 0.27.1-SNAPSHOT
diff --git 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
@@ -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
@@ -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

diff --git a/jib-maven-plugin/gradle.properties b/jib-maven-plugin/gradle.properties
@@ -1 +1 @@
-version = 3.4.2-SNAPSHOT
+version = 3.4.3-SNAPSHOT
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		version = 0.26.1-SNAPSHOT
		version = 0.27.1-SNAPSHOT