Skip to content

Commit 1a7e14f

Browse files
brettaufheberbrettaufheber
committed
Migrate to parent POM version 1.0.0
1 parent 184c2b7 commit 1a7e14f

File tree

6 files changed

+95
-34
lines changed

6 files changed

+95
-34
lines changed

‎.github/workflows/ci_main.yaml‎

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
run: ./mvnw dependency:go-offline -U -B
3131

3232
- name: Build with Maven
33-
run: ./mvnw package -DskipUnitTests -B
33+
run: ./mvnw package -DskipTests=true -B
3434

3535
unit-tests:
3636
needs: package
@@ -57,8 +57,14 @@ jobs:
5757
key: confapi-plugin-${{ hashFiles('**/pom.xml') }}
5858
restore-keys: confapi-plugin
5959

60-
- name: Run Unit Tests and analyze on SonarCloud
61-
run: ./mvnw test sonar:sonar -B
60+
- name: Run Unit Tests
61+
run: ./mvnw --batch-mode compile test
62+
63+
- name: Perform static code analysis
64+
run: |
65+
./mvnw --batch-mode sonar:sonar \
66+
--settings ./.github/workflows/settings.xml \
67+
-P analyzing
6268
6369
integration-tests:
6470
needs: package
@@ -82,21 +88,19 @@ jobs:
8288
restore-keys: confapi-plugin
8389

8490
- name: Run Integration Tests
85-
run: ./mvnw integration-test -DskipUnitTests -B
91+
run: ./mvnw integration-test -B
8692

8793
deploy:
8894
needs: [unit-tests, integration-tests]
8995

9096
runs-on: ubuntu-20.04
9197

9298
env:
99+
OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
100+
OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
101+
GPG_KEY_BASE64: ${{ secrets.GPG_KEY_BASE64 }}
93102
GPG_KEY_NAME: ${{ secrets.GPG_KEY_NAME }}
94103
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
95-
OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
96-
OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
97-
SIGN_ASC_SALT: ${{ secrets.SIGN_ASC_SALT }}
98-
SIGN_ASC_KEY: ${{ secrets.SIGN_ASC_KEY }}
99-
SIGN_ASC_IV: ${{ secrets.SIGN_ASC_IV }}
100104

101105
steps:
102106
- name: Set up JDK 11
@@ -114,14 +118,15 @@ jobs:
114118
key: confapi-plugin-${{ hashFiles('**/pom.xml') }}
115119
restore-keys: confapi-plugin
116120

117-
- name: Decrypt Signing Key
118-
run: openssl aes-256-cbc -S ${SIGN_ASC_SALT} -K ${SIGN_ASC_KEY} -iv ${SIGN_ASC_IV} -in .github/workflows/sign.asc.enc -out .github/workflows/sign.asc -d
119-
120-
- name: Import Signing Key
121-
run: gpg --no-tty --batch --import .github/workflows/sign.asc
121+
- name: Import GPG key
122+
run: echo "${GPG_KEY_BASE64}" | base64 --decode | gpg --no-tty --batch --import
122123

123-
- name: Deploy to Maven Central
124-
run: export GPG_TTY=$(tty) && ./mvnw -s .github/workflows/settings.xml -DskipTests deploy -B
124+
- name: Publish
125+
run: |
126+
./mvnw --batch-mode deploy \
127+
--settings ./.github/workflows/settings.xml \
128+
-P signing,deploying \
129+
-DskipTests=true
125130
126131
apcc:
127132
needs: deploy

‎.github/workflows/ci_pull_request.yaml‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
run: ./mvnw dependency:go-offline -U -B
3131

3232
- name: Build with Maven
33-
run: ./mvnw package -DskipUnitTests -B
33+
run: ./mvnw package -DskipTests=true -B
3434

3535
unit-tests:
3636
needs: package
@@ -57,8 +57,14 @@ jobs:
5757
key: confapi-plugin-${{ hashFiles('**/pom.xml') }}
5858
restore-keys: confapi-plugin
5959

60-
- name: Run Unit Tests and analyze on SonarCloud
61-
run: ./mvnw test sonar:sonar -B
60+
- name: Run Unit Tests
61+
run: ./mvnw --batch-mode compile test
62+
63+
- name: Perform static code analysis
64+
run: |
65+
./mvnw --batch-mode sonar:sonar \
66+
--settings ./.github/workflows/settings.xml \
67+
-P analyzing
6268
6369
integration-tests:
6470
needs: package
@@ -82,7 +88,7 @@ jobs:
8288
restore-keys: confapi-plugin
8389

8490
- name: Run Integration Tests
85-
run: ./mvnw integration-test -DskipUnitTests -B
91+
run: ./mvnw integration-test -DskipTests=true -B
8692

8793
apcc:
8894
needs: package

