Merge a630a8d9a2 into 4075bfc1b5

Fix XML namespaces wrongly using https

__tests__/cache.test.ts

@@ -85,7 +85,7 @@ describe('dependency cache', () => {
         await expect(restore('maven')).rejects.toThrow(
           `No file in ${projectRoot(
             workspace
-          )} matched to [**/pom.xml], make sure you have checked out the target repository`
+          )} matched to [**/pom.xml,.mvn/wrapper/maven-wrapper.properties], make sure you have checked out the target repository`
         );
       });
       it('downloads cache', async () => {

__tests__/toolchains.test.ts

@@ -77,9 +77,9 @@ describe('toolchains tests', () => {
     };
 
     const result = `<?xml version="1.0"?>
-<toolchains xmlns="https://maven.apache.org/TOOLCHAINS/1.1.0"
+<toolchains xmlns="http://maven.apache.org/TOOLCHAINS/1.1.0"
-  xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="https://maven.apache.org/TOOLCHAINS/1.1.0 https://maven.apache.org/xsd/toolchains-1.1.0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/TOOLCHAINS/1.1.0 https://maven.apache.org/xsd/toolchains-1.1.0.xsd">
   <toolchain>
     <type>jdk</type>
     <provides>
@@ -248,9 +248,9 @@ describe('toolchains tests', () => {
     };
 
     const expectedToolchains = `<?xml version="1.0"?>
-<toolchains xmlns="https://maven.apache.org/TOOLCHAINS/1.1.0"
+<toolchains xmlns="http://maven.apache.org/TOOLCHAINS/1.1.0"
-  xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="https://maven.apache.org/TOOLCHAINS/1.1.0 https://maven.apache.org/xsd/toolchains-1.1.0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/TOOLCHAINS/1.1.0 https://maven.apache.org/xsd/toolchains-1.1.0.xsd">
   <toolchain>
     <type>jdk</type>
     <provides>

dist/cleanup/index.js

@@ -66616,9 +66616,9 @@ const CACHE_KEY_PREFIX = 'setup-java';
 const supportedPackageManager = [
     {
         id: 'maven',
-        path: [path_1.join(os_1.default.homedir(), '.m2', 'repository')],
+        path: [path_1.join(os_1.default.homedir(), '.m2', 'repository'), path_1.join(os_1.default.homedir(), '.m2', 'wrapper', 'dists')],
         // https://github.com/actions/cache/blob/0638051e9af2c23d10bb70fa9beffcad6cff9ce3/examples.md#java---maven
-        pattern: ['**/pom.xml']
+        pattern: ['**/pom.xml', '.mvn/wrapper/maven-wrapper.properties']
     },
     {
         id: 'gradle',

dist/setup/index.js

@@ -101821,9 +101821,9 @@ const CACHE_KEY_PREFIX = 'setup-java';
 const supportedPackageManager = [
     {
         id: 'maven',
-        path: [path_1.join(os_1.default.homedir(), '.m2', 'repository')],
+        path: [path_1.join(os_1.default.homedir(), '.m2', 'repository'), path_1.join(os_1.default.homedir(), '.m2', 'wrapper', 'dists')],
         // https://github.com/actions/cache/blob/0638051e9af2c23d10bb70fa9beffcad6cff9ce3/examples.md#java---maven
-        pattern: ['**/pom.xml']
+        pattern: ['**/pom.xml', '.mvn/wrapper/maven-wrapper.properties']
     },
     {
         id: 'gradle',
@@ -103974,9 +103974,9 @@ function generateToolchainDefinition(original, version, vendor, id, jdkHome) {
     else
         xmlObj = xmlbuilder2_1.create({
             toolchains: {
-                '@xmlns': 'https://maven.apache.org/TOOLCHAINS/1.1.0',
+                '@xmlns': 'http://maven.apache.org/TOOLCHAINS/1.1.0',
-                '@xmlns:xsi': 'https://www.w3.org/2001/XMLSchema-instance',
+                '@xmlns:xsi': 'http://www.w3.org/2001/XMLSchema-instance',
-                '@xsi:schemaLocation': 'https://maven.apache.org/TOOLCHAINS/1.1.0 https://maven.apache.org/xsd/toolchains-1.1.0.xsd',
+                '@xsi:schemaLocation': 'http://maven.apache.org/TOOLCHAINS/1.1.0 https://maven.apache.org/xsd/toolchains-1.1.0.xsd',
                 toolchain: [
                     {
                         type: 'jdk',

src/cache.ts

@@ -23,9 +23,9 @@ interface PackageManager {
 const supportedPackageManager: PackageManager[] = [
   {
     id: 'maven',
-    path: [join(os.homedir(), '.m2', 'repository')],
+    path: [join(os.homedir(), '.m2', 'repository'), join(os.homedir(), '.m2', 'wrapper', 'dists')],
     // https://github.com/actions/cache/blob/0638051e9af2c23d10bb70fa9beffcad6cff9ce3/examples.md#java---maven
-    pattern: ['**/pom.xml']
+    pattern: ['**/pom.xml', '.mvn/wrapper/maven-wrapper.properties']
   },
   {
     id: 'gradle',

src/toolchains.ts

@@ -104,10 +104,10 @@ export function generateToolchainDefinition(
   } else
     xmlObj = xmlCreate({
       toolchains: {
-        '@xmlns': 'https://maven.apache.org/TOOLCHAINS/1.1.0',
+        '@xmlns': 'http://maven.apache.org/TOOLCHAINS/1.1.0',
-        '@xmlns:xsi': 'https://www.w3.org/2001/XMLSchema-instance',
+        '@xmlns:xsi': 'http://www.w3.org/2001/XMLSchema-instance',
         '@xsi:schemaLocation':
-          'https://maven.apache.org/TOOLCHAINS/1.1.0 https://maven.apache.org/xsd/toolchains-1.1.0.xsd',
+          'http://maven.apache.org/TOOLCHAINS/1.1.0 https://maven.apache.org/xsd/toolchains-1.1.0.xsd',
         toolchain: [
           {
             type: 'jdk',