Skip to content

Commit 4ea14f0

Browse files
author
Philipp Karlsson
committed
Cleanup comments, use mvn wrapper in pipelines
1 parent 478d2e0 commit 4ea14f0

File tree

3 files changed

+22
-23
lines changed

3 files changed

+22
-23
lines changed

‎.github/workflows/default.yml‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
uses: actions/setup-java@v3
3838
with:
3939
java-version: '17'
40-
distribution: 'adopt'
40+
distribution: 'corretto'
4141

4242
- name: Extract and Set Release Version
4343
if: ${{ github.event_name == 'release' }}
@@ -46,10 +46,10 @@ jobs:
4646
VERSION=$(git describe --tags | cut -d v -f2)
4747
echo "Detected version = $VERSION"
4848
echo "version=$VERSION" >> $GITHUB_OUTPUT
49-
mvn -B versions:set "-DnewVersion=$VERSION" "-Djira.service.management.license=${{ secrets.JSM_DC_DEMO_LICENSE }}" "-Dconfluence.license=${{ secrets.CONFLUENCE_DC_DEMO_LICENSE }}"
49+
./mvnw -B versions:set "-DnewVersion=$VERSION" "-Djira.service.management.license=${{ secrets.JSM_DC_DEMO_LICENSE }}" "-Dconfluence.license=${{ secrets.CONFLUENCE_DC_DEMO_LICENSE }}"
5050
5151
- name: Build libraries
52-
run: mvn package -T 2 -Pci "-Djira.service.management.license=${{ secrets.JSM_DC_DEMO_LICENSE }}" "-Dconfluence.license=${{ secrets.CONFLUENCE_DC_DEMO_LICENSE }}"
52+
run: ./mvnw package -T 2 -Pci "-Djira.service.management.license=${{ secrets.JSM_DC_DEMO_LICENSE }}" "-Dconfluence.license=${{ secrets.CONFLUENCE_DC_DEMO_LICENSE }}"
5353

5454
# JIRA
5555
# -------------------------------------------------------
@@ -82,17 +82,17 @@ jobs:
8282
id: extract-version
8383
run: |
8484
VERSION="${{ needs.build.outputs.version }}"
85-
mvn -B versions:set "-DnewVersion=$VERSION" "-Djira.service.management.license=${{ secrets.JSM_DC_DEMO_LICENSE }}" "-Dconfluence.license=${{ secrets.CONFLUENCE_DC_DEMO_LICENSE }}"
85+
./mvnw -B versions:set "-DnewVersion=$VERSION" "-Djira.service.management.license=${{ secrets.JSM_DC_DEMO_LICENSE }}" "-Dconfluence.license=${{ secrets.CONFLUENCE_DC_DEMO_LICENSE }}"
8686
8787
- name: Startup Jira and Insight
8888
# Loop is needed to prevent Jira from suspension
89-
run: (while true; do sleep 10000; done) | mvn jira:debug -Pitest-jira,-insight-itest-applink,-insight-itest-sdk,-insight-itest-ktor,-jira-itest-applink,-jira-itest-ktor,-jira-itest-sdk "-Djira.service.management.license=${{ secrets.JSM_DC_DEMO_LICENSE }}" "-Dconfluence.license=${{ secrets.CONFLUENCE_DC_DEMO_LICENSE }}" "-Dbaseurl=http://localhost:2990" &
89+
run: (while true; do sleep 10000; done) | ./mvnw jira:debug -Pitest-jira,-insight-itest-applink,-insight-itest-sdk,-insight-itest-ktor,-jira-itest-applink,-jira-itest-ktor,-jira-itest-sdk "-Djira.service.management.license=${{ secrets.JSM_DC_DEMO_LICENSE }}" "-Dconfluence.license=${{ secrets.CONFLUENCE_DC_DEMO_LICENSE }}" "-Dbaseurl=http://localhost:2990" &
9090

9191
- name: Wait for Jira and Insight
9292
run: ./scripts/wait-for-jira.sh
9393

