From 133cf95c6d5b5c741670e38b45f99d4485f0533d Mon Sep 17 00:00:00 2001
From: rob bygrave <robin.bygrave@gmail.com>
Date: Wed, 14 Oct 2020 00:00:17 +1300
Subject: [PATCH] Reset poms for externalmapping-xml querybean and ebean-test
 modules after manual release take 2

---
 ebean-api/pom.xml                  |  2 +-
 ebean-autotune/pom.xml             |  2 +-
 ebean-bom/pom.xml                  |  2 +-
 ebean-ddlgen/pom.xml               |  2 +-
 ebean-externalmapping-api/pom.xml  |  2 +-
 ebean-externalmapping-xml/pom.xml  | 23 +++++------------------
 ebean-querybean/pom.xml            | 19 ++++---------------
 ebean-test/pom.xml                 | 22 +++++-----------------
 ebean/pom.xml                      |  2 +-
 kotlin-querybean-generator/pom.xml |  2 +-
 querybean-generator/pom.xml        |  2 +-
 11 files changed, 22 insertions(+), 58 deletions(-)

diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index a7bfde7ac..8c60e3536 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
     <version>12.5.1-SNAPSHOT</version>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
 
   <artifactId>ebean-api</artifactId>
 
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index ea9a668b8..37b56d1c0 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
     <version>12.5.1-SNAPSHOT</version>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
 
   <artifactId>ebean-autotune</artifactId>
 
diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml
index 744670169..60de36bdf 100644
--- a/ebean-bom/pom.xml
+++ b/ebean-bom/pom.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
     <version>12.5.1-SNAPSHOT</version>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
 
   <artifactId>ebean-bom</artifactId>
   <packaging>pom</packaging>
diff --git a/ebean-ddlgen/pom.xml b/ebean-ddlgen/pom.xml
index 9d45fc6e5..ed9b61092 100644
--- a/ebean-ddlgen/pom.xml
+++ b/ebean-ddlgen/pom.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
     <version>12.5.1-SNAPSHOT</version>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
 
   <artifactId>ebean-ddlgen</artifactId>
 
diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml
index ca00d17de..8f211889f 100644
--- a/ebean-externalmapping-api/pom.xml
+++ b/ebean-externalmapping-api/pom.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
     <version>12.5.1-SNAPSHOT</version>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
 
   <artifactId>ebean-externalmapping-api</artifactId>
 
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index bfb7a889b..af9aaf4be 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -1,26 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-<!--  <parent>-->
-<!--    <artifactId>ebean-parent</artifactId>-->
-<!--    <groupId>io.ebean</groupId>-->
-<!--    <version>12.5.1-SNAPSHOT</version>-->
-<!--  </parent>-->
+  <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.avaje</groupId>
-    <artifactId>java8-oss</artifactId>
-    <version>2.2</version>
+    <artifactId>ebean-parent</artifactId>
+    <groupId>io.ebean</groupId>
+    <version>12.5.1-SNAPSHOT</version>
   </parent>
 
-  <scm>
-    <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
-  </scm>
-
-  <modelVersion>4.0.0</modelVersion>
-
   <artifactId>ebean-externalmapping-xml</artifactId>
-  <groupId>io.ebean</groupId>
-  <version>12.5.1-SNAPSHOT</version>
 
   <dependencies>
 
@@ -34,7 +21,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.5.0</version>
+      <version>12.5.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index 8f92fa1ef..3db43bd24 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -1,24 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-<!--  <parent>-->
-<!--    <artifactId>ebean-parent</artifactId>-->
-<!--    <groupId>io.ebean</groupId>-->
-<!--    <version>12.5.1-SNAPSHOT</version>-->
-<!--  </parent>-->
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.avaje</groupId>
-    <artifactId>java8-oss</artifactId>
-    <version>2.2</version>
+    <artifactId>ebean-parent</artifactId>
+    <groupId>io.ebean</groupId>
+    <version>12.5.1-SNAPSHOT</version>
   </parent>
 
-  <scm>
-    <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
-  </scm>
   <artifactId>ebean-querybean</artifactId>
-  <groupId>io.ebean</groupId>
-  <version>12.5.1-SNAPSHOT</version>
 
   <dependencies>
 
@@ -26,7 +15,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.5.0</version>
+      <version>12.5.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index d099d841b..6abe6439d 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -1,25 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-<!--  <parent>-->
-<!--    <artifactId>ebean-parent</artifactId>-->
-<!--    <groupId>io.ebean</groupId>-->
-<!--    <version>12.5.1-SNAPSHOT</version>-->
-<!--  </parent>-->
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.avaje</groupId>
-    <artifactId>java8-oss</artifactId>
-    <version>2.2</version>
+    <artifactId>ebean-parent</artifactId>
+    <groupId>io.ebean</groupId>
+    <version>12.5.1-SNAPSHOT</version>
   </parent>
 
-  <scm>
-    <developerConnection>scm:git:git@github.com:ebean-orm/ebean.git</developerConnection>
-    <tag>HEAD</tag>
-  </scm>
-
-  <groupId>io.ebean</groupId>
   <artifactId>ebean-test</artifactId>
-  <version>12.5.1-SNAPSHOT</version>
 
   <dependencies>
 
@@ -33,14 +21,14 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
-      <version>12.5.0</version>
+      <version>12.5.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-ddlgen</artifactId>
-      <version>12.5.0</version>
+      <version>12.5.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/ebean/pom.xml b/ebean/pom.xml
index 7aa507c28..1d302a578 100644
--- a/ebean/pom.xml
+++ b/ebean/pom.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
     <version>12.5.1-SNAPSHOT</version>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
 
   <artifactId>ebean</artifactId>
 
diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml
index e20c33ce7..2a04f2144 100644
--- a/kotlin-querybean-generator/pom.xml
+++ b/kotlin-querybean-generator/pom.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
     <version>12.5.1-SNAPSHOT</version>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
 
   <artifactId>kotlin-querybean-generator</artifactId>
 
diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml
index f677f214a..c1b022605 100644
--- a/querybean-generator/pom.xml
+++ b/querybean-generator/pom.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
     <version>12.5.1-SNAPSHOT</version>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
 
   <artifactId>querybean-generator</artifactId>