From 91f49aa1b07db98229b616da1bcb1f41cd8709df Mon Sep 17 00:00:00 2001
From: Guillaume Nodet <gnodet@gmail.com>
Date: Wed, 28 Jun 2023 11:24:07 +0200
Subject: [PATCH] Fix XML namespaces wrongly using https
---
__tests__/toolchains.test.ts | 12 ++++++------
dist/setup/index.js | 6 +++---
src/toolchains.ts | 6 +++---
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/__tests__/toolchains.test.ts b/__tests__/toolchains.test.ts
index a3feb205..483077dc 100644
--- 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
index 66a0a3c5..a80541e2 100644
--- a/dist/setup/index.js
+++ b/dist/setup/index.js
@@ -103848,9 +103848,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
index 2ed70622..cbb667eb 100644
--- 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',