Merge branch 'eugenp:master' into master

This commit is contained in:
Ulisses Lima
2022-03-14 23:32:29 -03:00
committed by GitHub
99 changed files with 958 additions and 357 deletions
+1 -1
View File
@@ -83,4 +83,4 @@
<olingo.version>2.0.11</olingo.version>
</properties>
</project>
</project>
@@ -34,6 +34,28 @@
</dependency>
</dependencies>
<build>
<finalName>core-java-9-new-features</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<configuration>
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
</configuration>
</plugin>
</plugins>
</build>
<pluginRepositories>
<pluginRepository>
<id>apache.snapshots</id>
<url>https://repository.apache.org/snapshots/</url>
</pluginRepository>
</pluginRepositories>
<profiles>
<profile>
<id>incubator-features</id>
@@ -126,28 +148,6 @@
</profile>
</profiles>
<build>
<finalName>core-java-9-new-features</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<configuration>
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
</configuration>
</plugin>
</plugins>
</build>
<pluginRepositories>
<pluginRepository>
<id>apache.snapshots</id>
<url>https://repository.apache.org/snapshots/</url>
</pluginRepository>
</pluginRepositories>
<properties>
<rxjava.version>3.0.0</rxjava.version>
<awaitility.version>4.0.2</awaitility.version>
@@ -24,4 +24,4 @@
</resources>
</build>
</project>
</project>
@@ -25,7 +25,6 @@
<artifactId>commons-lang3</artifactId>
<version>${commons-lang3.version}</version>
</dependency>
<dependency>
<groupId>com.darwinsys</groupId>
<artifactId>hirondelle-date4j</artifactId>
+1 -1
View File
@@ -259,7 +259,7 @@
</plugins>
</build>
</profile>
</profiles>
<properties>
+8 -7
View File
@@ -64,13 +64,6 @@
</dependency>
</dependencies>
<properties>
<javaassist.version>3.27.0-GA</javaassist.version>
<sun.tools.version>1.8.0</sun.tools.version>
<jol-core.version>0.10</jol-core.version>
<asm.version>8.0.1</asm.version>
<bcel.version>6.5.0</bcel.version>
</properties>
<profiles>
<!-- java instrumentation profiles to build jars -->
<profile>
@@ -181,4 +174,12 @@
</profile>
</profiles>
<properties>
<javaassist.version>3.27.0-GA</javaassist.version>
<sun.tools.version>1.8.0</sun.tools.version>
<jol-core.version>0.10</jol-core.version>
<asm.version>8.0.1</asm.version>
<bcel.version>6.5.0</bcel.version>
</properties>
</project>
@@ -64,7 +64,6 @@
<filtering>true</filtering>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -54,4 +54,5 @@
<validator.version>1.7</validator.version>
<apache-commons-lang3.version>3.12.0</apache-commons-lang3.version>
</properties>
</project>
-1
View File
@@ -69,7 +69,6 @@
<filtering>true</filtering>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+1 -1
View File
@@ -137,4 +137,4 @@
</dependencies>
</dependencyManagement>
</project>
</project>
+1 -3
View File
@@ -1,13 +1,11 @@
<?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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.baeldung.dddmodules.infrastructure</groupId>
<artifactId>infrastructure</artifactId>
<version>1.0</version>
<packaging>jar</packaging>
<parent>
+1 -2
View File
@@ -1,6 +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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+1 -3
View File
@@ -1,6 +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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -13,7 +12,6 @@
<groupId>com.baeldung.dddmodules</groupId>
<artifactId>ddd-modules</artifactId>
<version>1.0</version>
<relativePath>../</relativePath>
</parent>
<dependencies>
+2 -6
View File
@@ -1,6 +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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -14,7 +13,6 @@
<groupId>com.baeldung</groupId>
<artifactId>parent-modules</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<modules>
@@ -70,10 +68,8 @@
<properties>
<source.version>9</source.version>
<target.version>9</target.version>
<compiler.plugin.version>3.8.1</compiler.plugin.version>
<appmodules.version>1.0</appmodules.version>
</properties>
</project>
</project>
+1 -3
View File
@@ -1,6 +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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -13,7 +12,6 @@
<groupId>com.baeldung.dddmodules</groupId>
<artifactId>ddd-modules</artifactId>
<version>1.0</version>
<relativePath>../</relativePath>
</parent>
<build>
+1 -3
View File
@@ -1,6 +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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -13,7 +12,6 @@
<groupId>com.baeldung.dddmodules</groupId>
<artifactId>ddd-modules</artifactId>
<version>1.0</version>
<relativePath>../</relativePath>
</parent>
<dependencies>
+8 -8
View File
@@ -15,6 +15,14 @@
<version>1.0.0-SNAPSHOT</version>
</parent>
<repositories>
<repository>
<id>osgeo-release</id>
<name>OSGeo Repository</name>
<url>https://repo.osgeo.org/repository/release/</url>
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>org.geotools</groupId>
@@ -33,14 +41,6 @@
</dependency>
</dependencies>
<repositories>
<repository>
<id>osgeo-release</id>
<name>OSGeo Repository</name>
<url>https://repo.osgeo.org/repository/release/</url>
</repository>
</repositories>
<properties>
<geotools.version>15.2</geotools.version>
<geotools-swing.version>15.2</geotools-swing.version>
+1 -5
View File
@@ -33,26 +33,22 @@
<artifactId>spring-boot-starter</artifactId>
<version>2.6.2</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<version>2.6.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.netflix.graphql.dgs.codegen</groupId>
<artifactId>graphql-dgs-codegen-client-core</artifactId>
<version>5.1.14</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>2.6.2</version>
</dependency>
<dependency>
<groupId>com.netflix.graphql.dgs</groupId>
<artifactId>graphql-dgs-spring-boot-starter</artifactId>
@@ -88,4 +84,4 @@
</plugins>
</build>
</project>
</project>
+3 -2
View File
@@ -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>
<artifactId>httpclient-2</artifactId>
<version>0.1-SNAPSHOT</version>
-1
View File
@@ -22,7 +22,6 @@
<artifactId>junit-jupiter-api</artifactId>
<version>5.8.1</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
+2 -1
View File
@@ -57,4 +57,5 @@
<org.apache.httpcomponents.version>4.5.13</org.apache.httpcomponents.version>
<javax.servlet-api.version>4.0.1</javax.servlet-api.version>
</properties>
</project>
</project>
+8 -30
View File
@@ -37,35 +37,13 @@
</dependencies>
<!-- uncomment in order to enable Hibernate Validator Anotation Processor -->
<!--
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven.compiler.version}</version>
<configuration>
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
<fork>true</fork>
<compilerArgs>
<arg>-Averbose=true</arg>
<arg>-AmethodConstraintsSupported=true</arg>
<arg>-AdiagnosticKind=ERROR</arg>
</compilerArgs>
<annotationProcessorPaths>
<path>
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator-annotation-processor</artifactId>
<version>${hibernate-validator.ap.version}</version>
</path>
</annotationProcessorPaths>
</configuration>
</plugin>
</plugins>
</build>
-->
<!-- <build> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId>
<version>${maven.compiler.version}</version> <configuration> <source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target> <fork>true</fork> <compilerArgs> <arg>-Averbose=true</arg>
<arg>-AmethodConstraintsSupported=true</arg> <arg>-AdiagnosticKind=ERROR</arg> </compilerArgs> <annotationProcessorPaths>
<path> <groupId>org.hibernate.validator</groupId> <artifactId>hibernate-validator-annotation-processor</artifactId>
<version>${hibernate-validator.ap.version}</version> </path> </annotationProcessorPaths> </configuration>
</plugin> </plugins> </build> -->
<properties>
<hibernate-validator.version>6.0.13.Final</hibernate-validator.version>
@@ -77,4 +55,4 @@
<org.springframework.version>5.0.2.RELEASE</org.springframework.version>
</properties>
</project>
</project>
+1 -1
View File
@@ -15,7 +15,7 @@
<version>0.0.1-SNAPSHOT</version>
<relativePath>../parent-boot-2</relativePath>
</parent>
<dependencyManagement>
<dependencies>
<dependency>
-1
View File
@@ -11,7 +11,6 @@
<groupId>com.baeldung</groupId>
<artifactId>parent-modules</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<repositories>
+3 -3
View File
@@ -1,7 +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">
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>libraries-concurrency</artifactId>
<name>libraries-concurrency</name>
@@ -78,5 +78,5 @@
<properties>
<quasar.version>0.8.0</quasar.version>
</properties>
</project>
+1 -1
View File
@@ -22,4 +22,4 @@
</dependency>
</dependencies>
</project>
</project>
+3 -12
View File
@@ -62,18 +62,9 @@
<verbose>false</verbose>
</configuration>
</execution>
<!-- This is for delomboking also your tests sources.
<execution>
<id>test-delombok</id>
<phase>generate-test-sources</phase>
<goals>
<goal>testDelombok</goal>
</goals>
<configuration>
<verbose>false</verbose>
</configuration>
</execution>
-->
<!-- This is for delomboking also your tests sources. <execution> <id>test-delombok</id>
<phase>generate-test-sources</phase> <goals> <goal>testDelombok</goal> </goals> <configuration> <verbose>false</verbose>
</configuration> </execution> -->
</executions>
</plugin>
</plugins>
@@ -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>
@@ -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>
+3 -4
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>

Some files were not shown because too many files have changed in this diff Show More