Merge pull request actions#503 from gnodet/fix-xml-namespaces

Fix XML namespaces wrongly using https
WontonSam · Aug 31, 2023 · 4075bfc · 4075bfc
2 parents 5b86b67 + 91f49aa
commit 4075bfc
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/__tests__/toolchains.test.ts b/__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"
-  xmlns:xsi="https://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">
+<toolchains xmlns="http://maven.apache.org/TOOLCHAINS/1.1.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  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"
-  xmlns:xsi="https://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">
+<toolchains xmlns="http://maven.apache.org/TOOLCHAINS/1.1.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  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>

diff --git a/dist/setup/index.js b/dist/setup/index.js
@@ -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:xsi': 'https://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',
+                '@xmlns': 'http://maven.apache.org/TOOLCHAINS/1.1.0',
+                '@xmlns:xsi': 'http://www.w3.org/2001/XMLSchema-instance',
+                '@xsi:schemaLocation': 'http://maven.apache.org/TOOLCHAINS/1.1.0 https://maven.apache.org/xsd/toolchains-1.1.0.xsd',
                 toolchain: [
                     {
                         type: 'jdk',

diff --git a/src/toolchains.ts b/src/toolchains.ts
@@ -104,10 +104,10 @@ export function generateToolchainDefinition(
   } else
     xmlObj = xmlCreate({
       toolchains: {
-        '@xmlns': 'https://maven.apache.org/TOOLCHAINS/1.1.0',
-        '@xmlns:xsi': 'https://www.w3.org/2001/XMLSchema-instance',
+        '@xmlns': 'http://maven.apache.org/TOOLCHAINS/1.1.0',
+        '@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',