Skip to content

Commit 4075bfc

Browse files
Merge pull request #503 from gnodet/fix-xml-namespaces
Fix XML namespaces wrongly using https
2 parents 5b86b67 + 91f49aa commit 4075bfc

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

__tests__/toolchains.test.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@ describe('toolchains tests', () => {
7777
};
7878

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

250250
const expectedToolchains = `<?xml version="1.0"?>
251-
<toolchains xmlns="https://maven.apache.org/TOOLCHAINS/1.1.0"
252-
xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
253-
xsi:schemaLocation="https://maven.apache.org/TOOLCHAINS/1.1.0 https://maven.apache.org/xsd/toolchains-1.1.0.xsd">
251+
<toolchains xmlns="http://maven.apache.org/TOOLCHAINS/1.1.0"
252+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
253+
xsi:schemaLocation="http://maven.apache.org/TOOLCHAINS/1.1.0 https://maven.apache.org/xsd/toolchains-1.1.0.xsd">
254254
<toolchain>
255255
<type>jdk</type>
256256
<provides>

dist/setup/index.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -103974,9 +103974,9 @@ function generateToolchainDefinition(original, version, vendor, id, jdkHome) {
103974103974
else
103975103975
xmlObj = xmlbuilder2_1.create({
103976103976
toolchains: {
103977-
'@xmlns': 'https://maven.apache.org/TOOLCHAINS/1.1.0',
103978-
'@xmlns:xsi': 'https://www.w3.org/2001/XMLSchema-instance',
103979-
'@xsi:schemaLocation': 'https://maven.apache.org/TOOLCHAINS/1.1.0 https://maven.apache.org/xsd/toolchains-1.1.0.xsd',
103977+
'@xmlns': 'http://maven.apache.org/TOOLCHAINS/1.1.0',
103978+
'@xmlns:xsi': 'http://www.w3.org/2001/XMLSchema-instance',
103979+
'@xsi:schemaLocation': 'http://maven.apache.org/TOOLCHAINS/1.1.0 https://maven.apache.org/xsd/toolchains-1.1.0.xsd',
103980103980
toolchain: [
103981103981
{
103982103982
type: 'jdk',

src/toolchains.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,10 @@ export function generateToolchainDefinition(
104104
} else
105105
xmlObj = xmlCreate({
106106
toolchains: {
107-
'@xmlns': 'https://maven.apache.org/TOOLCHAINS/1.1.0',
108-
'@xmlns:xsi': 'https://www.w3.org/2001/XMLSchema-instance',
107+
'@xmlns': 'http://maven.apache.org/TOOLCHAINS/1.1.0',
108+
'@xmlns:xsi': 'http://www.w3.org/2001/XMLSchema-instance',
109109
'@xsi:schemaLocation':
110-
'https://maven.apache.org/TOOLCHAINS/1.1.0 https://maven.apache.org/xsd/toolchains-1.1.0.xsd',
110+
'http://maven.apache.org/TOOLCHAINS/1.1.0 https://maven.apache.org/xsd/toolchains-1.1.0.xsd',
111111
toolchain: [
112112
{
113113
type: 'jdk',

0 commit comments

Comments
 (0)