Merge branch 'master' into dependabot/gradle/org.apache.maven-maven-c…

…ompat-3.9.4
GoogleContainerTools · Sep 8, 2023 · 562e2e8 · 562e2e8
2 parents 3201f63 + 54e5c0f
commit 562e2e8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -75,6 +75,10 @@ To run select integration tests, use `--tests=<testPattern>`, see [gradle docs](
 
 # Development Tips
 
+## Java version
+
+Use Java 8 or 11 for development. https://sdkman.io/ is a helpful tool to switch between Java versions.
+
 ## Configuring Eclipse
 
 Although jib is a mix of Gradle and Maven projects, we build everything using one

diff --git a/build.gradle b/build.gradle
@@ -53,7 +53,7 @@ project.ext.dependencyStrings = [
   MOCKITO_CORE: 'org.mockito:mockito-core:4.11.0',
   SISU_PLEXUS: 'org.eclipse.sisu:org.eclipse.sisu.plexus:0.3.5',
   SLF4J_API: 'org.slf4j:slf4j-api:2.0.7',
-  SLF4J_SIMPLE: 'org.slf4j:slf4j-simple:2.0.7',
+  SLF4J_SIMPLE: 'org.slf4j:slf4j-simple:2.0.9',
   SYSTEM_RULES:  'com.github.stefanbirkner:system-rules:1.19.0',
   JBCRYPT: 'org.mindrot:jbcrypt:0.4',
 ]

diff --git a/jib-cli/src/test/java/com/google/cloud/tools/jib/cli/JarTest.java b/jib-cli/src/test/java/com/google/cloud/tools/jib/cli/JarTest.java
@@ -434,7 +434,7 @@ public void testParse_incompatibleCredentialOptions(String[] authArgs) {
                     new Jar(), ArrayUtils.addAll(authArgs, "--target=ignored", "my-app.jar")));
     assertThat(meae)
         .hasMessageThat()
-        .containsMatch("^Error: (--(from-|to-)?credential-helper|\\[--username)");
+        .containsMatch("^Error: (\\[)*(--(from-|to-)?credential-helper|\\[--(username|password))");
   }
 
   @Test