9494
- name: Integration tests using ktor
95-
run: mvn -B verify -Pjira-itest-ktor,jira-ci-ktor,-jira-itest-applink,-jira-itest-sdk,-insight-itest-applink,-insight-itest-sdk,-insight-itest-ktor "-Djira.service.management.license=${{ secrets.JSM_DC_DEMO_LICENSE }}" "-Dconfluence.license=${{ secrets.CONFLUENCE_DC_DEMO_LICENSE }}"
95+
run: ./mvnw -B verify -Pjira-itest-ktor,jira-ci-ktor,-jira-itest-applink,-jira-itest-sdk,-insight-itest-applink,-insight-itest-sdk,-insight-itest-ktor "-Djira.service.management.license=${{ secrets.JSM_DC_DEMO_LICENSE }}" "-Dconfluence.license=${{ secrets.CONFLUENCE_DC_DEMO_LICENSE }}"
9696

9797
kotlin-jira-client-test-applink:
9898
runs-on: ubuntu-24.04
@@ -194,10 +194,10 @@ jobs:
194194
id: extract-version
195195
run: |
196196
VERSION="${{ needs.build.outputs.version }}"
197-
mvn -B versions:set "-DnewVersion=$VERSION" "-Djira.service.management.license=${{ secrets.JSM_DC_DEMO_LICENSE }}" "-Dconfluence.license=${{ secrets.CONFLUENCE_DC_DEMO_LICENSE }}"
197+
./mvnw -B versions:set "-DnewVersion=$VERSION" "-Djira.service.management.license=${{ secrets.JSM_DC_DEMO_LICENSE }}" "-Dconfluence.license=${{ secrets.CONFLUENCE_DC_DEMO_LICENSE }}"
198198
199199
- name: Integration tests using sdk
200-
run: mvn clean -B verify -Pjira-itest-sdk,jira-ci-sdk,-jira-itest-applink,-jira-itest-ktor,-insight-itest-sdk,-insight-itest-applink,-insight-itest-ktor "-Djira.service.management.license=${{ secrets.JSM_DC_DEMO_LICENSE }}" "-Dconfluence.license=${{ secrets.CONFLUENCE_DC_DEMO_LICENSE }}" "-Dbaseurl=http://localhost:2990"
200+
run: ./mvnw clean -B verify -Pjira-itest-sdk,jira-ci-sdk,-jira-itest-applink,-jira-itest-ktor,-insight-itest-sdk,-insight-itest-applink,-insight-itest-ktor "-Djira.service.management.license=${{ secrets.JSM_DC_DEMO_LICENSE }}" "-Dconfluence.license=${{ secrets.CONFLUENCE_DC_DEMO_LICENSE }}" "-Dbaseurl=http://localhost:2990"
201201

202202
# INSIGHT
203203
# -------------------------------------------------------
@@ -230,17 +230,17 @@ jobs:
230230
id: extract-version
231231
run: |
232232
VERSION="${{ needs.build.outputs.version }}"
233-
mvn -B versions:set "-DnewVersion=$VERSION" "-Djira.service.management.license=${{ secrets.JSM_DC_DEMO_LICENSE }}" "-Dconfluence.license=${{ secrets.CONFLUENCE_DC_DEMO_LICENSE }}"
233+
./mvnw -B versions:set "-DnewVersion=$VERSION" "-Djira.service.management.license=${{ secrets.JSM_DC_DEMO_LICENSE }}" "-Dconfluence.license=${{ secrets.CONFLUENCE_DC_DEMO_LICENSE }}"
234234
235235
- name: Startup Jira and Insight
236236
# Loop is needed to prevent Jira from suspension
237-
run: (while true; do sleep 10000; done) | mvn jira:debug -Pitest-jira,-insight-itest-applink,-insight-itest-sdk,-insight-itest-ktor,-jira-itest-applink,-jira-itest-ktor,-jira-itest-sdk "-Djira.service.management.license=${{ secrets.JSM_DC_DEMO_LICENSE }}" "-Dconfluence.license=${{ secrets.CONFLUENCE_DC_DEMO_LICENSE }}" "-Dbaseurl=http://localhost:2990" &
237+
run: (while true; do sleep 10000; done) | ./mvnw jira:debug -Pitest-jira,-insight-itest-applink,-insight-itest-sdk,-insight-itest-ktor,-jira-itest-applink,-jira-itest-ktor,-jira-itest-sdk "-Djira.service.management.license=${{ secrets.JSM_DC_DEMO_LICENSE }}" "-Dconfluence.license=${{ secrets.CONFLUENCE_DC_DEMO_LICENSE }}" "-Dbaseurl=http://localhost:2990" &
238238

