[BAEL-18306-2] - Fix formatting of POMs Part 2

2019-10-13 23:42:06 +05:30
parent 6a22b9162b
commit 95dc22f0e3
7 changed files with 52 additions and 56 deletions
--- a/java-ee-8-security-api/pom.xml
+++ b/java-ee-8-security-api/pom.xml
@@ -14,6 +14,13 @@
 		<version>1.0.0-SNAPSHOT</version>
 	</parent>

+    <modules>
+        <module>app-auth-basic-store-db</module>
+        <module>app-auth-form-store-ldap</module>
+        <module>app-auth-custom-form-store-custom</module>
+        <module>app-auth-custom-no-store</module>
+    </modules>
+
    <dependencies>
    
        <dependency>
@@ -58,17 +65,9 @@
        </plugins>
    </build>

-    <modules>
-        <module>app-auth-basic-store-db</module>
-        <module>app-auth-form-store-ldap</module>
-        <module>app-auth-custom-form-store-custom</module>
-        <module>app-auth-custom-no-store</module>
-    </modules>
-
    <properties>
        <defaultHttpPort>9080</defaultHttpPort>
        <defaultHttpsPort>9443</defaultHttpsPort>
-
        <javaee-version>8.0</javaee-version>
        <liberty-maven-plugin.version>2.3</liberty-maven-plugin.version>
        <openliberty-runtime.version>18.0.0.1</openliberty-runtime.version>
--- a/libraries-primitive/pom.xml
+++ b/libraries-primitive/pom.xml
@@ -3,17 +3,11 @@
         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>
-
    <groupId>com.baeldung</groupId>
    <artifactId>libraries-primitive</artifactId>
    <version>1.0-SNAPSHOT</version>
    <name>libraries-primitive</name>

-    <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-    </properties>
-
    <dependencies>
        <!-- https://mvnrepository.com/artifact/it.unimi.dsi/fastutil -->
        <dependency>
@@ -47,12 +41,15 @@
            <artifactId>eclipse-collections-api</artifactId>
            <version>10.0.0</version>
        </dependency>
-
        <dependency>
            <groupId>org.eclipse.collections</groupId>
            <artifactId>eclipse-collections</artifactId>
            <version>10.0.0</version>
        </dependency>
-
    </dependencies>
+
+    <properties>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+    </properties>
 </project>
--- a/logging-modules/flogger/pom.xml
+++ b/logging-modules/flogger/pom.xml
@@ -2,14 +2,14 @@
 <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>
+    <artifactId>flogger</artifactId>
+
    <parent>
        <artifactId>logging-modules</artifactId>
        <groupId>com.baeldung</groupId>
        <version>1.0.0-SNAPSHOT</version>
    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>flogger</artifactId>

    <dependencies>
        <dependency>
--- a/oauth2-framework-impl/oauth2-authorization-server/pom.xml
+++ b/oauth2-framework-impl/oauth2-authorization-server/pom.xml
@@ -3,7 +3,6 @@
         xmlns="http://maven.apache.org/POM/4.0.0"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
    <modelVersion>4.0.0</modelVersion>
-
    <artifactId>oauth2-authorization-server</artifactId>
    <packaging>war</packaging>
    <name>oauth2-authorization-server</name>
@@ -14,15 +13,6 @@
        <version>1.0-SNAPSHOT</version>
    </parent>

-    <properties>
-        <h2.version>1.4.199</h2.version>
-        <httpPort>9080</httpPort>
-        <httpsPort>9443</httpsPort>
-        <nimbus-jose-jwt.version>7.3</nimbus-jose-jwt.version>
-        <bcprov-jdk15on.version>1.62</bcprov-jdk15on.version>
-        <bcpkix-jdk15on.version>1.62</bcpkix-jdk15on.version>
-    </properties>
-
    <dependencies>
        <dependency>
            <groupId>com.nimbusds</groupId>
