Merge branch 'master' into fix-test-warning

.allstar/binary_artifacts.yaml

@@ -0,0 +1,4 @@
+# Ignore reason: jars are used for testing purposes only
+ignorePaths:
+  - jib-gradle-plugin/src/integration-test/resources/gradle/projects/default-target/libs/dependency-1.0.0.jar
+  - jib-gradle-plugin/src/integration-test/resources/gradle/projects/simple/libs/dependency-1.0.0.jar

.github/ISSUE_TEMPLATE/issue_report.md

@@ -8,7 +8,13 @@ assignees: ''
 ---
 
 <!--
-Before filing an issue, please reproduce with the latest version of Jib.
+Please follow the guidelines below before opening an issue:
+1. Ensure the issue was not already reported. 
+2. Open a new issue if you are unable to find an existing issue addressing your problem. Make sure to include a title and clear description, as much relevant information as possible, and a code sample or an executable test case demonstrating the expected behavior that is not occurring.
+3. Discuss the priority and potential solutions with the maintainers in the issue. The maintainers would review the issue and add a label "Accepting Contributions" once the issue is ready for accepting contributions. 
+4. Open a PR only if the issue is labeled with "Accepting Contributions", ensure the PR description clearly describes the problem and solution. Note that an open PR without an issues labeled with "Accepting Contributions" will not be accepted.
+
+Please reproduce with the latest version of Jib.
 
 If you are encountering errors pulling or pushing to remote registries,
 please check our Frequently Asked Questions before filing an issue:

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,14 +1,12 @@
 Thank you for your interest in contributing! For general guidelines, please refer to
 the [contributing guide](https://github.com/GoogleContainerTools/jib/blob/master/CONTRIBUTING.md).
 
-Before filing a pull request, make sure to do the following:
-
-- [ ] Create a new issue at https://github.com/GoogleContainerTools/jib/issues/new/choose.
-- [ ] Ensure that your implementation plan is approved by the team.
+Please follow the guidelines below before opening an issue or a PR:
+- [ ] Ensure the issue was not already reported. 
+- [ ] Create a new issue at https://github.com/GoogleContainerTools/jib/issues/new/choose if you are unable to find an existing issue addressing your problem. Make sure to include a title and clear description, as much relevant information as possible, and a code sample or an executable test case demonstrating the expected behavior that is not occurring.
+- [ ] Discuss the priority and potential solutions with the maintainers in the issue. The maintainers would review the issue and add a label "Accepting Contributions" once the issue is ready for accepting contributions.
+- [ ] Open a PR only if the issue is labeled with "Accepting Contributions", ensure the PR description clearly describes the problem and solution. Note that an open PR without an issues labeled with "Accepting Contributions" will not be accepted.
 - [ ] Verify that integration tests and unit tests are passing after the change.
-- [ ] Address all checkstyle issues. Refer to
-  the [style guide](https://github.com/GoogleContainerTools/jib/blob/master/STYLE_GUIDE.md).
-
-This helps to reduce the chance of having a pull request rejected.
+- [ ] Address all checkstyle issues. Refer to the [style guide](https://github.com/GoogleContainerTools/jib/blob/master/STYLE_GUIDE.md).
 
 Fixes #<issue_number_goes_here> 🛠️

.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@v1.1.0
+      - uses: gradle/wrapper-validation-action@v3.3.2

.github/workflows/jib-cli-release.yml

@@ -99,7 +99,7 @@ jobs:
           asset_content_type: text/plain
 
       - name: Create Jib CLI release checklist issue
-        uses: JasonEtco/[email protected].1
+        uses: JasonEtco/[email protected].2
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           RELEASE_NAME: v${{ github.event.inputs.release_version }}-cli
@@ -117,7 +117,7 @@ jobs:
       actions: read # To read the workflow path.
       id-token: write # To sign the provenance.
       contents: write # To add assets to a release.
-    uses: slsa-framework/slsa-github-generator/.github/workflows/generator_generic_slsa3.yml@v1.7.0
+    uses: slsa-framework/slsa-github-generator/.github/workflows/generator_generic_slsa3.yml@v1.10.0
     with:
       base64-subjects: "${{ needs.release.outputs.hashes }}"
 

.github/workflows/prepare-release.yml

@@ -92,7 +92,7 @@ jobs:
             See [CHANGELOG.md](https://github.com/GoogleContainerTools/jib/blob/master/jib-${{ github.event.inputs.project }}-plugin/CHANGELOG.md) for more details.
 
       - name: Create Maven/Gradle release checklist issue
-        uses: JasonEtco/[email protected].1
+        uses: JasonEtco/[email protected].2
         if: ${{ github.event.inputs.project == 'maven' || github.event.inputs.project == 'gradle' }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -121,7 +121,7 @@ jobs:
             See [CHANGELOG.md](https://github.com/GoogleContainerTools/jib/blob/master/jib-core/CHANGELOG.md) for more details.
 
       - name: Create Core release checklist issue
-        uses: JasonEtco/[email protected].1
+        uses: JasonEtco/[email protected].2
         if: ${{ github.event.inputs.project == 'core' }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/sonar.yml

@@ -27,11 +27,11 @@ jobs:
           distribution: 'adopt'
           java-version: 11
       - name: Cache SonarCloud packages
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.sonar/cache
           key: ${{ runner.os }}-sonar-${{ steps.date.outputs.date }}
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: |
             ~/.m2/repository

.github/workflows/unit-tests.yml

@@ -24,7 +24,7 @@ jobs:
         with:
           distribution: 'adopt'
           java-version: ${{ matrix.java }}
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: |
             ~/.m2/repository

CONTRIBUTING.md

@@ -1,7 +1,13 @@
+
+This project is currently stable, and we are primarily focused on critical bug fixes and platform evolution to ensure it continues to work for its supported use cases.
+
 # Contributing to Jib
 
-We'd love to accept your patches and contributions to this project. There are
-just a few small guidelines you need to follow.
+Please follow the guidelines below before opening an issue or a PR:
+1. Ensure the issue was not already reported. 
+2. Open a new issue if you are unable to find an existing issue addressing your problem. Make sure to include a title and clear description, as much relevant information as possible, and a code sample or an executable test case demonstrating the expected behavior that is not occurring.
+3. Discuss the priority and potential solutions with the maintainers in the issue. The maintainers would review the issue and add a label "Accepting Contributions" once the issue is ready for accepting contributions. 
+4. Open a PR only if the issue is labeled with "Accepting Contributions", ensure the PR description clearly describes the problem and solution. Note that an open PR without an issues labeled with "Accepting Contributions" will not be accepted.
 
 ## Contributor License Agreement
 

build.gradle

@@ -28,7 +28,7 @@ project.ext.dependencyStrings = [
   GRADLE_EXTENSION: 'com.google.cloud.tools:jib-gradle-plugin-extension-api:0.4.0',
   MAVEN_EXTENSION: 'com.google.cloud.tools:jib-maven-plugin-extension-api:0.4.0',
 
-  COMMONS_COMPRESS: 'org.apache.commons:commons-compress:1.21',
+  COMMONS_COMPRESS: 'org.apache.commons:commons-compress:1.26.0',
   ZSTD_JNI: 'com.github.luben:zstd-jni:1.5.5-5',
   COMMONS_TEXT: 'org.apache.commons:commons-text:1.10.0',
   JACKSON_BOM: 'com.fasterxml.jackson:jackson-bom:2.15.2',
@@ -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
@@ -371,7 +371,7 @@ subprojects {
   // sourceProject(Project) accepts a project and adds it as a dependency in a special manner:
   // 1. force evaluation of the project first
   // 2. add the project classes as "compileOnly" and make it available to tests in "testImplementation"
-  // 3. add the project's depedencies as "implementation"
+  // 3. add the project's dependencies as "implementation"
   // 4. remove any transitive reference of any sourceProject depenency that may have appeared
   // 5. add the project's classes to the final jar
   // Other nice effects (vs shadowJar)

config/checkstyle/copyright-java.header

@@ -1,5 +1,5 @@
 ^/\*$
-^ \* Copyright 20(17|18|19|20|21|22|23) Google LLC\.$
+^ \* Copyright 20(17|18|19|20|21|22|23|24) Google LLC\.$
 ^ \*$
 ^ \* Licensed under the Apache License, Version 2\.0 \(the "License"\); you may not$
 ^ \* use this file except in compliance with the License\. You may obtain a copy of$

docs/faq.md

@@ -901,7 +901,7 @@ The `war` command currently supports containerization of standard WARs. It uses
 * Resources Layer
 * Classes Layer
 
-The default entrypoint when using a jetty base image will be `java -jar /usr/local/jetty/start.jar` unless you choose to specify a custom one.
+The default entrypoint when using a jetty base image will be `java -jar /usr/local/jetty/start.jar --module=ee10-deploy` unless you choose to specify a custom one.
 
 You can use a different Servlet engine base image with the help of the `--from` option and customize `--app-root`, `--entrypoint` and `--program-args`. If you don't set the `entrypoint` or `program-arguments`, Jib will inherit them from the base image. However, setting the `--app-root` is **required** if you use a non-jetty base image. Here is how the `war` command may look if you're using a Tomcat image:
 ```

docs/google-cloud-build.md

@@ -13,7 +13,7 @@ Any Java container can be used for building, not only the `gcr.io/cloud-builders
 
 ```yaml
 steps:
-  - name: 'docker.io/library/eclipse-temurin:17'
+  - name: 'docker.io/library/eclipse-temurin:21'
     entrypoint: './gradlew'
     args: ['--console=plain', '--no-daemon', ':server:jib', '-Djib.to.image=gcr.io/$PROJECT_ID/$REPO_NAME:$COMMIT_SHA']
 ```

docs/privacy.md

@@ -11,7 +11,7 @@ and version.
 ### How to disable update checks
 
 1. set the `jib.disableUpdateChecks` system property to `true`
-2. set `disableUpdateChecks` to `true` in Jib's global config. The global config is in the following locations by default:
+2. set `disableUpdateCheck` to `true` in Jib's global config. The global config is in the following locations by default:
     * Linux: `$XDG_CONFIG_HOME/google-cloud-tools-java/jib/config.json` (if `$XDG_CONFIG_HOME` is defined), else `$HOME/.config/google-cloud-tools-java/jib/config.json`
     * Mac: `$XDG_CONFIG_HOME/Google/Jib/config.json` (if `$XDG_CONFIG_HOME` is defined), else `$HOME/Library/Preferences/Google/Jib/config.json`
     * Windows: `$XDG_CONFIG_HOME\Google\Jib\Config\config.json` (if `$XDG_CONFIG_HOME` is defined), else `%LOCALAPPDATA%\Google\Jib\Config\config.json`

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.0</jib-maven-plugin.version>
+        <jib-maven-plugin.version>3.4.3</jib-maven-plugin.version>
     </properties>
 
     <dependencyManagement>

examples/helloworld/build.gradle

@@ -1,6 +1,6 @@
 plugins {
   id 'java'
-  id 'com.google.cloud.tools.jib' version '3.4.0'
+  id 'com.google.cloud.tools.jib' version '3.4.3'
 }
 
 sourceCompatibility = 1.8

examples/helloworld/pom.xml

@@ -9,7 +9,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <jib-maven-plugin.version>3.4.0</jib-maven-plugin.version>
+    <jib-maven-plugin.version>3.4.3</jib-maven-plugin.version>
     <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
   </properties>
 

examples/java-agent/build.gradle

@@ -1,6 +1,6 @@
 plugins {
   id 'java'
-  id 'com.google.cloud.tools.jib' version '3.4.0'
+  id 'com.google.cloud.tools.jib' version '3.4.3'
   id 'de.undercouch.download' version '4.0.0'
   id 'com.gorylenko.gradle-git-properties' version '2.2.0'
 }

examples/java-agent/pom.xml

@@ -9,7 +9,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <jib-maven-plugin.version>3.4.0</jib-maven-plugin.version>
+    <jib-maven-plugin.version>3.4.3</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>

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.0"
+    id("com.google.cloud.tools.jib") version "3.4.3"
 }
 
 group = "example"

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.0'
+    id 'com.google.cloud.tools.jib' version '3.4.3'
 }
 
 version "0.1"

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.0' apply false
+  id 'com.google.cloud.tools.jib' version '3.4.3' apply false
 }

examples/multi-module/pom.xml

@@ -41,7 +41,7 @@
         <plugin>
           <groupId>com.google.cloud.tools</groupId>
           <artifactId>jib-maven-plugin</artifactId>
-          <version>3.4.0</version>
+          <version>3.4.3</version>
         </plugin>
       </plugins>
     </pluginManagement>

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.0'
+    id 'com.google.cloud.tools.jib' version '3.4.3'
 }
 
 repositories {

examples/spring-boot/pom.xml

@@ -29,7 +29,7 @@
             <plugin>
                 <groupId>com.google.cloud.tools</groupId>
                 <artifactId>jib-maven-plugin</artifactId>
-                <version>3.4.0</version>
+                <version>3.4.3</version>
             </plugin>
         </plugins>
     </build>

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.0'
+    id 'com.google.cloud.tools.jib' version '3.4.3'
 }
 
 repositories {

jib-cli/CHANGELOG.md

@@ -9,6 +9,16 @@ All notable changes to this project will be documented in this file.
 
 ### Fixed
 
+## 0.13.0
+
+### Added
+
+### Changed
+
+### Fixed
+- fix: support parsing manifest JSON containing `LayerSources:` from latest Docker. ([#4171](https://github.com/GoogleContainerTools/jib/pull/4171))
+- 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))
+
 ## 0.12.0
 
 ### Changed

jib-cli/README.md

@@ -56,7 +56,7 @@ Most users should download a ZIP archive (Java application). We are working on r
 
 A JRE is required to run this Jib CLI distribution.
 
-Find the [latest jib-cli 0.12.0 release](https://github.com/GoogleContainerTools/jib/releases/latest) on the [Releases page](https://github.com/GoogleContainerTools/jib/releases) and download `jib-jre-<version>.zip`.
+Find the [latest jib-cli 0.13.0 release](https://github.com/GoogleContainerTools/jib/releases/latest) on the [Releases page](https://github.com/GoogleContainerTools/jib/releases) and download `jib-jre-<version>.zip`.
 
 Unzip the zip file. The zip file contains the `jib` (`jib.bat` for Windows) script at `jib/bin/`. Optionally, add the binary directory to your `$PATH` so that you can call `jib` from anywhere.
 
@@ -190,7 +190,7 @@ This command follows the following pattern:
 
 ## Quickstart
 
-1. Have your sample WAR ready and use the `war` command to containerize your WAR. By default, the WAR command uses [`jetty`](https://hub.docker.com/_/jetty) as the base image so the entrypoint is set to `java -jar /usr/local/jetty/start.jar`:
+1. Have your sample WAR ready and use the `war` command to containerize your WAR. By default, the WAR command uses [`jetty`](https://hub.docker.com/_/jetty) as the base image so the entrypoint is set to `java -jar /usr/local/jetty/start.jar --module=ee10-deploy`:
     ```
      $ jib war --target=docker://cli-war-quickstart <your-sample>.war
     ```

jib-cli/gradle.properties

@@ -1 +1 @@
-version = 0.12.1-SNAPSHOT
+version = 0.13.1-SNAPSHOT