‎.github/workflows/settings.xml‎

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,38 @@
11
<settings>
2+
23
<servers>
34
<server>
4-
<id>sonatype-nexus-snapshots</id>
5-
<username>${env.OSSRH_USERNAME}</username>
6-
<password>${env.OSSRH_PASSWORD}</password>
7-
</server>
8-
<server>
9-
<id>sonatype-nexus-staging</id>
5+
<id>ossrh</id>
106
<username>${env.OSSRH_USERNAME}</username>
117
<password>${env.OSSRH_PASSWORD}</password>
128
</server>
139
</servers>
1410

1511
<profiles>
1612
<profile>
17-
<id>sign-env</id>
18-
<activation>
19-
<activeByDefault>true</activeByDefault>
20-
</activation>
13+
<id>analyzing</id>
14+
<properties>
15+
<sonar.projectKey>aservo_ldap-crowd-adapter</sonar.projectKey>
16+
<sonar.organization>800c9135c81800959e51375f6594c91a1f757be9bbbc14d311783a4f75c501ec7807da061e787a9ea89433eb1cf2d6088b664332abd6a411ca5b44e811e97a23</sonar.organization>
17+
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
18+
</properties>
19+
</profile>
20+
<profile>
21+
<id>signing</id>
2122
<properties>
22-
<gpg.executable>gpg</gpg.executable>
2323
<gpg.keyname>${env.GPG_KEY_NAME}</gpg.keyname>
2424
<gpg.passphrase>${env.GPG_PASSPHRASE}</gpg.passphrase>
25+
<gpg.executable>gpg</gpg.executable>
26+
</properties>
27+
</profile>
28+
<profile>
29+
<id>deploying</id>
30+
<properties>
31+
<nexus.host.url>https://oss.sonatype.org/</nexus.host.url>
32+
<nexus.snapshot.url>https://oss.sonatype.org/content/repositories/snapshots</nexus.snapshot.url>
33+
<nexus.release.url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</nexus.release.url>
2534
</properties>
2635
</profile>
2736
</profiles>
37+
2838
</settings>

‎.github/workflows/sign.asc.enc‎

-9.25 KB
Binary file not shown.

‎index.adoc‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2613,6 +2613,36 @@ endif::internal-generation[]
26132613
|
26142614
| date-time
26152615

2616+
| server
2617+
|
2618+
| DirectoryLdapServer
2619+
|
2620+
|
2621+
2622+
| permissions
2623+
|
2624+
| DirectoryLdapPermissions
2625+
|
2626+
|
2627+
2628+
| advanced
2629+
|
2630+
| DirectoryInternalAdvanced
2631+
|
2632+
|
2633+
2634+
| credentialPolicy
2635+
|
2636+
| DirectoryInternalCredentialPolicy
2637+
|
2638+
|
2639+
2640+
| schema
2641+
|
2642+
| DirectoryLdapSchema
2643+
|
2644+
|
2645+
26162646
|===
26172647

26182648

‎pom.xml‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>de.aservo</groupId>
88
<artifactId>parent-pom</artifactId>
9-
<version>0.0.11</version>
9+
<version>1.0.0-SNAPSHOT</version>
1010
</parent>
1111

1212
<modelVersion>4.0.0</modelVersion>
@@ -53,6 +53,16 @@
5353
</developers>
5454

5555
<properties>
56+
<!-- default properties -->
57+
<java.version>1.8</java.version>
58+
<maven.compiler.target>${java.version}</maven.compiler.target>
59+
<maven.compiler.source>${java.version}</maven.compiler.source>
60+
<!-- Atlassia SDK settings -->
61+
<downloadSources>true</downloadSources>
62+
<downloadJavadocs>true</downloadJavadocs>
63+
<allow.google.tracking>false</allow.google.tracking>
64+
<skipAllPrompts>true</skipAllPrompts>
65+
<!-- Jira related properties -->
5666
<jira.version>8.15.0</jira.version>
5767
<jira.data.version>8.12.1</jira.data.version>
5868
<!-- other properties -->
@@ -379,7 +389,7 @@
379389
<plugin>
380390
<groupId>io.swagger.core.v3</groupId>
381391
<artifactId>swagger-maven-plugin</artifactId>
382-
<version>${swagger.version}</version>
392+
<version>${swagger.plugin.version}</version>
383393
<configuration>
384394
<openapiFilePath>${basedir}/src/main/resources/openapi.yaml</openapiFilePath>
385395
<resourcePackages>
@@ -402,7 +412,7 @@
402412
<plugin>
403413
<groupId>org.openapitools</groupId>
404414
<artifactId>openapi-generator-maven-plugin</artifactId>
405-
<version>${openapi-generator-maven-plugin.version}</version>
415+
<version>${openapi-generator.plugin.version}</version>
406416
<executions>
407417
<execution>
408418
<phase>package</phase>

0 commit comments

Comments
 (0)