239239
- name: Wait for Jira and Insight
240240
run: ./scripts/wait-for-jira.sh
241241

242242
- name: Integration tests using ktor
243-
run: mvn -B verify -Pinsight-itest-ktor,insight-ci-ktor,-jira-itest-applink,-jira-itest-sdk,-jira-itest-ktor,-insight-itest-applink,-insight-itest-sdk "-Djira.service.management.license=${{ secrets.JSM_DC_DEMO_LICENSE }}" "-Dconfluence.license=${{ secrets.CONFLUENCE_DC_DEMO_LICENSE }}"
243+
run: ./mvnw -B verify -Pinsight-itest-ktor,insight-ci-ktor,-jira-itest-applink,-jira-itest-sdk,-jira-itest-ktor,-insight-itest-applink,-insight-itest-sdk "-Djira.service.management.license=${{ secrets.JSM_DC_DEMO_LICENSE }}" "-Dconfluence.license=${{ secrets.CONFLUENCE_DC_DEMO_LICENSE }}"
244244

245245
kotlin-insight-client-test-sdk:
246246
runs-on: ubuntu-24.04
@@ -270,10 +270,10 @@ jobs:
270270
id: extract-version
271271
run: |
272272
VERSION="${{ needs.build.outputs.version }}"
273-
mvn -B versions:set "-DnewVersion=$VERSION" "-Djira.service.management.license=${{ secrets.JSM_DC_DEMO_LICENSE }}" "-Dconfluence.license=${{ secrets.CONFLUENCE_DC_DEMO_LICENSE }}"
273+
./mvnw -B versions:set "-DnewVersion=$VERSION" "-Djira.service.management.license=${{ secrets.JSM_DC_DEMO_LICENSE }}" "-Dconfluence.license=${{ secrets.CONFLUENCE_DC_DEMO_LICENSE }}"
274274
275275
- name: Integration tests using sdk
276-
run: mvn -B verify -Pinsight-itest-sdk,insight-ci-sdk,-insight-itest-ktor,-insight-ci-ktor,-jira-itest-applink,-jira-itest-sdk,-jira-itest-ktor,-insight-itest-applink "-Djira.service.management.license=${{ secrets.JSM_DC_DEMO_LICENSE }}" "-Dconfluence.license=${{ secrets.CONFLUENCE_DC_DEMO_LICENSE }}" "-Dbaseurl=http://localhost:2990"
276+
run: ./mvnw -B verify -Pinsight-itest-sdk,insight-ci-sdk,-insight-itest-ktor,-insight-ci-ktor,-jira-itest-applink,-jira-itest-sdk,-jira-itest-ktor,-insight-itest-applink "-Djira.service.management.license=${{ secrets.JSM_DC_DEMO_LICENSE }}" "-Dconfluence.license=${{ secrets.CONFLUENCE_DC_DEMO_LICENSE }}" "-Dbaseurl=http://localhost:2990"
277277
kotlin-insight-client-test-applink:
278278
runs-on: ubuntu-24.04
279279
needs: build
@@ -302,11 +302,11 @@ jobs:
302302
id: extract-version
303303
run: |
304304
VERSION="${{ needs.build.outputs.version }}"
305-
mvn -B versions:set "-DnewVersion=$VERSION" "-Djira.service.management.license=${{ secrets.JSM_DC_DEMO_LICENSE }}" "-Dconfluence.license=${{ secrets.CONFLUENCE_DC_DEMO_LICENSE }}"
305+
./mvnw -B versions:set "-DnewVersion=$VERSION" "-Djira.service.management.license=${{ secrets.JSM_DC_DEMO_LICENSE }}" "-Dconfluence.license=${{ secrets.CONFLUENCE_DC_DEMO_LICENSE }}"
306306
307307
- name: Startup Jira and Insight
308308
# Loop is needed to prevent Jira from suspension
309-
run: (while true; do sleep 10000; done) | mvn jira:debug -Pitest-jira,-insight-itest-sdk,-insight-itest-ktor,-jira-itest-applink,-insight-itest-applink,-jira-itest-ktor,-jira-itest-sdk "-Djira.service.management.license=${{ secrets.JSM_DC_DEMO_LICENSE }}" "-Dconfluence.license=${{ secrets.CONFLUENCE_DC_DEMO_LICENSE }}" "-Dbaseurl=http://localhost:2990" &
309+
run: (while true; do sleep 10000; done) | ./mvnw jira:debug -Pitest-jira,-insight-itest-sdk,-insight-itest-ktor,-jira-itest-applink,-insight-itest-applink,-jira-itest-ktor,-jira-itest-sdk "-Djira.service.management.license=${{ secrets.JSM_DC_DEMO_LICENSE }}" "-Dconfluence.license=${{ secrets.CONFLUENCE_DC_DEMO_LICENSE }}" "-Dbaseurl=http://localhost:2990" &
310310