@@ -73,4 +63,13 @@
            </plugin>
        </plugins>
    </build>
+
+    <properties>
+        <h2.version>1.4.199</h2.version>
+        <httpPort>9080</httpPort>
+        <httpsPort>9443</httpsPort>
+        <nimbus-jose-jwt.version>7.3</nimbus-jose-jwt.version>
+        <bcprov-jdk15on.version>1.62</bcprov-jdk15on.version>
+        <bcpkix-jdk15on.version>1.62</bcpkix-jdk15on.version>
+    </properties>
 </project>
--- a/oauth2-framework-impl/oauth2-client/pom.xml
+++ b/oauth2-framework-impl/oauth2-client/pom.xml
@@ -13,11 +13,6 @@
        <version>1.0-SNAPSHOT</version>
    </parent>

-    <properties>
-        <httpPort>9180</httpPort>
-        <httpsPort>9543</httpsPort>
-    </properties>
-
    <build>
        <plugins>
            <plugin>
@@ -26,4 +21,9 @@
            </plugin>
        </plugins>
    </build>
+
+    <properties>
+        <httpPort>9180</httpPort>
+        <httpsPort>9543</httpsPort>
+    </properties>
 </project>
--- a/oauth2-framework-impl/oauth2-resource-server/pom.xml
+++ b/oauth2-framework-impl/oauth2-resource-server/pom.xml
@@ -13,14 +13,6 @@
        <version>1.0-SNAPSHOT</version>
    </parent>

-    <properties>
-        <httpPort>9280</httpPort>
-        <httpsPort>8643</httpsPort>
-        <jwt.issuer>http://localhost:9080</jwt.issuer>
-        <jwt.resourceId>http://localhost:9280</jwt.resourceId>
-        <microprofile-jwt-auth-api.version>1.1</microprofile-jwt-auth-api.version>
-    </properties>
-
    <dependencies>
        <dependency>
            <groupId>org.eclipse.microprofile.jwt</groupId>
@@ -39,4 +31,12 @@
        </plugins>
    </build>

+    <properties>
+        <httpPort>9280</httpPort>
+        <httpsPort>8643</httpsPort>
+        <jwt.issuer>http://localhost:9080</jwt.issuer>
+        <jwt.resourceId>http://localhost:9280</jwt.resourceId>
+        <microprofile-jwt-auth-api.version>1.1</microprofile-jwt-auth-api.version>
+    </properties>
+
 </project>
--- a/oauth2-framework-impl/pom.xml
+++ b/oauth2-framework-impl/pom.xml
@@ -9,15 +9,11 @@
    <packaging>pom</packaging>
    <name>oauth2-framework-impl</name>

-    <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <failOnMissingWebXml>false</failOnMissingWebXml>
-        <openliberty.version>RELEASE</openliberty.version>
-        <openliberty.maven.version>2.6.4</openliberty.maven.version>
-        <javaee-web-api.version>8.0</javaee-web-api.version>
-        <microprofile-config-api.version>1.3</microprofile-config-api.version>
-    </properties>
+    <modules>
+        <module>oauth2-authorization-server</module>
+        <module>oauth2-resource-server</module>
+        <module>oauth2-client</module>
+    </modules>

    <dependencies>
        <dependency>
@@ -88,9 +84,14 @@
            </plugins>
        </pluginManagement>
    </build>
-    <modules>
-        <module>oauth2-authorization-server</module>
-        <module>oauth2-resource-server</module>
-        <module>oauth2-client</module>
-    </modules>
+
+    <properties>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <failOnMissingWebXml>false</failOnMissingWebXml>
+        <openliberty.version>RELEASE</openliberty.version>
+        <openliberty.maven.version>2.6.4</openliberty.maven.version>
+        <javaee-web-api.version>8.0</javaee-web-api.version>
+        <microprofile-config-api.version>1.3</microprofile-config-api.version>
+    </properties>
 </project>