This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch v3-jdo-SNAPSHOT
in repository https://gitbox.apache.org/repos/asf/causeway-app-simpleapp.git

commit acebe34d3d37ccd8e3f05e4ec78b04051014b11f
Merge: 0c8b50d 3f3e428
Author: Dan Haywood <[email protected]>
AuthorDate: Tue Nov 18 06:41:03 2025 +0000

    Merge branch 'v3-jpa-SNAPSHOT' into v3-jdo-SNAPSHOT

 module-simple-tests/pom.xml | 2 +-
 module-simple/pom.xml       | 2 +-
 pom.xml                     | 4 ++--
 webapp-tests/pom.xml        | 2 +-
 webapp/pom.xml              | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --cc module-simple-tests/pom.xml
index 844819c,339bd2e..784a65c
--- a/module-simple-tests/pom.xml
+++ b/module-simple-tests/pom.xml
@@@ -5,13 -5,13 +5,13 @@@
      <modelVersion>4.0.0</modelVersion>
  
      <parent>
 -        <artifactId>simpleapp-jpa</artifactId>
 +        <artifactId>simpleapp-jdo</artifactId>
          <groupId>org.apache.causeway.starters</groupId>
-         <version>3.5.0</version>
+         <version>3.6.0-SNAPSHOT</version>
      </parent>
  
 -    <artifactId>simpleapp-jpa-module-simple-tests</artifactId>
 -    <name>SimpleApp (JPA) - Simple Module (tests)</name>
 +    <artifactId>simpleapp-jdo-module-simple-tests</artifactId>
 +    <name>SimpleApp (JDO) - Simple Module (tests)</name>
  
      <description>
          Integ tests for 'simple module'
diff --cc module-simple/pom.xml
index cd8f37d,097e6a0..509d8cb
--- a/module-simple/pom.xml
+++ b/module-simple/pom.xml
@@@ -5,13 -5,13 +5,13 @@@
      <modelVersion>4.0.0</modelVersion>
  
      <parent>
 -        <artifactId>simpleapp-jpa</artifactId>
 +        <artifactId>simpleapp-jdo</artifactId>
          <groupId>org.apache.causeway.starters</groupId>
-         <version>3.5.0</version>
+         <version>3.6.0-SNAPSHOT</version>
      </parent>
  
 -    <artifactId>simpleapp-jpa-module-simple</artifactId>
 -    <name>SimpleApp (JPA) - Simple Module</name>
 +    <artifactId>simpleapp-jdo-module-simple</artifactId>
 +    <name>SimpleApp (JDO) - Simple Module</name>
  
      <build>
          <resources>
diff --cc pom.xml
index 32e803b,d521735..78b8374
--- a/pom.xml
+++ b/pom.xml
@@@ -10,11 -10,11 +10,11 @@@
          <relativePath/>
      </parent>
  
 -    <artifactId>simpleapp-jpa</artifactId>
 +    <artifactId>simpleapp-jdo</artifactId>
      <groupId>org.apache.causeway.starters</groupId>
-     <version>3.5.0</version>
+     <version>3.6.0-SNAPSHOT</version>
  
 -    <name>SimpleApp (JPA) - Parent</name>
 +    <name>SimpleApp (JDO) - Parent</name>
  
      <packaging>pom</packaging>
  
diff --cc webapp-tests/pom.xml
index 07985bc,094fe18..7f9e362
--- a/webapp-tests/pom.xml
+++ b/webapp-tests/pom.xml
@@@ -3,13 -3,13 +3,13 @@@
      <modelVersion>4.0.0</modelVersion>
  
      <parent>
 -        <artifactId>simpleapp-jpa</artifactId>
 +        <artifactId>simpleapp-jdo</artifactId>
          <groupId>org.apache.causeway.starters</groupId>
-         <version>3.5.0</version>
+         <version>3.6.0-SNAPSHOT</version>
      </parent>
  
 -    <artifactId>simpleapp-jpa-webapp-tests</artifactId>
 -    <name>SimpleApp (JPA) - Webapp (tests)</name>
 +    <artifactId>simpleapp-jdo-webapp-tests</artifactId>
 +    <name>SimpleApp (JDO) - Webapp (tests)</name>
  
      <description>
          Integ tests for entire app.
diff --cc webapp/pom.xml
index 1748760,bac4c5c..03f56ee
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@@ -4,13 -4,13 +4,13 @@@
      <modelVersion>4.0.0</modelVersion>
  
      <parent>
 -        <artifactId>simpleapp-jpa</artifactId>
 +        <artifactId>simpleapp-jdo</artifactId>
          <groupId>org.apache.causeway.starters</groupId>
-         <version>3.5.0</version>
+         <version>3.6.0-SNAPSHOT</version>
      </parent>
  
 -    <artifactId>simpleapp-jpa-webapp</artifactId>
 -    <name>SimpleApp (JPA) - Webapp</name>
 +    <artifactId>simpleapp-jdo-webapp</artifactId>
 +    <name>SimpleApp (JDO) - Webapp</name>
  
      <description>
          Assembles and runs the Wicket viewer, the Restfulobjects viewer and 
the GraphQL viewer

Reply via email to