Skip to content

Commit

Permalink
Adjust surefire argLine
Browse files Browse the repository at this point in the history
  • Loading branch information
@acoburn
acoburn committed Oct 12, 2023
1 parent 9789f42 commit 571487b
Show file tree
Hide file tree
Showing 8 changed files with 149 additions and 62 deletions.
3 changes: 2 additions & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<checkstyle.tool.version>10.12.4</checkstyle.tool.version>

<!-- sonar -->
<sonar.coverage.jacoco.xmlReportPaths>${maven.multiModuleProjectDirectory}/trellis-bom/target/site/jacoco-merged/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
<sonar.coverage.jacoco.xmlReportPaths>${maven.multiModuleProjectDirectory}/report/target/site/jacoco-merged/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
<sonar.projectKey>trellis</sonar.projectKey>
<sonar.moduleKey>${project.artifactId}</sonar.moduleKey>
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
Expand Down Expand Up @@ -80,6 +80,7 @@
<module>trellis-webac</module>
<module>trellis-webdav</module>
<module>apps</module>
<module>report</module>
</modules>

<distributionManagement>
Expand Down
141 changes: 141 additions & 0 deletions report/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,141 @@
<?xml version="1.0"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" child.project.url.inherit.append.path="false">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.trellisldp</groupId>
<artifactId>trellis-parent</artifactId>
<version>0.20.0-SNAPSHOT</version>
<relativePath>../trellis-parent</relativePath>
</parent>

<groupId>org.trellisldp</groupId>
<artifactId>trellis-report</artifactId>
<version>0.20.0-SNAPSHOT</version>
<name>Trellis Report</name>
<url>https://www.trellisldp.org</url>
<description>
Trellis LDP Reports
</description>
<packaging>pom</packaging>

<dependencies>
<dependency>
<groupId>org.trellisldp</groupId>
<artifactId>trellis-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.trellisldp</groupId>
<artifactId>trellis-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.trellisldp</groupId>
<artifactId>trellis-http</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.trellisldp</groupId>
<artifactId>trellis-vocabulary</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.trellisldp</groupId>
<artifactId>trellis-notification-jackson</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.trellisldp</groupId>
<artifactId>trellis-notification-jsonb</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.trellisldp</groupId>
<artifactId>trellis-reactive</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.trellisldp</groupId>
<artifactId>trellis-jwt</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.trellisldp</groupId>
<artifactId>trellis-webac</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.trellisldp</groupId>
<artifactId>trellis-app</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.trellisldp</groupId>
<artifactId>trellis-audit</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.trellisldp</groupId>
<artifactId>trellis-cache</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.trellisldp</groupId>
<artifactId>trellis-cdi</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.trellisldp</groupId>
<artifactId>trellis-constraint</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.trellisldp</groupId>
<artifactId>trellis-file</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.trellisldp</groupId>
<artifactId>trellis-jdbc</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.trellisldp</groupId>
<artifactId>trellis-jena</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.trellisldp</groupId>
<artifactId>trellis-namespace</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.trellisldp</groupId>
<artifactId>trellis-rdfa</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.trellisldp</groupId>
<artifactId>trellis-triplestore</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.trellisldp</groupId>
<artifactId>trellis-webdav</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
</project>
13 changes: 0 additions & 13 deletions trellis-app/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,18 +143,5 @@
<filtering>true</filtering>
</resource>
</resources>

<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>
--add-modules jakarta.el
--add-opens java.base/java.lang=ALL-UNNAMED
</argLine>
</configuration>
</plugin>
</plugins>
</build>
</project>
15 changes: 0 additions & 15 deletions trellis-cdi/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,19 +95,4 @@
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>
--add-modules jakarta.el
--add-opens java.base/java.lang=ALL-UNNAMED
</argLine>
</configuration>
</plugin>
</plugins>
</build>
</project>
8 changes: 5 additions & 3 deletions trellis-http/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
</description>
<packaging>jar</packaging>


<dependencyManagement>
<dependencies>
<dependency>
Expand Down Expand Up @@ -182,9 +183,10 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>
--add-opens java.base/java.net=ALL-UNNAMED
</argLine>
<argLine>
${surefire.jacoco.args}
--add-opens java.base/java.net=ALL-UNNAMED
</argLine>
</configuration>
</plugin>
</plugins>
Expand Down
15 changes: 0 additions & 15 deletions trellis-jwt/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,19 +119,4 @@
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>
<!-- add-modules jakarta.eli -->
--add-opens java.base/java.lang=ALL-UNNAMED
</argLine>
</configuration>
</plugin>
</plugins>
</build>
</project>
15 changes: 0 additions & 15 deletions trellis-reactive/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,19 +127,4 @@
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>
--add-modules jakarta.el
--add-opens java.base/java.lang=ALL-UNNAMED
</argLine>
</configuration>
</plugin>
</plugins>
</build>
</project>
1 change: 1 addition & 0 deletions trellis-webdav/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>
${surefire.jacoco.args}
--add-opens java.base/java.net=ALL-UNNAMED
</argLine>
</configuration>
Expand Down

0 comments on commit 571487b

Please sign in to comment.