Merge pull request #11920 from freelansam/JAVA-10138

JAVA-10138 - Fix formatting of POMs
This commit is contained in:
kwoyke
2022-03-14 15:00:17 +01:00
committed by GitHub
71 changed files with 301 additions and 356 deletions

View File

@@ -1,22 +1,16 @@
<?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">
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>maven-classifier-example-consumer</artifactId>
<parent>
<artifactId>maven-classifier</artifactId>
<groupId>com.baeldung</groupId>
<version>0.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-classifier-example-consumer</artifactId>
<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
</properties>
<dependencies>
<dependency>
<groupId>com.baeldung</groupId>
@@ -29,13 +23,14 @@
<version>0.0.1-SNAPSHOT</version>
<classifier>arbitrary</classifier>
</dependency>
<!-- For example purpose not building as it requires both JDK 8 and 11 executables on the build machine -->
<!-- <dependency>-->
<!-- <groupId>com.baeldung</groupId>-->
<!-- <artifactId>maven-classifier-example-provider</artifactId>-->
<!-- <version>0.0.1-SNAPSHOT</version>-->
<!-- <classifier>jdk11</classifier>-->
<!-- </dependency>-->
<!-- For example purpose not building as it requires both JDK 8 and 11 executables on the build
machine -->
<!-- <dependency> -->
<!-- <groupId>com.baeldung</groupId> -->
<!-- <artifactId>maven-classifier-example-provider</artifactId> -->
<!-- <version>0.0.1-SNAPSHOT</version> -->
<!-- <classifier>jdk11</classifier> -->
<!-- </dependency> -->
<dependency>
<groupId>com.baeldung</groupId>
<artifactId>maven-classifier-example-provider</artifactId>
@@ -50,4 +45,9 @@
</dependency>
</dependencies>
</project>
<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
</properties>
</project>

View File

@@ -1,9 +1,10 @@
<?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">
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>maven-classifier-example-provider</artifactId>
<version>0.0.1-SNAPSHOT</version>
<parent>
<artifactId>maven-classifier</artifactId>
@@ -11,15 +12,6 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>maven-classifier-example-provider</artifactId>
<version>0.0.1-SNAPSHOT</version>
<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
<!-- <jdk.11.executable.path></jdk.11.executable.path>-->
</properties>
<build>
<plugins>
<plugin>
@@ -39,21 +31,22 @@
<fork>true</fork>
</configuration>
</execution>
<!-- For example purpose not building as it requires both JDK 8 and 11 executables on the build machine -->
<!-- <execution>-->
<!-- <id>JDK 11</id>-->
<!-- <phase>compile</phase>-->
<!-- <goals>-->
<!-- <goal>compile</goal>-->
<!-- </goals>-->
<!-- <configuration>-->
<!-- <fork>true</fork>-->
<!-- <outputDirectory>${project.build.outputDirectory}_jdk11</outputDirectory>-->
<!-- <executable>${jdk.11.executable.path}</executable>-->
<!-- <source>8</source>-->
<!-- <target>11</target>-->
<!-- </configuration>-->
<!-- </execution>-->
<!-- For example purpose not building as it requires both JDK 8 and 11 executables
on the build machine -->
<!-- <execution> -->
<!-- <id>JDK 11</id> -->
<!-- <phase>compile</phase> -->
<!-- <goals> -->
<!-- <goal>compile</goal> -->
<!-- </goals> -->
<!-- <configuration> -->
<!-- <fork>true</fork> -->
<!-- <outputDirectory>${project.build.outputDirectory}_jdk11</outputDirectory> -->
<!-- <executable>${jdk.11.executable.path}</executable> -->
<!-- <source>8</source> -->
<!-- <target>11</target> -->
<!-- </configuration> -->
<!-- </execution> -->
</executions>
</plugin>
<plugin>
@@ -76,18 +69,19 @@
<goal>test-jar</goal>
</goals>
</execution>
<!-- For example purpose not building as it requires both JDK 8 and 11 executables on the build machine -->
<!-- <execution>-->
<!-- <id>default-package-jdk11</id>-->
<!-- <phase>package</phase>-->
<!-- <goals>-->
<!-- <goal>jar</goal>-->
<!-- </goals>-->
<!-- <configuration>-->
<!-- <classesDirectory>${project.build.outputDirectory}_jdk11</classesDirectory>-->
<!-- <classifier>jdk11</classifier>-->
<!-- </configuration>-->
<!-- </execution>-->
<!-- For example purpose not building as it requires both JDK 8 and 11 executables
on the build machine -->
<!-- <execution> -->
<!-- <id>default-package-jdk11</id> -->
<!-- <phase>package</phase> -->
<!-- <goals> -->
<!-- <goal>jar</goal> -->
<!-- </goals> -->
<!-- <configuration> -->
<!-- <classesDirectory>${project.build.outputDirectory}_jdk11</classesDirectory> -->
<!-- <classifier>jdk11</classifier> -->
<!-- </configuration> -->
<!-- </execution> -->
</executions>
</plugin>
<plugin>
@@ -119,4 +113,11 @@
</plugin>
</plugins>
</build>
</project>
<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
<!-- <jdk.11.executable.path></jdk.11.executable.path> -->
</properties>
</project>

View File

@@ -1,9 +1,8 @@
<?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">
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>maven-classifier</artifactId>
<packaging>pom</packaging>
<version>0.0.1-SNAPSHOT</version>
@@ -24,4 +23,4 @@
<maven.compiler.target>8</maven.compiler.target>
</properties>
</project>
</project>

View File

@@ -6,8 +6,8 @@
<groupId>com.baeldung</groupId>
<artifactId>maven-generate-war</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>war</packaging>
<name>maven-generate-war</name>
<packaging>war</packaging>
<description>Spring boot project to demonstrate war file generation</description>
<parent>

View File

@@ -13,4 +13,4 @@
<version>1.0.0-SNAPSHOT</version>
</parent>
</project>
</project>

View File

@@ -18,4 +18,5 @@
<module>service</module>
<module>webapp</module>
</modules>
</project>
</project>

View File

@@ -13,4 +13,4 @@
<version>1.0.0-SNAPSHOT</version>
</parent>
</project>
</project>

View File

@@ -13,4 +13,4 @@
<version>1.0.0-SNAPSHOT</version>
</parent>
</project>
</project>