You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by da...@apache.org on 2023/03/01 19:06:21 UTC
[causeway] 01/02: CAUSEWAY-3252: wip, still hacking
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch CAUSEWAY-3252
in repository https://gitbox.apache.org/repos/asf/causeway.git
commit 36bdd0437a8d5585348a48cf02ae0a9fb1cd86ac
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Mar 1 17:13:46 2023 +0000
CAUSEWAY-3252: wip, still hacking
---
api/applib/pom.xml | 4 +-
bom/pom.xml | 50 +++++++++++++++++++++-
commons/pom.xml | 7 +--
core/config/pom.xml | 1 +
.../security/audittrail/persistence-jdo/pom.xml | 7 +++
5 files changed, 63 insertions(+), 6 deletions(-)
diff --git a/api/applib/pom.xml b/api/applib/pom.xml
index d0591e27df..00dad76533 100644
--- a/api/applib/pom.xml
+++ b/api/applib/pom.xml
@@ -80,13 +80,13 @@
<groupId>org.apache.causeway.core</groupId>
<artifactId>causeway-schema</artifactId>
</dependency>
-
+
<!-- provides @Digits -->
<dependency>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
</dependency>
-
+
<!-- provides @Column -->
<dependency>
<groupId>jakarta.persistence</groupId>
diff --git a/bom/pom.xml b/bom/pom.xml
index 28f503584d..a5bfd7abe9 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -783,7 +783,7 @@ It is therefore a copy of org.apache:apache, with customisations clearly identif
<type>jar</type>
<scope>compile</scope>
</dependency>
-
+
<!-- org.apache.causeway.extensions (docgen) -->
<dependency>
<groupId>org.apache.causeway.extensions</groupId>
@@ -2132,6 +2132,16 @@ It is therefore a copy of org.apache:apache, with customisations clearly identif
</dependencies>
</dependencyManagement>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <version>${lombok.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
<repositories>
<!-- breaks dependabot run: timeout due to repo not accessible
<repository>
@@ -2229,9 +2239,12 @@ It is therefore a copy of org.apache:apache, with customisations clearly identif
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<configuration>
+ <source>${maven.compiler.release}</source>
+ <target>${maven.compiler.release}</target>
<showDeprecation>true</showDeprecation>
<showWarnings>true</showWarnings>
<!-- Java compliance level, to be overridden with option maven.compiler.release -->
+<!--
<annotationProcessorPaths>
<path>
<groupId>org.projectlombok</groupId>
@@ -2239,6 +2252,7 @@ It is therefore a copy of org.apache:apache, with customisations clearly identif
<version>${lombok.version}</version>
</path>
</annotationProcessorPaths>
+-->
</configuration>
<!-- goal:compile binds to phase:compile -->
<!-- goal:testCompile binds to phase:test-compile -->
@@ -3041,8 +3055,42 @@ It is therefore a copy of org.apache:apache, with customisations clearly identif
<artifactId>datanucleus-maven-plugin</artifactId>
<inherited>true</inherited>
</plugin>
+<!--
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>${maven-compiler-plugin.version}</version>
+ <configuration>
+ <showDeprecation>true</showDeprecation>
+ <showWarnings>true</showWarnings>
+ <annotationProcessorPaths>
+ <path>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <version>${lombok.version}</version>
+ </path>
+ <path>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-jdo-query</artifactId>
+ <version>${datanucleus-jdo-query.version}</version>
+ </path>
+ </annotationProcessorPaths>
+ </configuration>
+ </plugin>
+-->
+
</plugins>
</build>
+<!--
+ <dependencies>
+ <dependency>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>javax.jdo</artifactId>
+ <version>${datanucleus-jdo-api.version}</version>
+ <scope>provided</scope> <!– for datanucleus-jdo-query annotation processor, brought in via profile –>
+ </dependency>
+ </dependencies>
+-->
</profile>
<profile>
<id>only-eclipse</id>
diff --git a/commons/pom.xml b/commons/pom.xml
index 01646029a1..5203bd05fa 100644
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@ -71,7 +71,7 @@
<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.sdo</artifactId>
</dependency>
-
+
<dependency>
<!-- provides @Inject, @Qualifier, -->
<groupId>jakarta.inject</groupId>
@@ -107,12 +107,13 @@
<groupId>org.jboss.spec.javax.ws.rs</groupId>
<artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
</dependency>
-
+
+
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</dependency>
-
+
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
diff --git a/core/config/pom.xml b/core/config/pom.xml
index a5a13c2ed4..81a1e01842 100644
--- a/core/config/pom.xml
+++ b/core/config/pom.xml
@@ -68,6 +68,7 @@
-->
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
+ <version>${lombok.version}</version>
</path>
<path>
<groupId>org.springframework.boot</groupId>
diff --git a/extensions/security/audittrail/persistence-jdo/pom.xml b/extensions/security/audittrail/persistence-jdo/pom.xml
index a473c63b3e..6c769f1fef 100644
--- a/extensions/security/audittrail/persistence-jdo/pom.xml
+++ b/extensions/security/audittrail/persistence-jdo/pom.xml
@@ -58,6 +58,13 @@
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>javax.jdo</artifactId>
+ <version>${datanucleus-jdo-api.version}</version>
+ <optional>true</optional> <!-- for datanucleus-jdo-query annotation processor, brought in via profile -->
+ </dependency>
+
<!-- testing -->
<dependency>