This is an automated email from the ASF dual-hosted git repository. ahuber pushed a commit to branch spring6 in repository https://gitbox.apache.org/repos/asf/causeway.git
The following commit(s) were added to refs/heads/spring6 by this push:
new c4e7af8c81 CAUSEWAY-2445: pom fixes for spring6
c4e7af8c81 is described below
commit c4e7af8c81dd2328f8ab627cc7d81422cb93c999
Author: andi-huber <[email protected]>
AuthorDate: Sat Feb 10 07:18:22 2024 +0100
CAUSEWAY-2445: pom fixes for spring6
- attempt to deduplicate profiles
- provide missing vars
---
bom/pom.xml | 10 ---
pom.xml | 194 -------------------------------------------------------
starters/pom.xml | 97 +---------------------------
3 files changed, 2 insertions(+), 299 deletions(-)
diff --git a/bom/pom.xml b/bom/pom.xml
index 69f9c086ed..4be1975736 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -511,11 +511,6 @@ It is therefore a copy of org.apache:apache, with
customisations clearly identif
<artifactId>causeway-viewer-graphql-viewer</artifactId>
<version>3.0.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.apache.causeway.testing</groupId>
- <artifactId>causeway-testing-fixtures-applib</artifactId>
- <version>3.0.0-SNAPSHOT</version>
- </dependency>
<dependency>
<groupId>org.apache.causeway.viewer</groupId>
@@ -2145,11 +2140,6 @@ It is therefore a copy of org.apache:apache, with
customisations clearly identif
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.4.1</version>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <version>${surefire.version}</version>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index c3a414100d..1f0bd8bc72 100644
--- a/pom.xml
+++ b/pom.xml
@@ -113,22 +113,6 @@
</profile>
<!-- ALL MODULES -->
-
- <!--
- <profile>
- <id>module-all</id>
- <activation>
- <property>
- <name>module-all</name>
- </property>
- </activation>
- <modules>
- <module>antora</module>
- <module>incubator</module>
- <module>regressiontests</module>
- <module>tooling</module>
- </modules>
- </profile> -->
<profile>
<id>module-all</id>
@@ -284,184 +268,6 @@
</modules>
</profile>
- <profile>
- <id>causeway-app-starter-surefire</id>
- <activation>
- <property>
-
<name>!skip.causeway-app-starter-surefire</name>
- </property>
- </activation>
-
- <properties>
- <!-- uses maven-surefire-plugin.version, which
is declared by spring-boot-starter-parent -->
- <skipTests>false</skipTests>
- <skipUTs>${skipTests}</skipUTs>
- <skipITs>${skipTests}</skipITs>
- <skipBDDs>${skipTests}</skipBDDs>
-
<surefire-plugin.argLine></surefire-plugin.argLine>
- </properties>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
-
<groupId>org.apache.maven.plugins</groupId>
-
<artifactId>maven-surefire-plugin</artifactId>
-
<version>${maven-surefire-plugin.version}</version>
- <executions>
- <execution>
-
<id>default-test</id>
-
<phase>test</phase>
- <goals>
-
<goal>test</goal>
- </goals>
-
<configuration>
-
<skipTests>${skipUTs}</skipTests>
-
<includes>
-
<include>**/*Test*.java</include>
-
</includes>
-
<excludes>
-
<exclude>**/*Testing.java</exclude>
-
<exclude>**/*IntegTest*.java</exclude>
-
<exclude>**/*Abstract*.java</exclude>
-
</excludes>
-
<useFile>true</useFile>
-
<printSummary>true</printSummary>
-
<reportsDirectory>${project.build.directory}/surefire-unittest-reports</reportsDirectory>
-
<forkCount>1</forkCount>
-
<reuseForks>true</reuseForks>
-
<argLine>${surefire-plugin.argLine}</argLine>
-
</configuration>
- </execution>
- <execution>
-
<id>integ-test</id>
-
<phase>integration-test</phase>
- <goals>
-
<goal>test</goal>
- </goals>
-
<configuration>
-
<skipTests>${skipITs}</skipTests>
-
<includes>
-
<include>**/*IntegTest*.java</include>
-
</includes>
-
<excludes>
-
<exclude>**/*Abstract*.java</exclude>
-
</excludes>
-
<useFile>true</useFile>
-
<printSummary>true</printSummary>
-
<reportsDirectory>${project.build.directory}/surefire-integtest-reports</reportsDirectory>
-
<forkCount>1</forkCount>
-
<reuseForks>true</reuseForks>
-
<argLine>${surefire-plugin.argLine}</argLine>
-
</configuration>
- </execution>
- <execution>
-
<id>bdd-specs</id>
-
<phase>integration-test</phase>
- <goals>
-
<goal>test</goal>
- </goals>
-
<configuration>
-
<skipTests>${skipBDDs}</skipTests>
-
<includes>
-
<include>**/*Spec*.java</include>
-
</includes>
-
<excludes>
-
<exclude>**/*Test.java</exclude>
-
<exclude>**/*Testing.java</exclude>
-
<exclude>**/*IntegTest*.java</exclude>
-
<exclude>**/*Abstract*.java</exclude>
-
</excludes>
-
<useFile>true</useFile>
-
<printSummary>true</printSummary>
-
<reportsDirectory>${project.build.directory}/surefire-bddspecs-reports</reportsDirectory>
-
<forkCount>1</forkCount>
-
<reuseForks>true</reuseForks>
-
<argLine>${surefire-plugin.argLine}</argLine>
-
</configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
-
<groupId>org.apache.maven.plugins</groupId>
-
<artifactId>maven-surefire-report-plugin</artifactId>
-
<version>${maven-surefire-report-plugin.version}</version>
- <configuration>
-
<showSuccess>false</showSuccess>
- </configuration>
- <executions>
- <execution>
-
<id>test</id>
-
<phase>test</phase>
- </execution>
- <execution>
-
<id>integration-test</id>
-
<phase>integration-test</phase>
- </execution>
- <execution>
-
<id>bdd-specs</id>
-
<phase>integration-test</phase>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- </profile>
-
- <profile>
- <id>causeway-app-starter-docker</id>
- <activation>
- <property>
-
<name>!skip.causeway-app-starter-docker</name>
- </property>
- </activation>
- <properties>
-
<jib-maven-plugin.version>3.4.0</jib-maven-plugin.version>
- </properties>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
-
<groupId>com.google.cloud.tools</groupId>
-
<artifactId>jib-maven-plugin</artifactId>
-
<version>${jib-maven-plugin.version}</version>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- </profile>
-
- <!-- running: mvn spring-boot:run -->
- <profile>
- <id>causeway-app-starter-boot</id>
- <activation>
- <property>
-
<name>!skip.causeway-app-starter-boot</name>
- </property>
- </activation>
- <properties>
- </properties>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
-
<groupId>org.springframework.boot</groupId>
-
<artifactId>spring-boot-maven-plugin</artifactId>
-
<version>${spring-boot.version}</version>
- <executions>
- <execution>
- <goals>
-
<goal>repackage</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- </profile>
-
<profile>
<id>apache-release</id>
<activation>
diff --git a/starters/pom.xml b/starters/pom.xml
index 89b1a087d6..e8bdfabcc4 100644
--- a/starters/pom.xml
+++ b/starters/pom.xml
@@ -204,6 +204,8 @@
<properties>
<!-- uses maven-surefire-plugin.version, which
is declared by spring-boot-starter-parent -->
+
<maven-surefire-report-plugin.version>3.2.5</maven-surefire-report-plugin.version>
+
<skipTests>false</skipTests>
<skipUTs>${skipTests}</skipUTs>
<skipITs>${skipTests}</skipITs>
@@ -372,72 +374,6 @@
</build>
</profile>
- <profile>
- <id>apache-release</id>
- <activation>
- <property>
- <name>apache-release</name>
- </property>
- </activation>
- <properties>
- <skipTests>true</skipTests>
-
<altDeploymentRepository>apache.releases.https::default::https://repository.apache.org/service/local/staging/deploy/maven2</altDeploymentRepository>
- </properties>
- <build>
- <plugins>
- <!-- We want to sign the artifact, the
POM, and all attached artifacts -->
- <plugin>
-
<groupId>org.apache.maven.plugins</groupId>
-
<artifactId>maven-gpg-plugin</artifactId>
- <version>3.1.0</version>
- <executions>
- <execution>
-
<id>sign-release-artifacts</id>
- <goals>
-
<goal>sign</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <gpgArguments>
-
<arg>--digest-algo=SHA512</arg>
- </gpgArguments>
- </configuration>
- </plugin>
- <plugin>
-
<groupId>net.nicoulaj.maven.plugins</groupId>
-
<artifactId>checksum-maven-plugin</artifactId>
- <version>1.11</version>
- <executions>
- <execution>
-
<id>source-release-checksum</id>
- <goals>
-
<goal>files</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <algorithms>
-
<algorithm>SHA-512</algorithm>
- </algorithms>
-
<csvSummary>false</csvSummary>
- <fileSets>
- <fileSet>
-
<directory>${project.build.directory}</directory>
-
<includes>
-
<include>${project.artifactId}-${project.version}-source-release.zip</include>
-
<include>${project.artifactId}-${project.version}-source-release.tar*</include>
-
</includes>
- </fileSet>
- </fileSets>
-
<failIfNoFiles>false</failIfNoFiles><!-- usually, no file to do checksum:
- don't consider
error -->
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
<profile>
<id>github</id>
<activation>
@@ -454,34 +390,5 @@
</distributionManagement>
</profile>
- <profile>
- <id>nightly-localfs-repo</id>
- <activation>
- <property>
- <name>nightly-localfs-repo</name>
- </property>
- </activation>
- <distributionManagement>
- <repository>
- <id>nightly-localfs-repo</id>
- <name>Temporary Local Filesystem Staging
Repository</name>
- <url>file://${MVN_SNAPSHOTS_PATH}</url>
- </repository>
- </distributionManagement>
- <build>
- <plugins>
- <plugin>
-
<artifactId>maven-deploy-plugin</artifactId>
- <version>3.1.1</version>
- <configuration>
- <altDeploymentRepository>
-
nightly-localfs-repo::file://${MVN_SNAPSHOTS_PATH}
- </altDeploymentRepository>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
</profiles>
</project>