311311
- name: Wait for Jira and Insight
312312
run: ./scripts/wait-for-jira.sh
@@ -315,7 +315,7 @@ jobs:
315315
run: sudo echo "127.0.0.1 confluence" | sudo tee -a /etc/hosts
316316

317317
- name: Integration tests using applinks
318-
run: mvn -B verify -Pinsight-itest-applink,insight-ci-applink,-insight-itest-ktor,-insight-itest-sdk,-jira-itest-ktor,-jira-itest-sdk,-jira-itest-applink "-Djira.service.management.license=${{ secrets.JSM_DC_DEMO_LICENSE }}" "-Dconfluence.license=${{ secrets.CONFLUENCE_DC_DEMO_LICENSE }}" "-Dbaseurl=http://confluence:1990"
318+
run: ./mvnw -B verify -Pinsight-itest-applink,insight-ci-applink,-insight-itest-ktor,-insight-itest-sdk,-jira-itest-ktor,-jira-itest-sdk,-jira-itest-applink "-Djira.service.management.license=${{ secrets.JSM_DC_DEMO_LICENSE }}" "-Dconfluence.license=${{ secrets.CONFLUENCE_DC_DEMO_LICENSE }}" "-Dbaseurl=http://confluence:1990"
319319

320320
deploy-to-central:
321321
runs-on: ubuntu-24.04
@@ -350,11 +350,11 @@ jobs:
350350
VERSION="${{ needs.build.outputs.version }}"
351351
352352
# Check if the version has already been set in the POM file
353-
CURRENT_VERSION=$(mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec)
353+
CURRENT_VERSION=$(./mvnw -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec)
354354
if [ "$CURRENT_VERSION" = "$VERSION" ]; then
355355
echo "Version $VERSION is already set in the POM file."
356356
else
357-
mvn -B versions:set "-DnewVersion=$VERSION" versions:commit "-Djira.service.management.license=${{ secrets.JSM_DC_DEMO_LICENSE }}" "-Dconfluence.license=${{ secrets.CONFLUENCE_DC_DEMO_LICENSE }}"
357+
./mvnw -B versions:set "-DnewVersion=$VERSION" versions:commit "-Djira.service.management.license=${{ secrets.JSM_DC_DEMO_LICENSE }}" "-Dconfluence.license=${{ secrets.CONFLUENCE_DC_DEMO_LICENSE }}"
358358
fi
359359
360360
# Check if there are changes to commit
@@ -387,7 +387,7 @@ jobs:
387387
run: gpg --list-secret-keys --keyid-format LONG
388388

