mirror of
https://github.com/actions/setup-java.git
synced 2024-08-26 14:17:20 -04:00
Merge pull request #503 from gnodet/fix-xml-namespaces
Fix XML namespaces wrongly using https
This commit is contained in:
commit
4075bfc1b5
3 changed files with 12 additions and 12 deletions
|
@ -77,9 +77,9 @@ describe('toolchains tests', () => {
|
||||||
};
|
};
|
||||||
|
|
||||||
const result = `<?xml version="1.0"?>
|
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>
|
<toolchain>
|
||||||
<type>jdk</type>
|
<type>jdk</type>
|
||||||
<provides>
|
<provides>
|
||||||
|
@ -248,9 +248,9 @@ describe('toolchains tests', () => {
|
||||||
};
|
};
|
||||||
|
|
||||||
const expectedToolchains = `<?xml version="1.0"?>
|
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>
|
<toolchain>
|
||||||
<type>jdk</type>
|
<type>jdk</type>
|
||||||
<provides>
|
<provides>
|
||||||
|
|
6
dist/setup/index.js
vendored
6
dist/setup/index.js
vendored
|
@ -103974,9 +103974,9 @@ function generateToolchainDefinition(original, version, vendor, id, jdkHome) {
|
||||||
else
|
else
|
||||||
xmlObj = xmlbuilder2_1.create({
|
xmlObj = xmlbuilder2_1.create({
|
||||||
toolchains: {
|
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: [
|
toolchain: [
|
||||||
{
|
{
|
||||||
type: 'jdk',
|
type: 'jdk',
|
||||||
|
|
|
@ -104,10 +104,10 @@ export function generateToolchainDefinition(
|
||||||
} else
|
} else
|
||||||
xmlObj = xmlCreate({
|
xmlObj = xmlCreate({
|
||||||
toolchains: {
|
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':
|
'@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: [
|
toolchain: [
|
||||||
{
|
{
|
||||||
type: 'jdk',
|
type: 'jdk',
|
||||||
|
|
Loading…
Reference in a new issue