Skip to content

Commit d12dfca

Browse files
committed
update pom, more fixes
1 parent ace62ab commit d12dfca

File tree

2 files changed

+19
-2
lines changed

2 files changed

+19
-2
lines changed

.github/workflows/deploy.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ on:
77
branches:
88
- master
99
env:
10+
JFROG_USER: ${{ secrets.ARTIFACTORY_AUTH_USER }}
11+
JFROG_PASS: ${{ secrets.ARTIFACTORY_AUTH_TOKEN }}
1012
SONATYPE_GPG_KEY_BASE64: ${{ secrets.SONATYPE_GPG_KEY_BASE64 }}
1113
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
1214
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
@@ -20,6 +22,9 @@ jobs:
2022
- uses: actions/checkout@v4
2123
with:
2224
fetch-depth: 0
25+
- name: Copy maven settings
26+
run: |
27+
wget https://raw.githubusercontent.com/entur/ror-maven-settings/master/.m2/settings.xml -O .github/workflows/settings.xml
2328
- uses: actions/setup-java@v4
2429
with:
2530
java-version: 17.0.13
@@ -35,14 +40,14 @@ jobs:
3540
${{ runner.os }}-
3641
3742
- name: Run maven build
38-
run: mvn verify
43+
run: mvn verify -s .github/workflows/settings.xml
3944
- name: Sonar Scan
4045
env:
4146
SONAR_TOKEN: ${{ secrets.ENTUR_SONAR_PASSWORD }}
4247
SONAR_PROJECT_NAME: ${{ github.event.repository.name }}
4348
SONAR_PROJECT_KEY: entur_${{ github.event.repository.name }}
4449
run: |
45-
mvn -Psonar \
50+
mvn -Psonar -s .github/workflows/settings.xml \
4651
sonar:sonar \
4752
-Dsonar.projectKey=${SONAR_PROJECT_KEY} \
4853
-Dsonar.organization=enturas-github \

pom.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,18 @@
1717
<properties>
1818
<jreleaser-maven-plugin.version>1.18.0</jreleaser-maven-plugin.version>
1919
</properties>
20+
<distributionManagement>
21+
<repository>
22+
<id>central</id>
23+
<name>entur2-releases</name>
24+
<url>https://entur2.jfrog.io/entur2/libs-release-local</url>
25+
</repository>
26+
<snapshotRepository>
27+
<id>snapshots</id>
28+
<name>entur2-snapshots</name>
29+
<url>https://entur2.jfrog.io/entur2/libs-snapshot-local</url>
30+
</snapshotRepository>
31+
</distributionManagement>
2032
<build>
2133
<plugins>
2234
<plugin>

0 commit comments

Comments
 (0)