Skip to content

Commit 838b59f

Browse files
tsachevtsachev
committed
produce valid settings.xml
1 parent e61056a commit 838b59f

6 files changed

Lines changed: 63 additions & 39 deletions

File tree

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ steps:
1515
- name: Checkout
1616
uses: actions/checkout@v4
1717
- name: Run Setup Codeartifact
18-
uses: InteropIO/setup-codeartifact@v1
18+
uses: InteropIO/setup-codeartifact@v1.1
1919
with:
2020
domain: '<domain>'
2121
domain-owner: "<domain-owner>"

‎__tests__/maven.test.ts‎

Lines changed: 45 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,14 @@ describe('maven.ts', () => {
1919
.toEqual(`<settings xmlns="http://maven.apache.org/SETTINGS/1.2.0"
2020
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2121
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.2.0 https://maven.apache.org/xsd/settings-1.2.0.xsd">
22+
<profiles>
23+
<profile>
24+
<id>aws</id>
25+
</profile>
26+
</profiles>
27+
<activeProfiles>
28+
<activeProfile>aws</activeProfile>
29+
</activeProfiles>
2230
<servers>
2331
<server>
2432
<id>codeartifact</id>
@@ -49,35 +57,43 @@ describe('maven.ts', () => {
4957
.toEqual(`<settings xmlns="http://maven.apache.org/SETTINGS/1.2.0"
5058
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5159
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.2.0 https://maven.apache.org/xsd/settings-1.2.0.xsd">
52-
<repositories>
53-
<repository>
54-
<id>maven-release</id>
55-
<snapshots>
56-
<enabled>false</enabled>
57-
</snapshots>
58-
<url>https://interopio-389653476181.d.codeartifact.eu-central-1.amazonaws.com/maven/maven-release/</url>
59-
</repository>
60-
<repository>
61-
<id>maven-snapshot</id>
62-
<snapshots>
63-
<enabled>true</enabled>
64-
</snapshots>
65-
<url>https://interopio-389653476181.d.codeartifact.eu-central-1.amazonaws.com/maven/maven-snapshot/</url>
66-
</repository>
67-
<repository>
68-
<id>clojars</id>
69-
<url>https://repo.clojars.org</url>
70-
</repository>
71-
</repositories>
72-
<pluginRepositories>
73-
<pluginRepository>
74-
<id>maven-release</id>
75-
<snapshots>
76-
<enabled>false</enabled>
77-
</snapshots>
78-
<url>https://interopio-389653476181.d.codeartifact.eu-central-1.amazonaws.com/maven/maven-release/</url>
79-
</pluginRepository>
80-
</pluginRepositories>
60+
<profiles>
61+
<profile>
62+
<id>aws</id>
63+
<repositories>
64+
<repository>
65+
<id>maven-release</id>
66+
<snapshots>
67+
<enabled>false</enabled>
68+
</snapshots>
69+
<url>https://interopio-389653476181.d.codeartifact.eu-central-1.amazonaws.com/maven/maven-release/</url>
70+
</repository>
71+
<repository>
72+
<id>maven-snapshot</id>
73+
<snapshots>
74+
<enabled>true</enabled>
75+
</snapshots>
76+
<url>https://interopio-389653476181.d.codeartifact.eu-central-1.amazonaws.com/maven/maven-snapshot/</url>
77+
</repository>
78+
<repository>
79+
<id>clojars</id>
80+
<url>https://repo.clojars.org</url>
81+
</repository>
82+
</repositories>
83+
<pluginRepositories>
84+
<pluginRepository>
85+
<id>maven-release</id>
86+
<snapshots>
87+
<enabled>false</enabled>
88+
</snapshots>
89+
<url>https://interopio-389653476181.d.codeartifact.eu-central-1.amazonaws.com/maven/maven-release/</url>
90+
</pluginRepository>
91+
</pluginRepositories>
92+
</profile>
93+
</profiles>
94+
<activeProfiles>
95+
<activeProfile>aws</activeProfile>
96+
</activeProfiles>
8197
</settings>`)
8298
})
8399
})

‎dist/index.js‎

Lines changed: 7 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package-lock.json‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "setup-codeartifact",
33
"description": "GitHub Action for CodeArtifact",
4-
"version": "1.0.0",
4+
"version": "1.1.0",
55
"author": "",
66
"private": true,
77
"homepage": "https://github.com/InteropIO/setup-codeartifact#readme",

‎src/maven.ts‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,9 @@ export function settings(
5858
'@xmlns': 'http://maven.apache.org/SETTINGS/1.2.0',
5959
'@xmlns:xsi': 'http://www.w3.org/2001/XMLSchema-instance',
6060
'@xsi:schemaLocation':
61-
'http://maven.apache.org/SETTINGS/1.2.0 https://maven.apache.org/xsd/settings-1.2.0.xsd'
61+
'http://maven.apache.org/SETTINGS/1.2.0 https://maven.apache.org/xsd/settings-1.2.0.xsd',
62+
profiles: { profile: [{ id: 'aws' }] },
63+
activeProfiles: { activeProfile: ['aws'] }
6264
}
6365
}
6466
if (maven.repositories) {
@@ -70,7 +72,7 @@ export function settings(
7072
return repository
7173
}
7274
)
73-
xml.settings.repositories = { repository: repositories }
75+
xml.settings.profiles.profile[0].repositories = { repository: repositories }
7476
}
7577

7678
if (maven.pluginRepositories) {
@@ -82,7 +84,9 @@ export function settings(
8284
return repository
8385
}
8486
)
85-
xml.settings.pluginRepositories = { pluginRepository: pluginRepositories }
87+
xml.settings.profiles.profile[0].pluginRepositories = {
88+
pluginRepository: pluginRepositories
89+
}
8690
}
8791

8892
if (maven.servers) {

0 commit comments

Comments
 (0)