This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new bc0675e124 ISIS-3297: base regressiontests on bom not starter
bc0675e124 is described below
commit bc0675e124d090efa5513d08ecae3791765d13e1
Author: Andi Huber <[email protected]>
AuthorDate: Tue Nov 29 14:43:09 2022 +0100
ISIS-3297: base regressiontests on bom not starter
- deduplicate all dn-enhancer profiles
- also fixes regression test pom files (as we now have stricter build
policy, than previously with starter)
---
bom/pom.xml | 73 +++++++++++++++++++++-
core/pom.xml | 48 +-------------
extensions/pom.xml | 66 -------------------
regressiontests/incubating/pom.xml | 6 +-
.../incubating/src/main/java/include.txt | 1 -
regressiontests/pom.xml | 43 +++++++++----
.../stable-cmdexecauditsess/generic/pom.xml | 5 ++
.../resources/META-INF/orm-commandlog.template | 0
regressiontests/stable-eventhandling/pom.xml | 6 +-
.../stable-eventhandling/src/main/java/include.txt | 1 -
regressiontests/stable-layouts/pom.xml | 40 +++---------
.../integtest/Layout_Counter_IntegTest.java | 0
.../integtest/Layout_SimpleObject_IntegTest.java | 0
.../layouts/integtest/model/Counter.java | 0
.../layouts/integtest/model/Counter.layout.xml | 0
.../integtest/model/LayoutTestDomainModel.java | 0
.../layouts/integtest/model/SimpleObject.java | 8 ++-
.../integtest/model/SimpleObject.layout.xml | 0
.../layouts/integtest/model/types/Name.java | 0
.../layouts/integtest/model/types/Notes.java | 0
regressiontests/stable-viewers-jdo/pom.xml | 6 +-
regressiontests/stable-viewers-jpa/pom.xml | 6 +-
regressiontests/stable/pom.xml | 6 +-
starters/pom.xml | 63 ++-----------------
testing/pom.xml | 67 --------------------
valuetypes/pom.xml | 67 --------------------
26 files changed, 151 insertions(+), 361 deletions(-)
diff --git a/bom/pom.xml b/bom/pom.xml
index 748dcdf250..8b81762fc7 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -70,7 +70,12 @@ It is therefore a copy of org.apache:apache, with
customisations clearly identif
<delombok.output>${project.build.directory}/delombok</delombok.output>
- <!-- PLUGIN DEPENDENCIES -->
+ <!-- PLUGINS -->
+
+
<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>false</datanucleus-maven-plugin.verbose>
+
<datanucleus-maven-plugin.fork>false</datanucleus-maven-plugin.fork>
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
<maven-surefire-plugin.version>3.0.0-M7</maven-surefire-plugin.version>
@@ -106,7 +111,6 @@ It is therefore a copy of org.apache:apache, with
customisations clearly identif
<datanucleus-jdo-api.version>3.2.1</datanucleus-jdo-api.version>
<datanucleus-jdo-query.version>6.0.1</datanucleus-jdo-query.version>
<datanucleus-jodatime.version>6.0.0-release</datanucleus-jodatime.version>
-
<datanucleus-maven-plugin.version>6.0.0-release</datanucleus-maven-plugin.version>
<datanucleus-rdbms.version>6.0.2</datanucleus-rdbms.version>
<datatables.version>1.13.1</datatables.version> <!-- keep in sync with
DatatablesDotNet -->
@@ -718,7 +722,53 @@ It is therefore a copy of org.apache:apache, with
customisations clearly identif
<artifactId>clirr-maven-plugin</artifactId>
<version>2.8</version>
</plugin>
- </plugins>
+ <plugin>
+ <groupId>org.datanucleus</groupId>
+
<artifactId>datanucleus-maven-plugin</artifactId>
+
<version>${datanucleus-maven-plugin.version}</version>
+ <configuration>
+
<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>
</pluginManagement>
<plugins>
<!-- We want to package up license resources in the JARs produced
-->
@@ -1020,6 +1070,23 @@ It is therefore a copy of org.apache:apache, with
customisations clearly identif
</modules>
</profile>
<!-- END SNIPPET: release-profile -->
+ <profile>
+ <id>causeway-app-starter-datanucleusenhance</id>
+ <activation>
+ <file>
+
<exists>${basedir}/logging-dn-enhance.properties</exists>
+ </file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+
<groupId>org.datanucleus</groupId>
+
<artifactId>datanucleus-maven-plugin</artifactId>
+ <inherited>true</inherited>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
<profile>
<id>only-eclipse</id>
<activation>
diff --git a/core/pom.xml b/core/pom.xml
index 2f9ce6037f..92e4c4d62c 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1328,58 +1328,12 @@
<!-- <file>
<exists>${basedir}/logging-dn-enhance.properties</exists>
</file> -->
</activation>
- <properties>
-
<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>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-maven-plugin</artifactId>
-
<version>${datanucleus-maven-plugin.version}</version>
- <configuration>
-
<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>
+ <inherited>true</inherited>
</plugin>
</plugins>
</build>
diff --git a/extensions/pom.xml b/extensions/pom.xml
index 5038088544..7f6c977f19 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -504,72 +504,6 @@
</modules>
- <profiles>
- <profile>
- <id>causeway-extensions-datanucleusenhance</id>
- <activation>
- <file>
-
<exists>${basedir}/logging-dn-enhance.properties</exists>
- </file>
- </activation>
- <properties>
-
<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>
-
<groupId>org.datanucleus</groupId>
-
<artifactId>datanucleus-maven-plugin</artifactId>
-
<version>${datanucleus-maven-plugin.version}</version>
- <configuration>
-
<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>
- </profile>
-
- </profiles>
</project>
diff --git a/regressiontests/incubating/pom.xml
b/regressiontests/incubating/pom.xml
index 88df1bd281..aa23131f37 100644
--- a/regressiontests/incubating/pom.xml
+++ b/regressiontests/incubating/pom.xml
@@ -22,8 +22,12 @@
</parent>
<artifactId>causeway-regressiontests-incubating</artifactId>
-
<name>Apache Causeway - Regression Tests (incubating)</name>
+
+ <properties>
+ <maven.install.skip>true</maven.install.skip>
+ <maven.deploy.skip>true</maven.deploy.skip>
+ </properties>
<dependencies>
<!-- causeway-regressiontests-stable has the domain to test
against -->
diff --git a/regressiontests/incubating/src/main/java/include.txt
b/regressiontests/incubating/src/main/java/include.txt
deleted file mode 100644
index 4f9c4e05b9..0000000000
--- a/regressiontests/incubating/src/main/java/include.txt
+++ /dev/null
@@ -1 +0,0 @@
-existence of the src/main/java folder, even if empty, suppresses build
[WARNING] JAR will be empty - no content was marked for inclusion
\ No newline at end of file
diff --git a/regressiontests/pom.xml b/regressiontests/pom.xml
index ea5ba1014f..76d3668420 100644
--- a/regressiontests/pom.xml
+++ b/regressiontests/pom.xml
@@ -15,10 +15,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.causeway.app</groupId>
- <artifactId>causeway-app-starter-parent</artifactId>
+ <groupId>org.apache.causeway</groupId>
+ <artifactId>causeway-bom</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <relativePath>../starters/pom.xml</relativePath>
+ <relativePath>../bom/pom.xml</relativePath>
</parent>
<groupId>org.apache.causeway.regressiontests</groupId>
@@ -27,18 +27,13 @@
<name>Apache Causeway - Regression Tests</name>
<description>
Collection of JUnit tests covering core functionalities of the
framework.
- (Targeted for JVM 11+)
</description>
<packaging>pom</packaging>
<properties>
-
- <maven.compiler.release>11</maven.compiler.release>
-
<skip.regressionTests>false</skip.regressionTests>
<skipTests>${skip.regressionTests}</skipTests>
-
</properties>
<build>
@@ -59,11 +54,9 @@
</resource>
</resources>
<plugins>
-
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>0.15</version>
<!-- APACHE CAUSEWAY customisation 4/7: start
-->
<configuration>
@@ -148,13 +141,41 @@
<dependency>
<groupId>org.apache.causeway.testing</groupId>
<artifactId>causeway-testing-integtestsupport-applib</artifactId>
- <version>${project.version}</version>
</dependency>
</dependencies>
<dependencyManagement>
<dependencies>
+
+ <dependency>
+
<groupId>org.apache.causeway.extensions</groupId>
+ <artifactId>causeway-extensions</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.causeway.testing</groupId>
+ <artifactId>causeway-testing</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+
<groupId>org.apache.causeway.valuetypes</groupId>
+ <artifactId>causeway-valuetypes</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.causeway.viewer</groupId>
+ <artifactId>causeway-viewer-wicket</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
<dependency>
<groupId>org.apache.causeway.regressiontests</groupId>
diff --git a/regressiontests/stable-cmdexecauditsess/generic/pom.xml
b/regressiontests/stable-cmdexecauditsess/generic/pom.xml
index 8a70587307..3f8f14354a 100644
--- a/regressiontests/stable-cmdexecauditsess/generic/pom.xml
+++ b/regressiontests/stable-cmdexecauditsess/generic/pom.xml
@@ -22,6 +22,11 @@
<artifactId>causeway-regressiontests-cmdexecauditsess-generic</artifactId>
<name>Apache Causeway - Regression Tests (stable) - Cmd/Exec/Audit/Session
- Generic</name>
+ <properties>
+
<jar-plugin.automaticModuleName>org.apache.causeway.regressiontests.cmdexecauditsess.generic</jar-plugin.automaticModuleName>
+
<git-plugin.propertiesDir>org/apache/causeway/regressiontests/cmdexecauditsess/generic</git-plugin.propertiesDir>
+ </properties>
+
<dependencies>
<dependency>
diff --git
a/regressiontests/stable-cmdexecauditsess/persistence-jpa/src/main/resources/META-INF/orm-commandlog.template
b/regressiontests/stable-cmdexecauditsess/persistence-jpa/src/test/resources/META-INF/orm-commandlog.template
similarity index 100%
rename from
regressiontests/stable-cmdexecauditsess/persistence-jpa/src/main/resources/META-INF/orm-commandlog.template
rename to
regressiontests/stable-cmdexecauditsess/persistence-jpa/src/test/resources/META-INF/orm-commandlog.template
diff --git a/regressiontests/stable-eventhandling/pom.xml
b/regressiontests/stable-eventhandling/pom.xml
index 0d1f40c5d8..cd1983d9bd 100644
--- a/regressiontests/stable-eventhandling/pom.xml
+++ b/regressiontests/stable-eventhandling/pom.xml
@@ -22,8 +22,12 @@
</parent>
<artifactId>causeway-regressiontests-stable-eventhandling</artifactId>
-
<name>Apache Causeway - Regression Tests (stable) - Event
Handling</name>
+
+ <properties>
+ <maven.install.skip>true</maven.install.skip>
+ <maven.deploy.skip>true</maven.deploy.skip>
+ </properties>
<dependencies>
<dependency>
diff --git a/regressiontests/stable-eventhandling/src/main/java/include.txt
b/regressiontests/stable-eventhandling/src/main/java/include.txt
deleted file mode 100644
index 4f9c4e05b9..0000000000
--- a/regressiontests/stable-eventhandling/src/main/java/include.txt
+++ /dev/null
@@ -1 +0,0 @@
-existence of the src/main/java folder, even if empty, suppresses build
[WARNING] JAR will be empty - no content was marked for inclusion
\ No newline at end of file
diff --git a/regressiontests/stable-layouts/pom.xml
b/regressiontests/stable-layouts/pom.xml
index b882977ae9..048324e084 100644
--- a/regressiontests/stable-layouts/pom.xml
+++ b/regressiontests/stable-layouts/pom.xml
@@ -22,37 +22,10 @@
<artifactId>causeway-regressiontests-stable-layouts</artifactId>
<name>Apache Causeway - Regression Tests (stable) - Layouts</name>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.causeway.extensions</groupId>
- <artifactId>causeway-extensions</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <scope>import</scope>
- <type>pom</type>
- </dependency>
- <dependency>
- <groupId>org.apache.causeway.testing</groupId>
- <artifactId>causeway-testing</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <scope>import</scope>
- <type>pom</type>
- </dependency>
- <dependency>
- <groupId>org.apache.causeway.viewer</groupId>
- <artifactId>causeway-viewer-wicket</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <scope>import</scope>
- <type>pom</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.causeway.regressiontests</groupId>
-
<artifactId>causeway-regressiontests-cmdexecauditsess-generic</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
+ <properties>
+ <maven.install.skip>true</maven.install.skip>
+ <maven.deploy.skip>true</maven.deploy.skip>
+ </properties>
<dependencies>
@@ -81,7 +54,10 @@
<artifactId>causeway-core-runtimeservices</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.causeway.regressiontests</groupId>
+ <artifactId>causeway-regressiontests-stable</artifactId>
+ </dependency>
</dependencies>
</project>
diff --git
a/regressiontests/stable-layouts/src/main/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_Counter_IntegTest.java
b/regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_Counter_IntegTest.java
similarity index 100%
rename from
regressiontests/stable-layouts/src/main/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_Counter_IntegTest.java
rename to
regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_Counter_IntegTest.java
diff --git
a/regressiontests/stable-layouts/src/main/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_SimpleObject_IntegTest.java
b/regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_SimpleObject_IntegTest.java
similarity index 100%
rename from
regressiontests/stable-layouts/src/main/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_SimpleObject_IntegTest.java
rename to
regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/Layout_SimpleObject_IntegTest.java
diff --git
a/regressiontests/stable-layouts/src/main/java/org/apache/causeway/regressiontests/layouts/integtest/model/Counter.java
b/regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/model/Counter.java
similarity index 100%
rename from
regressiontests/stable-layouts/src/main/java/org/apache/causeway/regressiontests/layouts/integtest/model/Counter.java
rename to
regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/model/Counter.java
diff --git
a/regressiontests/stable-layouts/src/main/java/org/apache/causeway/regressiontests/layouts/integtest/model/Counter.layout.xml
b/regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/model/Counter.layout.xml
similarity index 100%
rename from
regressiontests/stable-layouts/src/main/java/org/apache/causeway/regressiontests/layouts/integtest/model/Counter.layout.xml
rename to
regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/model/Counter.layout.xml
diff --git
a/regressiontests/stable-layouts/src/main/java/org/apache/causeway/regressiontests/layouts/integtest/model/LayoutTestDomainModel.java
b/regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/model/LayoutTestDomainModel.java
similarity index 100%
rename from
regressiontests/stable-layouts/src/main/java/org/apache/causeway/regressiontests/layouts/integtest/model/LayoutTestDomainModel.java
rename to
regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/model/LayoutTestDomainModel.java
diff --git
a/regressiontests/stable-layouts/src/main/java/org/apache/causeway/regressiontests/layouts/integtest/model/SimpleObject.java
b/regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/model/SimpleObject.java
similarity index 95%
rename from
regressiontests/stable-layouts/src/main/java/org/apache/causeway/regressiontests/layouts/integtest/model/SimpleObject.java
rename to
regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/model/SimpleObject.java
index 6ad9d20722..5e510da22f 100644
---
a/regressiontests/stable-layouts/src/main/java/org/apache/causeway/regressiontests/layouts/integtest/model/SimpleObject.java
+++
b/regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/model/SimpleObject.java
@@ -23,6 +23,7 @@ package
org.apache.causeway.regressiontests.layouts.integtest.model;
import java.util.Comparator;
import javax.inject.Inject;
+import javax.inject.Named;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.apache.causeway.applib.annotation.Action;
@@ -68,7 +69,8 @@ import lombok.val;
)
})
//@javax.persistence.EntityListeners(CausewayEntityListener.class)
-@DomainObject(logicalTypeName = "simple.SimpleObject", entityChangePublishing
= Publishing.ENABLED)
+@DomainObject(entityChangePublishing = Publishing.ENABLED)
+@Named("simple.SimpleObject")
@DomainObjectLayout()
@NoArgsConstructor(access = AccessLevel.PUBLIC)
@XmlJavaTypeAdapter(PersistentEntityAdapter.class)
@@ -88,7 +90,7 @@ public class SimpleObject implements Comparable<SimpleObject>
{
@Getter @Setter
private long version;
- public static SimpleObject withName(String name) {
+ public static SimpleObject withName(final String name) {
val simpleObject = new SimpleObject();
simpleObject.setName(name);
return simpleObject;
@@ -125,7 +127,7 @@ public class SimpleObject implements
Comparable<SimpleObject> {
public String default0UpdateName() {
return getName();
}
- public String validate0UpdateName(String newName) {
+ public String validate0UpdateName(final String newName) {
for (char prohibitedCharacter : "&%$!".toCharArray()) {
if( newName.contains(""+prohibitedCharacter)) {
return "Character '" + prohibitedCharacter + "' is not
allowed.";
diff --git
a/regressiontests/stable-layouts/src/main/java/org/apache/causeway/regressiontests/layouts/integtest/model/SimpleObject.layout.xml
b/regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/model/SimpleObject.layout.xml
similarity index 100%
rename from
regressiontests/stable-layouts/src/main/java/org/apache/causeway/regressiontests/layouts/integtest/model/SimpleObject.layout.xml
rename to
regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/model/SimpleObject.layout.xml
diff --git
a/regressiontests/stable-layouts/src/main/java/org/apache/causeway/regressiontests/layouts/integtest/model/types/Name.java
b/regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/model/types/Name.java
similarity index 100%
rename from
regressiontests/stable-layouts/src/main/java/org/apache/causeway/regressiontests/layouts/integtest/model/types/Name.java
rename to
regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/model/types/Name.java
diff --git
a/regressiontests/stable-layouts/src/main/java/org/apache/causeway/regressiontests/layouts/integtest/model/types/Notes.java
b/regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/model/types/Notes.java
similarity index 100%
rename from
regressiontests/stable-layouts/src/main/java/org/apache/causeway/regressiontests/layouts/integtest/model/types/Notes.java
rename to
regressiontests/stable-layouts/src/test/java/org/apache/causeway/regressiontests/layouts/integtest/model/types/Notes.java
diff --git a/regressiontests/stable-viewers-jdo/pom.xml
b/regressiontests/stable-viewers-jdo/pom.xml
index ef4320ea27..b6f1853a8b 100644
--- a/regressiontests/stable-viewers-jdo/pom.xml
+++ b/regressiontests/stable-viewers-jdo/pom.xml
@@ -22,8 +22,12 @@
</parent>
<artifactId>causeway-regressiontests-stable-viewers-jdo</artifactId>
-
<name>Apache Causeway - Regression Tests (stable) - Viewers JDO</name>
+
+ <properties>
+
<jar-plugin.automaticModuleName>org.apache.causeway.regressiontests.stable.viewers.jdo</jar-plugin.automaticModuleName>
+
<git-plugin.propertiesDir>org/apache/causeway/regressiontests/stable/viewers/jdo</git-plugin.propertiesDir>
+ </properties>
<dependencies>
diff --git a/regressiontests/stable-viewers-jpa/pom.xml
b/regressiontests/stable-viewers-jpa/pom.xml
index 9028f64534..e2ab95aa22 100644
--- a/regressiontests/stable-viewers-jpa/pom.xml
+++ b/regressiontests/stable-viewers-jpa/pom.xml
@@ -22,8 +22,12 @@
</parent>
<artifactId>causeway-regressiontests-stable-viewers-jpa</artifactId>
-
<name>Apache Causeway - Regression Tests (stable) - Viewers JPA</name>
+
+ <properties>
+
<jar-plugin.automaticModuleName>org.apache.causeway.regressiontests.stable.viewers.jpa</jar-plugin.automaticModuleName>
+
<git-plugin.propertiesDir>org/apache/causeway/regressiontests/stable/viewers/jpa</git-plugin.propertiesDir>
+ </properties>
<dependencies>
diff --git a/regressiontests/stable/pom.xml b/regressiontests/stable/pom.xml
index c794e1190f..39667923f9 100644
--- a/regressiontests/stable/pom.xml
+++ b/regressiontests/stable/pom.xml
@@ -22,8 +22,12 @@
</parent>
<artifactId>causeway-regressiontests-stable</artifactId>
-
<name>Apache Causeway - Regression Tests (stable)</name>
+
+ <properties>
+
<jar-plugin.automaticModuleName>org.apache.causeway.regressiontests.stable</jar-plugin.automaticModuleName>
+
<git-plugin.propertiesDir>org/apache/causeway/regressiontests/stable</git-plugin.propertiesDir>
+ </properties>
<dependencies>
diff --git a/starters/pom.xml b/starters/pom.xml
index 22e1557706..71902830ba 100644
--- a/starters/pom.xml
+++ b/starters/pom.xml
@@ -146,70 +146,17 @@
<profile>
<id>causeway-app-starter-datanucleusenhance</id>
<activation>
- <file>
-
<exists>${basedir}/logging-dn-enhance.properties</exists>
- </file>
+ <property>
+
<name>causeway-app-starter-datanucleusenhance</name>
+ <value>true</value>
+ </property>
</activation>
- <properties>
-
- <!-- 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>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-maven-plugin</artifactId>
-
<version>${datanucleus-maven-plugin.version}</version>
- <configuration>
-
<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>
+ <inherited>true</inherited>
</plugin>
</plugins>
</build>
diff --git a/testing/pom.xml b/testing/pom.xml
index becd5e4cdd..2d23b46183 100644
--- a/testing/pom.xml
+++ b/testing/pom.xml
@@ -174,73 +174,6 @@
<module>unittestsupport</module>
</modules>
- <profiles>
- <profile>
- <id>causeway-app-starter-datanucleusenhance</id>
- <activation>
- <file>
-
<exists>${basedir}/logging-dn-enhance.properties</exists>
- </file>
- </activation>
- <properties>
-
<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>
-
<groupId>org.datanucleus</groupId>
-
<artifactId>datanucleus-maven-plugin</artifactId>
-
<version>${datanucleus-maven-plugin.version}</version>
- <configuration>
-
<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>
- </profile>
-
- </profiles>
-
</project>
diff --git a/valuetypes/pom.xml b/valuetypes/pom.xml
index 4e4128400e..3620cdcb58 100644
--- a/valuetypes/pom.xml
+++ b/valuetypes/pom.xml
@@ -186,73 +186,6 @@
<module>vega</module>
</modules>
- <profiles>
- <profile>
- <id>causeway-app-starter-datanucleusenhance</id>
- <activation>
- <file>
-
<exists>${basedir}/logging-dn-enhance.properties</exists>
- </file>
- </activation>
- <properties>
-
<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>
-
<groupId>org.datanucleus</groupId>
-
<artifactId>datanucleus-maven-plugin</artifactId>
-
<version>${datanucleus-maven-plugin.version}</version>
- <configuration>
-
<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>
- </profile>
-
- </profiles>
-
</project>