389389
- name: Deploy to Maven Central
390-
run: mvn -B deploy -Pci,-ci-sdk,-ci-jira-applink,-ci-ktor -DskipTests "-Djira.service.management.license=${{ secrets.JSM_DC_DEMO_LICENSE }}" "-Dconfluence.license=${{ secrets.CONFLUENCE_DC_DEMO_LICENSE }}"
390+
run: ./mvnw -B deploy -Pci,-ci-sdk,-ci-jira-applink,-ci-ktor -DskipTests "-Djira.service.management.license=${{ secrets.JSM_DC_DEMO_LICENSE }}" "-Dconfluence.license=${{ secrets.CONFLUENCE_DC_DEMO_LICENSE }}"
391391
env:
392392
SONATYPE_USERNAME: ${{ vars.SONATYPE_S01_TOKEN_USER }}
393393
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_S01_TOKEN_PASSWORD }}
@@ -428,7 +428,7 @@ jobs:
428428
INCREMENT_VERSION=$(echo "$VERSION" | cut -d . -f3)
429429
NEXT_INCREMENT_VERSION=$((INCREMENT_VERSION + 1))
430430
NEXT_SNAPSHOT_VERSION="$MAJOR_VERSION.$MINOR_VERSION.$NEXT_INCREMENT_VERSION-SNAPSHOT"
431-
mvn -B versions:set "-DnewVersion=$NEXT_SNAPSHOT_VERSION" versions:commit "-Djira.service.management.license=${{ secrets.JSM_DC_DEMO_LICENSE }}" "-Dconfluence.license=${{ secrets.CONFLUENCE_DC_DEMO_LICENSE }}"
431+
./mvnw -B versions:set "-DnewVersion=$NEXT_SNAPSHOT_VERSION" versions:commit "-Djira.service.management.license=${{ secrets.JSM_DC_DEMO_LICENSE }}" "-Dconfluence.license=${{ secrets.CONFLUENCE_DC_DEMO_LICENSE }}"
432432
git commit -am "[skip ci] set development version $NEXT_SNAPSHOT_VERSION"
433433
git push origin HEAD:$MAIN_BRANCH
434434

‎kotlin-jira-client/kotlin-jira-client-test-sdk/pom.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,8 @@
207207
<productDataPath>${maven.multiModuleProjectDirectory}/test-resources/jira-generated-test-resources.zip
208208
</productDataPath>
209209
<skipITs>true</skipITs>
210+
<enableQuickReload>true</enableQuickReload>
211+
<startupTimeout>1800000</startupTimeout>
210212
<jvmArgs>-Xms2g -Xmx4g -XX:+UseG1GC</jvmArgs>
211213
<server>localhost</server>
212214
<contextPath>/</contextPath>

‎pom.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,11 @@
3131
<atlassian.plugin.key>${project.groupId}.${project.artifactId}</atlassian.plugin.key>
3232
<jira.version>9.12.10</jira.version>
3333
<servicedesk.version>5.12.10</servicedesk.version>
34-
<!-- <jira.version>9.4.2</jira.version>-->
35-
<!-- <servicedesk.version>5.4.2</servicedesk.version>-->
3634
<jira.http.port>2990</jira.http.port>
3735
<atlassian.spring.scanner.version>2.2.1</atlassian.spring.scanner.version>
3836
<amps.version>8.9.2</amps.version>
3937
<insight.version>10.12.1-QR-0157</insight.version>
4038
<confluence.version>9.2.3</confluence.version>
41-
<!-- <atlassian-plugins-osgi-testrunner.version>2.0.3</atlassian-plugins-osgi-testrunner.version>-->
4239
<atlassian-plugins-osgi-testrunner.version>2.0.9</atlassian-plugins-osgi-testrunner.version>
4340
</properties>
4441

0 commit comments

Comments
 (0)