Skip to content

Commit

Permalink
update POMs and workflows
Browse files Browse the repository at this point in the history
  • Loading branch information
mjacoby committed Dec 13, 2024
1 parent 6feb526 commit 672a975
Show file tree
Hide file tree
Showing 7 changed files with 59 additions and 32 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/maven-build-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/maven-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sonar-test-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}'
Expand Down
1 change: 1 addition & 0 deletions checks/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
21 changes: 21 additions & 0 deletions core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
2 changes: 1 addition & 1 deletion maven-ci-settings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
61 changes: 33 additions & 28 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,12 @@
<organization>Fraunhofer IOSB</organization>
<organizationUrl>https://www.iosb.fraunhofer.de</organizationUrl>
</developer>
<developer>
<name>Michael Jacoby</name>
<email>[email protected]</email>
<organization>Fraunhofer IOSB</organization>
<organizationUrl>https://www.iosb.fraunhofer.de</organizationUrl>
</developer>
</developers>
<modules>
<module>checks</module>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down

0 comments on commit 672a975

Please sign in to comment.