You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2023/01/13 08:58:32 UTC
[isis] 02/03: ISIS-3320 : reconciles starter pom with M9 ; removes some unnecessary profiles
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 9990938bb2e9cd435d06f72cc190b0bd00b32c1a
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 13 08:55:00 2023 +0000
ISIS-3320 : reconciles starter pom with M9 ; removes some unnecessary profiles
---
bom/current-hierarchy.drawio | 1 +
bom/current-hierarchy.drawio.png | Bin 0 -> 136479 bytes
starters/pom.xml | 132 ++++++++++++++-------------------------
3 files changed, 47 insertions(+), 86 deletions(-)
diff --git a/bom/current-hierarchy.drawio b/bom/current-hierarchy.drawio
new file mode 100644
index 0000000000..2dfa8603c0
--- /dev/null
+++ b/bom/current-hierarchy.drawio
@@ -0,0 +1 @@
+<mxfile host="Electron" modified="2023-01-12T14:29:40.455Z" agent="5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/20.3.0 Chrome/104.0.5112.114 Electron/20.1.3 Safari/537.36" etag="v_-9W0FcNCKxHhcyp0d9" version="20.3.0" type="device"><diagram id="SEMdam8azHVDwQ4q2Txe" name="pom relationships">7Z1bc6M4FoB/jWt6HpziDn5M4u7pnt6enV7X1qbnZUoGGZMAogWO4/n1K3GxDSixk3ARWDNVHSMOcNAROp+ObhP1Nnj6DYNo/Q050J8okvM0UecTRZENTSN/aMouS7FUPUtwsefkQoeEhfcPzBOlPHXjOTAuCSYI+YkXl [...]
\ No newline at end of file
diff --git a/bom/current-hierarchy.drawio.png b/bom/current-hierarchy.drawio.png
new file mode 100644
index 0000000000..5ebe4fa7cb
Binary files /dev/null and b/bom/current-hierarchy.drawio.png differ
diff --git a/starters/pom.xml b/starters/pom.xml
index 29b8b2b030..9bea733cd7 100644
--- a/starters/pom.xml
+++ b/starters/pom.xml
@@ -44,8 +44,8 @@
<spring-boot.version>2.7.7</spring-boot.version>
<approvaltests.version>18.5.0</approvaltests.version>
- <resteasy.version>5.0.0.Final</resteasy.version> <!-- keep in sync with property defined in resteasy-spring-boot-starter -->
- <datanucleus-maven-plugin.version>6.0.0-release</datanucleus-maven-plugin.version> <!-- keep in sync with property defined in causeway-bom -->
+ <!-- IMPORTANT: keep in sync with property defined in resteasy-spring-boot-starter -->
+ <resteasy.version>5.0.0.Final</resteasy.version>
</properties>
@@ -151,6 +151,19 @@
<exists>${basedir}/logging-dn-enhance.properties</exists>
</file>
</activation>
+ <properties>
+
+ <!-- IMPORTANT: keep in sync with versions used in Apache Causeway -->
+ <datanucleus-api-jdo.version>6.0.1</datanucleus-api-jdo.version>
+ <datanucleus-api-jpa.version>6.0.1</datanucleus-api-jpa.version>
+ <datanucleus-core.version>6.0.2</datanucleus-core.version>
+ <datanucleus-jodatime.version>6.0.0-release</datanucleus-jodatime.version>
+ <datanucleus-maven-plugin.version>6.0.0-release</datanucleus-maven-plugin.version>
+
+ <datanucleus-maven-plugin.log4jConfiguration>${basedir}/logging-dn-enhance.properties</datanucleus-maven-plugin.log4jConfiguration>
+ <datanucleus-maven-plugin.verbose>true</datanucleus-maven-plugin.verbose>
+ <datanucleus-maven-plugin.fork>false</datanucleus-maven-plugin.fork>
+ </properties>
<build>
<plugins>
<plugin>
@@ -158,17 +171,46 @@
<artifactId>datanucleus-maven-plugin</artifactId>
<version>${datanucleus-maven-plugin.version}</version>
<configuration>
- <log4jConfiguration>${basedir}/logging-dn-enhance.properties</log4jConfiguration>
- <verbose>true</verbose>
+ <fork>${datanucleus-maven-plugin.fork}</fork>
+ <log4jConfiguration>${datanucleus-maven-plugin.log4jConfiguration}</log4jConfiguration>
+ <verbose>${datanucleus-maven-plugin.verbose}</verbose>
</configuration>
<executions>
<execution>
+ <id>process-classes</id>
<phase>process-classes</phase>
<goals>
<goal>enhance</goal>
</goals>
</execution>
+ <execution>
+ <id>process-test-classes</id>
+ <phase>process-test-classes</phase>
+ <goals>
+ <goal>test-enhance</goal>
+ </goals>
+ <configuration>
+ <metadataDirectory>${project.build.testOutputDirectory}</metadataDirectory>
+ </configuration>
+ </execution>
</executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-core</artifactId>
+ <version>${datanucleus-core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-api-jdo</artifactId>
+ <version>${datanucleus-api-jdo.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-jodatime</artifactId>
+ <version>${datanucleus-jodatime.version}</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</build>
@@ -352,88 +394,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.0.1</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>
- <property>
- <name>github</name>
- </property>
- </activation>
- <distributionManagement>
- <repository>
- <id>github</id>
- <name>Github Releases</name>
- <url>https://maven.pkg.github.com/apache/causeway</url>
- </repository>
- </distributionManagement>
- </profile>
-
<profile>
<id>nightly-localfs-repo</id>
<activation>