Skip to content

Commit 0ab7fb5

Browse files
committed
Utilize github artifacts + CI forward ports
1 parent 5dc8b46 commit 0ab7fb5

3 files changed

Lines changed: 62 additions & 4 deletions

File tree

.github/workflows/ci.yml

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ on:
1313
# Nightly build on master (same as Jenkins: H H(17-19) * * *)
1414
- cron: '0 18 * * *'
1515

16+
permissions:
17+
packages: read
18+
1619
concurrency:
1720
group: ${{ github.workflow }}-${{ github.ref }}
1821
cancel-in-progress: true
@@ -47,6 +50,21 @@ jobs:
4750
distribution: 'temurin'
4851
cache: maven
4952

53+
- name: Configure Maven settings
54+
uses: s4u/maven-settings-action@v3.0.0
55+
with:
56+
servers: |
57+
[{
58+
"id": "codice",
59+
"username": "${{ github.actor }}",
60+
"password": "${{ secrets.READ_PACKAGES }}"
61+
},
62+
{
63+
"id": "connexta",
64+
"username": "${{ github.actor }}",
65+
"password": "${{ secrets.READ_PACKAGES }}"
66+
}]
67+
5068
- name: Quick install (skip tests)
5169
run: mvn install $MAVEN_CLI_OPTS -DskipStatic=true -DskipTests=true
5270

@@ -80,6 +98,21 @@ jobs:
8098
distribution: 'temurin'
8199
cache: maven
82100

101+
- name: Configure Maven settings
102+
uses: s4u/maven-settings-action@v3.0.0
103+
with:
104+
servers: |
105+
[{
106+
"id": "codice",
107+
"username": "${{ github.actor }}",
108+
"password": "${{ secrets.READ_PACKAGES }}"
109+
},
110+
{
111+
"id": "connexta",
112+
"username": "${{ github.actor }}",
113+
"password": "${{ secrets.READ_PACKAGES }}"
114+
}]
115+
83116
- name: Full build (excluding itests)
84117
run: mvn clean install $MAVEN_CLI_OPTS -P !itests
85118

@@ -148,6 +181,21 @@ jobs:
148181
distribution: 'temurin'
149182
cache: maven
150183

184+
- name: Configure Maven settings
185+
uses: s4u/maven-settings-action@v3.0.0
186+
with:
187+
servers: |
188+
[{
189+
"id": "codice",
190+
"username": "${{ github.actor }}",
191+
"password": "${{ secrets.READ_PACKAGES }}"
192+
},
193+
{
194+
"id": "connexta",
195+
"username": "${{ github.actor }}",
196+
"password": "${{ secrets.READ_PACKAGES }}"
197+
}]
198+
151199
- name: OWASP Dependency Check
152200
run: |
153201
if [ "${{ github.event_name }}" != "pull_request" ]; then
@@ -220,6 +268,8 @@ jobs:
220268
needs.dependency-check.result == 'success'
221269
runs-on: ubuntu-latest
222270
environment: production
271+
permissions:
272+
packages: write
223273
steps:
224274
- name: Checkout
225275
uses: actions/checkout@v4

catalog/spatial/kml/spatial-kml-transformer/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
</dependency>
3636
<dependency>
3737
<groupId>de.micromata.jak</groupId>
38-
<artifactId>JavaAPIforKml</artifactId>
38+
<artifactId>javaapiforkml</artifactId>
3939
<version>${JavaAPIforKml.version}</version>
4040
</dependency>
4141
<dependency>

pom.xml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@
180180
<commons-text.version>1.13.0</commons-text.version>
181181
<commons-validator.version>1.6</commons-validator.version>
182182
<components-font-awesome.version>4.7.0</components-font-awesome.version>
183-
<countryconverter.version>0.2.3</countryconverter.version>
183+
<countryconverter.version>0.2.4</countryconverter.version>
184184
<cryptomator.version>1.5.2</cryptomator.version>
185185
<cxf.version>3.6.7</cxf.version>
186186
<decanter.version>2.9.0</decanter.version>
@@ -1547,7 +1547,10 @@
15471547
<repository>
15481548
<id>codice</id>
15491549
<name>Codice Repository</name>
1550-
<url>https://artifacts.codice.org/content/groups/public/</url>
1550+
<url>https://maven.pkg.github.com/codice/*</url>
1551+
<snapshots>
1552+
<enabled>false</enabled>
1553+
</snapshots>
15511554
</repository>
15521555
<repository>
15531556
<id>osgeo</id>
@@ -1568,7 +1571,12 @@
15681571
<pluginRepository>
15691572
<id>codice</id>
15701573
<name>Codice Repository</name>
1571-
<url>https://artifacts.codice.org/content/groups/public/</url>
1574+
<url>https://maven.pkg.github.com/codice/*</url>
1575+
</pluginRepository>
1576+
<pluginRepository>
1577+
<id>connexta</id>
1578+
<name>Codice Repository</name>
1579+
<url>https://maven.pkg.github.com/connexta/*</url>
15721580
</pluginRepository>
15731581
</pluginRepositories>
15741582
<modules>

0 commit comments

Comments
 (0)