Merge branch 'master' into feat/image-name-and-tag-with-digest-file

hocinehacherouf · web-flow · commit 29c5deb7166f · 2025-10-16T19:00:40.000+02:00
diff --git a/docs/README.md b/docs/README.md
diff --git a/docs/_config.yml b/docs/_config.yml
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.5</jib-maven-plugin.version>
+        <jib-maven-plugin.version>3.4.6</jib-maven-plugin.version>
     </properties>
 
     <dependencyManagement>
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.5</jib-maven-plugin.version>
+    <jib-maven-plugin.version>3.4.6</jib-maven-plugin.version>
     <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
   </properties>
 
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.5</jib-maven-plugin.version>
+    <jib-maven-plugin.version>3.4.6</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/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.5</version>
+          <version>3.4.6</version>
         </plugin>
       </plugins>
     </pluginManagement>
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.5</version>
+                <version>3.4.6</version>
             </plugin>
         </plugins>
     </build>
diff --git a/jib-maven-plugin/CHANGELOG.md b/jib-maven-plugin/CHANGELOG.md
@@ -9,6 +9,11 @@ All notable changes to this project will be documented in this file.
 
 ### Fixed
 
+## 3.4.6
+
+### Changed
+- Update retrieval of Maven properties to use the following order: user, project, system [#4344](https://github.com/GoogleContainerTools/jib/issues/4344)
+
 ## 3.4.5
 
 ### Fixed
diff --git a/jib-maven-plugin/README.md b/jib-maven-plugin/README.md
@@ -27,7 +27,7 @@ For information about the project, see the [Jib project README](../README.md).
   * [Additional Build Artifacts](#additional-build-artifacts)
 * [Multi Module Projects](#multi-module-projects)
 * [Extended Usage](#extended-usage)
-  * [System Properties](#system-properties)
+  * [Configuration Properties](#configuration-properties)
   * [Global Jib Configuration](#global-jib-configuration)
   * [Example](#example)
   * [Adding Arbitrary Files to the Image](#adding-arbitrary-files-to-the-image)
@@ -48,15 +48,15 @@ For information about the project, see the [Jib project README](../README.md).
 You can containerize your application easily with one command:
 
 ```shell
-mvn compile com.google.cloud.tools:jib-maven-plugin:3.4.5:build -Dimage=<MY IMAGE>
+mvn compile com.google.cloud.tools:jib-maven-plugin:3.4.6:build -Dimage=<MY IMAGE>
 ```
 
 This builds and pushes a container image for your application to a container registry. *If you encounter authentication issues, see [Authentication Methods](#authentication-methods).*
 
 To build to a Docker daemon, use:
 
 ```shell
-mvn compile com.google.cloud.tools:jib-maven-plugin:3.4.5:dockerBuild
+mvn compile com.google.cloud.tools:jib-maven-plugin:3.4.6:dockerBuild
 ```
 
 If you would like to set up Jib as part of your Maven build, follow the guide below.
@@ -74,7 +74,7 @@ In your Maven Java project, add the plugin to your `pom.xml`:
       <plugin>
         <groupId>com.google.cloud.tools</groupId>
         <artifactId>jib-maven-plugin</artifactId>
-        <version>3.4.5</version>
+        <version>3.4.6</version>
         <configuration>
           <to>
             <image>myimage</image>
@@ -345,9 +345,9 @@ Property | Type | Default | Description
 `executable` | string | `docker` | Sets the path to the Docker executable that is called to load the image into the Docker daemon. **Please note**: Users are responsible for ensuring that the Docker path passed in is valid and has the right permissions to be executed.
 `environment` | map | *None* | Sets environment variables used by the Docker executable.
 
-#### System Properties
+#### Configuration Properties
 
-Each of these parameters is configurable via commandline using system properties. Jib's system properties follow the same naming convention as the configuration parameters, with each level separated by dots (i.e. `-Djib.parameterName[.nestedParameter.[...]]=value`). Some examples are below:
+Each of these parameters is configurable via commandline using properties. Jib's properties follow the same naming convention as the configuration parameters, with each level separated by dots (i.e. `-Djib.parameterName[.nestedParameter.[...]]=value`). Some examples are below:
 ```shell
 mvn compile jib:build \
     -Djib.to.image=myregistry/myimage:latest \
@@ -360,7 +360,7 @@ mvn compile jib:dockerBuild \
     -Djib.container.args=arg1,arg2,arg3
 ```
 
-The following table contains additional system properties that are not available as build configuration parameters:
+The following table contains additional properties that are not available as build configuration parameters:
 
 Property | Type | Default | Description
 --- | --- | --- | ---
diff --git a/jib-maven-plugin/gradle.properties b/jib-maven-plugin/gradle.properties
@@ -1 +1 @@
-version = 3.4.6-SNAPSHOT
+version = 3.4.7-SNAPSHOT
diff --git a/jib-maven-plugin/src/main/java/com/google/cloud/tools/jib/maven/MavenProjectProperties.java b/jib-maven-plugin/src/main/java/com/google/cloud/tools/jib/maven/MavenProjectProperties.java
@@ -132,23 +132,27 @@ public static MavenProjectProperties getForProject(
   }
 
   /**
-   * Gets a system property with the given name. First checks for a -D commandline argument, then
-   * checks for a property defined in the POM, then returns null if neither are defined.
+   * Gets a property with the given name. First checks for a Maven user property (-D commandline
+   * argument), then checks for a property defined in the POM, then checks for a Maven system
+   * property, then returns null if none of those are defined.
    *
-   * @param propertyName the name of the system property
+   * @param propertyName the name of the property
    * @param project the Maven project
    * @param session the Maven session
-   * @return the value of the system property, or null if not defined
+   * @return the value of the property, or null if not defined
    */
   @Nullable
   public static String getProperty(
       String propertyName, @Nullable MavenProject project, @Nullable MavenSession session) {
-    if (session != null && session.getSystemProperties().containsKey(propertyName)) {
-      return session.getSystemProperties().getProperty(propertyName);
+    if (session != null && session.getUserProperties().containsKey(propertyName)) {
+      return session.getUserProperties().getProperty(propertyName);
     }
     if (project != null && project.getProperties().containsKey(propertyName)) {
       return project.getProperties().getProperty(propertyName);
     }
+    if (session != null && session.getSystemProperties().containsKey(propertyName)) {
+      return session.getSystemProperties().getProperty(propertyName);
+    }
     return null;
   }
 
diff --git a/jib-maven-plugin/src/test/java/com/google/cloud/tools/jib/maven/JibPluginConfigurationTest.java b/jib-maven-plugin/src/test/java/com/google/cloud/tools/jib/maven/JibPluginConfigurationTest.java

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-version = 3.4.6-SNAPSHOT`
	`1`	`+version = 3.4.7-SNAPSHOT`