From dccbc537b63f765223ff1c0014f38226914c8586 Mon Sep 17 00:00:00 2001
From: "Edward M. Kagan" <pagan@tabor.one>
Date: Tue, 28 Jul 2020 03:16:10 +0300
Subject: [PATCH] Fixed pom error in formalist-deployment. Fixed pom files to
 look same.

---
 cayenne/deployment/pom.xml   |  7 -------
 cayenne/runtime/pom.xml      |  8 +++-----
 formalist/deployment/pom.xml | 27 +++------------------------
 formalist/runtime/pom.xml    | 26 +++-----------------------
 janitor/deployment/pom.xml   |  5 -----
 janitor/runtime/pom.xml      | 27 ++-------------------------
 jedis/runtime/pom.xml        | 11 ++---------
 pom.xml                      |  1 -
 8 files changed, 13 insertions(+), 99 deletions(-)

diff --git a/cayenne/deployment/pom.xml b/cayenne/deployment/pom.xml
index 928a740..b14aa4c 100644
--- a/cayenne/deployment/pom.xml
+++ b/cayenne/deployment/pom.xml
@@ -17,17 +17,10 @@
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-core-deployment</artifactId>
-            <version>${quarkus.platform.version}</version>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-agroal-deployment</artifactId>
-            <version>${quarkus.platform.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-agroal-deployment</artifactId>
-            <version>${quarkus.platform.version}</version>
         </dependency>
         <dependency>
             <groupId>org.pagan.quarkus</groupId>
diff --git a/cayenne/runtime/pom.xml b/cayenne/runtime/pom.xml
index 3db21cb..45cdbb5 100644
--- a/cayenne/runtime/pom.xml
+++ b/cayenne/runtime/pom.xml
@@ -1,6 +1,7 @@
 <?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">
+<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>
@@ -16,12 +17,10 @@
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-core</artifactId>
-            <version>${quarkus.platform.version}</version>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-agroal</artifactId>
-            <version>${quarkus.platform.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cayenne</groupId>
@@ -63,5 +62,4 @@
             </plugin>
         </plugins>
     </build>
-
 </project>
\ No newline at end of file
diff --git a/formalist/deployment/pom.xml b/formalist/deployment/pom.xml
index bec93a4..ba4f8b5 100644
--- a/formalist/deployment/pom.xml
+++ b/formalist/deployment/pom.xml
@@ -1,5 +1,4 @@
 <?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">
@@ -7,11 +6,13 @@
 
     <parent>
         <groupId>org.pagan.quarkus</groupId>
-        <artifactId>janitor-parent</artifactId>
+        <artifactId>formalist-parent</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>formalist-deployment</artifactId>
+    <name>${project.artifactId}</name>
+    
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -31,33 +32,11 @@
             <version>2.0.2</version>
             <type>jar</type>
         </dependency>
-
-        <!--        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-internal</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-resteasy-jsonb-deployment</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.rest-assured</groupId>
-            <artifactId>rest-assured</artifactId>
-            <scope>test</scope>
-        </dependency>-->
         <dependency>
             <groupId>org.pagan.quarkus</groupId>
             <artifactId>formalist</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
- 
     </dependencies>
 
     <build>
diff --git a/formalist/runtime/pom.xml b/formalist/runtime/pom.xml
index 6aa1a1b..574a9fa 100644
--- a/formalist/runtime/pom.xml
+++ b/formalist/runtime/pom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
+<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
@@ -12,6 +12,7 @@
     
     <artifactId>formalist</artifactId>
     <name>${project.artifactId}</name>
+    
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -21,28 +22,17 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-arc</artifactId>
         </dependency>
-<!--         <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-core-deployment</artifactId>
-        </dependency>-->
         <dependency>
             <groupId>org.apache.bval</groupId>
             <artifactId>bval-jsr</artifactId>
             <version>2.0.4</version>
         </dependency>
-         <dependency>
+        <dependency>
             <groupId>jakarta.validation</groupId>
             <artifactId>jakarta.validation-api</artifactId>
             <version>2.0.2</version>
             <type>jar</type>
         </dependency>
-
-      
-        <!-- EL implementation -->
-        <!--        <dependency>
-           <groupId>org.glassfish</groupId>
-           <artifactId>jakarta.el</artifactId>
-        </dependency>-->
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-core</artifactId>
@@ -74,11 +64,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <!--        <dependency>
-            <groupId>org.graalvm.nativeimage</groupId>
-            <artifactId>svm</artifactId>
-        </dependency>-->
-       
     </dependencies>
 
     <build>
@@ -97,11 +82,6 @@
                         </configuration>
                     </execution>
                 </executions>
-<!--                <configuration>
-                    <excludedArtifacts>
-                        <excludedArtifact>javax.validation:validation-api</excludedArtifact>
-                    </excludedArtifacts>
-                </configuration>-->
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/janitor/deployment/pom.xml b/janitor/deployment/pom.xml
index be14f25..f2694e9 100644
--- a/janitor/deployment/pom.xml
+++ b/janitor/deployment/pom.xml
@@ -24,11 +24,6 @@
             <artifactId>quarkus-resteasy-deployment</artifactId>
             <version>${quarkus.platform.version}</version>
         </dependency>
-<!--        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-agroal-deployment</artifactId>
-            <version>${quarkus.platform.version}</version>
-        </dependency>-->
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-vertx-web-deployment</artifactId>
diff --git a/janitor/runtime/pom.xml b/janitor/runtime/pom.xml
index 88e53b6..f767dcd 100644
--- a/janitor/runtime/pom.xml
+++ b/janitor/runtime/pom.xml
@@ -1,5 +1,6 @@
 <?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"
+<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>
 
@@ -20,43 +21,20 @@
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-core</artifactId>
-            <version>${quarkus.platform.version}</version>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-vertx-web</artifactId>
-            <version>${quarkus.platform.version}</version>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-security</artifactId>
-            <version>${quarkus.platform.version}</version>
-        </dependency>
-        <!--        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-core</artifactId>
-            <version>${quarkus.version}</version>
         </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-undertow</artifactId>
-            <version>${quarkus.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-elytron-security</artifactId>
-            <version>${quarkus.version}</version>
-        </dependency>-->
         <dependency>
             <groupId>org.pagan.quarkus</groupId>
             <artifactId>cayenne</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
-        <!--        <dependency>
-            <groupId>org.two.pm</groupId>
-            <artifactId>cayenne-orm</artifactId>
-            <version>1.0.1.Final</version>
-        </dependency>-->
     </dependencies>
     
     <build>
@@ -92,5 +70,4 @@
             </plugin>
         </plugins>
     </build>
-    
 </project>
diff --git a/jedis/runtime/pom.xml b/jedis/runtime/pom.xml
index 58f22cc..cc5b508 100644
--- a/jedis/runtime/pom.xml
+++ b/jedis/runtime/pom.xml
@@ -1,5 +1,6 @@
 <?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"
+<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>
 
@@ -16,28 +17,20 @@
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-core</artifactId>
-            <version>${quarkus.platform.version}</version>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-arc</artifactId>
-            <version>${quarkus.platform.version}</version>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-agroal</artifactId>
-            <version>${quarkus.platform.version}</version>
         </dependency>
         <dependency>
             <groupId>redis.clients</groupId>
             <artifactId>jedis</artifactId>
             <version>${jedis.version}</version>
         </dependency>
-<!--        <dependency>
-            <groupId>org.graalvm.nativeimage</groupId>
-            <artifactId>svm</artifactId>
-            <version>${graalvm.version}</version>
-        </dependency>-->
     </dependencies>
 
     <build>
diff --git a/pom.xml b/pom.xml
index 51ac165..080650c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,6 @@
         <module>jedis</module>
         <module>janitor</module>
         <module>formalist</module>
-        <!--<module>cautus</module>-->
         <module>demo</module>
     </modules>
     <properties>