From 672a975dbff1416d981c873505c57e585d782a78 Mon Sep 17 00:00:00 2001
From: Michael Jacoby <michael.jacoby@iosb.fraunhofer.de>
Date: Fri, 13 Dec 2024 08:11:43 +0100
Subject: [PATCH] update POMs and workflows

---
 .github/workflows/maven-build-pr.yml |  2 +-
 .github/workflows/maven-build.yml    |  2 +-
 .github/workflows/sonar-test-pr.yml  |  2 +-
 checks/pom.xml                       |  1 +
 core/pom.xml                         | 21 ++++++++++
 maven-ci-settings.xml                |  2 +-
 pom.xml                              | 61 +++++++++++++++-------------
 7 files changed, 59 insertions(+), 32 deletions(-)

diff --git a/.github/workflows/maven-build-pr.yml b/.github/workflows/maven-build-pr.yml
index 9746ccb..56c8ae2 100644
--- a/.github/workflows/maven-build-pr.yml
+++ b/.github/workflows/maven-build-pr.yml
@@ -44,7 +44,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         run: |
-          mvn install sonar:sonar -Pcoverage -Dsonar.projectKey=FraunhoferIOSB_FAAAST-Client \
+          mvn install sonar:sonar -P coverage -Dsonar.projectKey=FraunhoferIOSB_FAAAST-Client \
               -Dsonar.organization=fraunhofer-iosb \
               -Dsonar.coverage.jacoco.xmlReportPaths=target/jacoco/jacoco.xml \
               --settings maven-ci-settings.xml -B
diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml
index 5a454e1..2cee0e8 100644
--- a/.github/workflows/maven-build.yml
+++ b/.github/workflows/maven-build.yml
@@ -42,7 +42,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
       run: |
-        mvn install sonar:sonar -Pcoverage -Dsonar.projectKey=FraunhoferIOSB_FAAAST-Client --settings maven-ci-settings.xml -B
+        mvn install sonar:sonar -P coverage -Dsonar.projectKey=FraunhoferIOSB_FAAAST-Client --settings maven-ci-settings.xml -B
 
     - name: Restore CVD Database from Cache
       uses: actions/cache/restore@v4
diff --git a/.github/workflows/sonar-test-pr.yml b/.github/workflows/sonar-test-pr.yml
index d2a2dae..d5943ef 100644
--- a/.github/workflows/sonar-test-pr.yml
+++ b/.github/workflows/sonar-test-pr.yml
@@ -28,7 +28,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         run: >
-          mvn install sonar:sonar -Pcoverage
+          mvn install sonar:sonar -P coverage
           -Dsonar.projectKey=FraunhoferIOSB_FAAAST-Client
           -Dsonar.pullrequest.key='${{ steps.fetch.outputs.pr-number }}'
           -Dsonar.pullrequest.branch='${{ github.event.workflow_run.head_branch }}'
diff --git a/checks/pom.xml b/checks/pom.xml
index c2b9a44..a867670 100644
--- a/checks/pom.xml
+++ b/checks/pom.xml
@@ -7,6 +7,7 @@
         <version>1.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
+    <groupId>de.fraunhofer.iosb.ilt.faaast.client</groupId>
     <artifactId>checks</artifactId>
     <name>checks</name>
     <description>Checkstyle Checks for the FA³ST Client.</description>
diff --git a/core/pom.xml b/core/pom.xml
index 13a9471..3d7bc9d 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -7,6 +7,7 @@
         <version>1.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
+    <groupId>de.fraunhofer.iosb.ilt.faaast.client</groupId>
     <artifactId>core</artifactId>
     <name>core</name>
     <description>Main functionality of the FA³ST Client.</description>
@@ -46,4 +47,24 @@
             <version>${aas4j.version}</version>
         </dependency>
     </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>${maven.plugin.jar.version}</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>test-jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/maven-ci-settings.xml b/maven-ci-settings.xml
index 43ac894..f4e2fd1 100644
--- a/maven-ci-settings.xml
+++ b/maven-ci-settings.xml
@@ -19,7 +19,7 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
             <properties>
