Merge branch 'main' into renovate/project.apache-httpcore-5.version

Author: ldetmer

.github/workflows/scorecard.yml

@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@babb554ede22fd5605947329c4d04d8e7a0b8155 # v3.27.7
+        uses: github/codeql-action/upload-sarif@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16
         with:
           sarif_file: results.sarif

.kokoro/build.sh

@@ -70,21 +70,6 @@ integration)
     RETURN_CODE=$?
     ;;
 graalvm)
-    # Run Unit and Integration Tests with Native Image
-    mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test
-    RETURN_CODE=$?
-    ;;
-graalvm17)
-    # Run Unit and Integration Tests with Native Image
-    mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test
-    RETURN_CODE=$?
-    ;;
-graalvmA)
-    # Run Unit and Integration Tests with Native Image
-    mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative,native-tests,native-deps test -pl '!google-http-client-appengine'
-    RETURN_CODE=$?
-    ;;
-graalvmB)
     # Run Unit and Integration Tests with Native Image
     mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative,native-tests,native-deps test -pl '!google-http-client-appengine'
     RETURN_CODE=$?

.kokoro/presubmit/graalvm-native-17.cfg

@@ -4,7 +4,7 @@ build_file: "google-http-java-client/.kokoro/build.sh"
 
 env_vars: {
   key: "JOB_TYPE"
-  value: "graalvmA"
+  value: "graalvm"
 }
 
 # TODO: remove this after we've migrated all tests and scripts
@@ -29,5 +29,5 @@ env_vars: {
 }
 
 container_properties {
-  docker_image: "us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_a:1.14.0"
+  docker_image: "us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_a:1.15.4"
 }

.kokoro/presubmit/graalvm-native-a.cfg

@@ -4,7 +4,7 @@ build_file: "google-http-java-client/.kokoro/build.sh"
 
 env_vars: {
   key: "JOB_TYPE"
-  value: "graalvmB"
+  value: "graalvm"
 }
 
 # TODO: remove this after we've migrated all tests and scripts
@@ -29,5 +29,5 @@ env_vars: {
 }
 
 container_properties {
-  docker_image: "us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_b:1.14.0"
+  docker_image: "us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_b:1.15.4"
 }

.kokoro/presubmit/graalvm-native-b.cfg

@@ -1,10 +1,6 @@
 # Format: //devtools/kokoro/config/proto/build.proto
 
-# Configure the docker image for kokoro-trampoline.
-env_vars: {
-  key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/graalvm:22.3.3"
-}
+build_file: "google-http-java-client/.kokoro/build.sh"
 
 env_vars: {
   key: "JOB_TYPE"
@@ -31,3 +27,7 @@ env_vars: {
   key: "SECRET_MANAGER_KEYS"
   value: "java-it-service-account"
 }
+
+container_properties {
+  docker_image: "us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_c:1.15.4"
+}

.kokoro/presubmit/graalvm-native.cfg renamed to .kokoro/presubmit/graalvm-native-c.cfg

@@ -61,7 +61,7 @@ public class PercentEscaper extends UnicodeEscaper {
    * specified in RFC 3986. Note that some of these characters do need to be escaped when used in
    * other parts of the URI.
    */
-  public static final String SAFEPATHCHARS_URLENCODER = "-_.!~*'()@:$&,;=+";
+  public static final String SAFEPATHCHARS_URLENCODER = "-_.!~*'()@:$&,;=";
 
   /**
    * A string of characters that do not need to be encoded when used in URI Templates reserved
@@ -72,7 +72,7 @@ public class PercentEscaper extends UnicodeEscaper {
    * href="https://www.rfc-editor.org/rfc/rfc6570#section-3.2.3">RFC 6570 - section 3.2.3</a>.
    */
   public static final String SAFE_PLUS_RESERVED_CHARS_URLENCODER =
-      SAFEPATHCHARS_URLENCODER + "/?#[]";
+      SAFEPATHCHARS_URLENCODER + "+/?#[]";
 
   /**
    * A string of characters that do not need to be encoded when used in URI user info part, as

google-http-client/src/main/java/com/google/api/client/util/escape/PercentEscaper.java

@@ -62,7 +62,7 @@ public void testWriteTo() throws IOException {
     subtestWriteTo(
         "multi=a&multi=b&multi=c", ArrayMap.of("multi", new String[] {"a", "b", "c"}), true);
     subtestWriteTo("username=un&password=password123;%7B%7D", params, true);
-    subtestWriteTo("additionkey=add+tion", ArrayMap.of("additionkey", "add+tion"), true);
+    subtestWriteTo("additionkey=add%2Btion", ArrayMap.of("additionkey", "add+tion"), true);
   }
 
   private void subtestWriteTo(String expected, Object data, boolean useEscapeUriPathEncoding)

google-http-client/src/test/java/com/google/api/client/http/UrlEncodedContentTest.java

@@ -93,7 +93,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>native-image-shared-config</artifactId>
-    <version>1.14.4</version>
+    <version>1.15.4</version>
   </parent>
 
   <!--