-                <gpg.executable>${env.GPG_EXECUTABLE}</gpg.executable>
+                <gpg.executable>gpg</gpg.executable>
                 <gpg.passphrase>${env.GPG_PASSPHRASE}</gpg.passphrase>
             </properties>
         </profile>
diff --git a/pom.xml b/pom.xml
index 9bbabf1..ba65752 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,6 +27,12 @@
             <organization>Fraunhofer IOSB</organization>
             <organizationUrl>https://www.iosb.fraunhofer.de</organizationUrl>
         </developer>
+        <developer>
+            <name>Michael Jacoby</name>
+            <email>michael.jacoby@iosb.fraunhofer.de</email>
+            <organization>Fraunhofer IOSB</organization>
+            <organizationUrl>https://www.iosb.fraunhofer.de</organizationUrl>
+        </developer>
     </developers>
     <modules>
         <module>checks</module>
@@ -77,7 +83,7 @@
         <maven.plugin.surefire.version>3.5.2</maven.plugin.surefire.version>
         <okhttp3.version>4.12.0</okhttp3.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <root.basedir>${maven.multiModuleProjectDirectory}</root.basedir>
+        <root.basedir>${project.basedir}</root.basedir>
         <slf4j.version>2.0.16</slf4j.version>
         <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
@@ -152,7 +158,7 @@
                             </goals>
                             <phase>validate</phase>
                             <configuration>
-                                <configLocation>${maven.multiModuleProjectDirectory}/checkstyle.xml</configLocation>
+                                <configLocation>${root.basedir}/checkstyle.xml</configLocation>
                                 <consoleOutput>true</consoleOutput>
                                 <failsOnError>true</failsOnError>
                             </configuration>
@@ -179,7 +185,7 @@
                     <artifactId>dependency-check-maven</artifactId>
                     <version>${maven.plugin.owasp.version}</version>
                     <configuration>
-                        <nvdApiServerId>NIST_NVD_API</nvdApiServerId>
+                        <nvdApiKey>${env.NIST_NVD_API_KEY}</nvdApiKey>
                         <failBuildOnCVSS>6</failBuildOnCVSS>
                         <suppressionFiles>
                             <suppressionFile>owaspSuppressions.xml</suppressionFile>
@@ -311,12 +317,13 @@
                     <artifactId>maven-javadoc-plugin</artifactId>
                     <version>${maven.plugin.javadoc.version}</version>
                     <configuration>
-                        <skip>false</skip>
+                        <quiet>true</quiet>
                     </configuration>
                     <executions>
                         <execution>
+                            <id>attach-javadocs</id>
                             <goals>
-                                <goal>javadoc</goal>
+                                <goal>jar</goal>
                             </goals>
                         </execution>
                     </executions>
@@ -360,13 +367,17 @@
         </pluginManagement>
         <plugins>
             <plugin>
-                <groupId>com.diffplug.spotless</groupId>
-                <artifactId>spotless-maven-plugin</artifactId>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-release-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>com.diffplug.spotless</groupId>
+                <artifactId>spotless-maven-plugin</artifactId>
+            </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>license-maven-plugin</artifactId>
@@ -378,26 +389,8 @@
         </plugins>
     </build>
     <profiles>
-        <profile>
-            <id>owasp</id>
-            <properties>
-                <maven.javadoc.skip>true</maven.javadoc.skip>
-                <maven.test.skip>true</maven.test.skip>
-            </properties>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.owasp</groupId>
-                        <artifactId>dependency-check-maven</artifactId>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
         <profile>
             <id>coverage</id>
-            <modules>
-                <module>checks</module>
-            </modules>
             <build>
                 <plugins>
                     <plugin>
@@ -416,11 +409,23 @@
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <id>owasp</id>
+            <properties>
+                <maven.javadoc.skip>true</maven.javadoc.skip>
+                <maven.test.skip>true</maven.test.skip>
+            </properties>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.owasp</groupId>
+                        <artifactId>dependency-check-maven</artifactId>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
         <profile>
             <id>release</id>
-            <modules>
-                <module>checks</module>
-            </modules>
             <properties>
                 <maven.javadoc.skip>false</maven.javadoc.skip>
                 <maven.test.skip>true</maven.test.skip>