iSharkFly-Docs/java-tutorials
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BAEL-2928 - Solve conflicts in pom.xml

Browse Source
This commit is contained in:
Juan Vaccari 2019-08-05 17:48:18 +01:00
parent 1c1cf0fdc9
commit c1920ddaab
1 changed files with 846 additions and 841 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
pom.xml
View File

@ -10,10 +10,6 @@
<name>parent-modules</name> <name>parent-modules</name>
<packaging>pom</packaging> <packaging>pom</packaging>
<modules>
<module>quarkus</module>
</modules>
<dependencies> <dependencies>
<!-- logging --> <!-- logging -->
<dependency> <dependency>
@ -312,6 +308,10 @@
<configuration> <configuration>
<forkCount>3</forkCount> <forkCount>3</forkCount>
<reuseForks>true</reuseForks> <reuseForks>true</reuseForks>
<includes>
<include>SpringContextTest</include>
<include>**/*UnitTest</include>
</includes>
<excludes> <excludes>
<exclude>**/*IntegrationTest.java</exclude> <exclude>**/*IntegrationTest.java</exclude>
<exclude>**/*IntTest.java</exclude> <exclude>**/*IntTest.java</exclude>
@ -388,6 +388,7 @@
<!--<module>core-java-modules/core-java-9</module> --> <!-- We haven't upgraded to java 9. Fixing in BAEL-10841 --> <!--<module>core-java-modules/core-java-9</module> --> <!-- We haven't upgraded to java 9. Fixing in BAEL-10841 -->
<!--<module>core-java-modules/core-java-os</module> --> <!-- We haven't upgraded to java 9.--> <!--<module>core-java-modules/core-java-os</module> --> <!-- We haven't upgraded to java 9.-->
<module>core-java-modules/core-java-arrays</module> <module>core-java-modules/core-java-arrays</module>
<module>core-java-modules/core-java-arrays-2</module>
<module>core-java-modules/core-java-collections</module> <module>core-java-modules/core-java-collections</module>
<module>core-java-modules/core-java-collections-list</module> <module>core-java-modules/core-java-collections-list</module>
<module>core-java-modules/core-java-collections-list-2</module> <module>core-java-modules/core-java-collections-list-2</module>
@ -422,7 +423,6 @@
<module>drools</module> <module>drools</module>
<module>dubbo</module> <module>dubbo</module>
<module>easy-random</module>
<module>ethereum</module> <module>ethereum</module>
<module>feign</module> <module>feign</module>
@ -462,12 +462,14 @@
<!-- <module>java-ee-8-security-api</module> --> <!-- long running --> <!-- <module>java-ee-8-security-api</module> --> <!-- long running -->
<module>java-lite</module> <module>java-lite</module>
<module>java-numbers</module> <module>java-numbers</module>
<module>java-numbers-2</module>
<module>java-rmi</module> <module>java-rmi</module>
<module>java-spi</module> <module>java-spi</module>
<module>java-streams</module> <module>java-streams</module>
<!-- <module>java-streams-2</module> --> <!-- We haven't upgraded to java 9. Fixing in BAEL-10841 --> <!-- <module>java-streams-2</module> --> <!-- We haven't upgraded to java 9. Fixing in BAEL-10841 -->
<module>java-strings</module> <module>java-strings</module>
<module>java-strings-2</module> <module>java-strings-2</module>
<module>java-strings-ops</module>
<module>java-vavr-stream</module> <module>java-vavr-stream</module>
<module>java-websocket</module> <module>java-websocket</module>
<module>javafx</module> <module>javafx</module>
@ -478,9 +480,8 @@
<module>jee-7</module> --> <module>jee-7</module> -->
<module>jee-7-security</module> <module>jee-7-security</module>
<module>jersey</module> <module>jersey</module>
<module>JGit</module> <module>jgit</module>
<module>jgroups</module> <module>jgroups</module>
<module>jhipster</module>
<module>jhipster-5</module> <module>jhipster-5</module>
<module>jib</module> <module>jib</module>
<module>jjwt</module> <module>jjwt</module>
@ -507,6 +508,7 @@
<module>libraries-security</module> <module>libraries-security</module>
<module>libraries-server</module> <module>libraries-server</module>
<module>libraries-http</module> <module>libraries-http</module>
<module>libraries-io</module>
<module>linkrest</module> <module>linkrest</module>
<module>logging-modules</module> <module>logging-modules</module>
<module>lombok</module> <module>lombok</module>
@ -545,7 +547,6 @@
<!-- <module>raml</module> --> <!-- Not a maven project --> <!-- <module>raml</module> --> <!-- Not a maven project -->
<module>ratpack</module> <module>ratpack</module>
<module>reactor-core</module> <module>reactor-core</module>
<module>rest-with-spark-java</module>
<module>resteasy</module> <module>resteasy</module>
<module>restx</module> <module>restx</module>
<!-- <module>rmi</module> --> <!-- Not a maven project --> <!-- <module>rmi</module> --> <!-- Not a maven project -->
@ -558,8 +559,7 @@
<module>tensorflow-java</module> <module>tensorflow-java</module>
<module>spring-boot-flowable</module> <module>spring-boot-flowable</module>
<module>spring-security-kerberos</module> <module>spring-security-kerberos</module>
<module>morphia</module> <module>oauth2-framework-impl</module>
</modules> </modules>
</profile> </profile>
@ -576,6 +576,10 @@
<configuration> <configuration>
<forkCount>3</forkCount> <forkCount>3</forkCount>
<reuseForks>true</reuseForks> <reuseForks>true</reuseForks>
<includes>
<include>SpringContextTest</include>
<include>**/*UnitTest</include>
</includes>
<excludes> <excludes>
<exclude>**/*IntegrationTest.java</exclude> <exclude>**/*IntegrationTest.java</exclude>
<exclude>**/*IntTest.java</exclude> <exclude>**/*IntTest.java</exclude>
@ -608,6 +612,7 @@
<module>spring-5-data-reactive</module> <module>spring-5-data-reactive</module>
<module>spring-5-mvc</module> <module>spring-5-mvc</module>
<module>spring-5-reactive</module> <module>spring-5-reactive</module>
<module>spring-5-reactive-2</module>
<module>spring-5-reactive-client</module> <module>spring-5-reactive-client</module>
<module>spring-5-reactive-oauth</module> <module>spring-5-reactive-oauth</module>
<module>spring-5-reactive-security</module> <module>spring-5-reactive-security</module>
@ -642,6 +647,7 @@
<!-- <module>spring-boot-gradle</module> --> <!-- Not a maven project --> <!-- <module>spring-boot-gradle</module> --> <!-- Not a maven project -->
<module>spring-boot-jasypt</module> <module>spring-boot-jasypt</module>
<module>spring-boot-keycloak</module> <module>spring-boot-keycloak</module>
<module>spring-boot-kotlin</module>
<module>spring-boot-logging-log4j2</module> <module>spring-boot-logging-log4j2</module>
<module>spring-boot-mvc</module> <module>spring-boot-mvc</module>
<module>spring-boot-mvc-birt</module> <module>spring-boot-mvc-birt</module>
@ -656,24 +662,24 @@
<module>spring-boot-vue</module> <module>spring-boot-vue</module>
<module>spring-boot-libraries</module> <module>spring-boot-libraries</module>
<module>spring-cloud</module>
<module>spring-cloud-bus</module> <!-- <module>spring-cloud</module> --> <!-- BAEL-14304 -->
<!-- <module>spring-cloud-bus</module> --> <!-- BAEL-14304 -->
<!-- <module>spring-cloud-cli</module> --> <!-- Not a maven project --> <!-- <module>spring-cloud-cli</module> --> <!-- Not a maven project -->
<module>spring-cloud-data-flow</module> <!-- <module>spring-cloud-data-flow</module> --> <!-- BAEL-14304 -->
<module>spring-core</module> <module>spring-core</module>
<module>spring-core-2</module> <module>spring-core-2</module>
<module>spring-cucumber</module> <module>spring-cucumber</module>
<module>spring-data-rest</module> <module>spring-data-rest</module>
<module>spring-data-rest-querydsl</module> <!-- <module>spring-data-rest-querydsl</module> --> <!-- BAEL-14304 -->
<module>spring-dispatcher-servlet</module> <module>spring-dispatcher-servlet</module>
<module>spring-drools</module> <module>spring-drools</module>
<module>spring-di</module> <module>spring-di</module>
<module>spring-ehcache</module> <module>spring-ehcache</module>
<module>spring-ejb</module> <!-- <module>spring-ejb</module> BAEL-14304 -->
<module>spring-exceptions</module> <module>spring-exceptions</module>
<module>spring-freemarker</module> <module>spring-freemarker</module>
@ -726,8 +732,6 @@
<module>spring-security-angular/server</module> <module>spring-security-angular/server</module>
<module>spring-security-cache-control</module> <module>spring-security-cache-control</module>
<module>spring-security-client</module>
<module>spring-security-core</module> <module>spring-security-core</module>
<module>spring-security-mvc-boot</module> <module>spring-security-mvc-boot</module>
<module>spring-security-mvc-custom</module> <module>spring-security-mvc-custom</module>
@ -736,7 +740,7 @@
<module>spring-security-mvc-ldap</module> <module>spring-security-mvc-ldap</module>
<module>spring-security-mvc-login</module> <module>spring-security-mvc-login</module>
<module>spring-security-mvc-persisted-remember-me</module> <module>spring-security-mvc-persisted-remember-me</module>
<module>spring-security-mvc-session</module> <module>spring-security-mvc</module>
<module>spring-security-mvc-socket</module> <module>spring-security-mvc-socket</module>
<module>spring-security-openid</module> <module>spring-security-openid</module>
<!--<module>spring-security-react</module> --> <!-- fails on Travis, fails intermittently on the new Jenkins (01.12.2018) BAEL-10834 --> <!--<module>spring-security-react</module> --> <!-- fails on Travis, fails intermittently on the new Jenkins (01.12.2018) BAEL-10834 -->
@ -747,7 +751,7 @@
<module>spring-security-stormpath</module> <module>spring-security-stormpath</module>
<module>spring-security-thymeleaf</module> <module>spring-security-thymeleaf</module>
<module>spring-security-x509</module> <module>spring-security-x509</module>
<module>spring-session</module> <!-- <module>spring-session</module> BAEL-14304 -->
<module>spring-sleuth</module> <module>spring-sleuth</module>
<module>spring-soap</module> <module>spring-soap</module>
<module>spring-social-login</module> <module>spring-social-login</module>
@ -758,12 +762,10 @@
<module>spring-thymeleaf</module> <module>spring-thymeleaf</module>
<module>spring-userservice</module> <!-- <module>spring-vault</module> BAEL-14304 -->
<module>spring-vault</module>
<module>spring-vertx</module> <module>spring-vertx</module>
<module>spring-webflux-amqp</module> <!-- long --> <!-- <module>spring-webflux-amqp</module> BAEL-14304 --> <!-- long -->
<module>spring-zuul</module> <module>spring-zuul</module>
@ -775,11 +777,10 @@
<module>testing-modules</module> <module>testing-modules</module>
<module>twilio</module> <module>twilio</module>
<module>Twitter4J</module> <module>twitter4j</module>
<module>undertow</module> <module>undertow</module>
<module>vavr</module>
<module>vertx</module> <module>vertx</module>
<module>vertx-and-rxjava</module> <module>vertx-and-rxjava</module>
<module>video-tutorials</module> <module>video-tutorials</module>
@ -788,13 +789,11 @@
<module>wicket</module> <module>wicket</module>
<module>xml</module> <module>xml</module>
<module>xmlunit-2</module>
<module>xstream</module> <module>xstream</module>
<module>tensorflow-java</module> <module>tensorflow-java</module>
<module>spring-boot-flowable</module> <module>spring-boot-flowable</module>
<module>spring-security-kerberos</module> <module>spring-security-kerberos</module>
<module>morphia</module>
</modules> </modules>
@ -825,6 +824,7 @@
<module>spring-5</module> <module>spring-5</module>
<module>spring-5-data-reactive</module> <module>spring-5-data-reactive</module>
<module>spring-5-reactive</module> <module>spring-5-reactive</module>
<module>spring-5-reactive-2</module>
<module>spring-5-reactive-client</module> <module>spring-5-reactive-client</module>
<module>spring-5-reactive-security</module> <module>spring-5-reactive-security</module>
<module>spring-5-security</module> <module>spring-5-security</module>
@ -843,6 +843,7 @@
<module>spring-boot-camel</module> <module>spring-boot-camel</module>
<module>spring-boot-client</module> <module>spring-boot-client</module>
<module>spring-boot-custom-starter</module> <module>spring-boot-custom-starter</module>
<module>spring-boot-di</module>
<module>greeter-spring-boot-autoconfigure</module> <module>greeter-spring-boot-autoconfigure</module>
<module>greeter-spring-boot-sample-app</module> <module>greeter-spring-boot-sample-app</module>
<module>persistence-modules/spring-boot-h2/spring-boot-h2-database</module> <module>persistence-modules/spring-boot-h2/spring-boot-h2-database</module>
@ -909,14 +910,13 @@
<module>spring-security-acl</module> <module>spring-security-acl</module>
<module>spring-security-angular</module> <module>spring-security-angular</module>
<module>spring-security-cache-control</module> <module>spring-security-cache-control</module>
<module>spring-security-client</module>
<module>spring-security-core</module> <module>spring-security-core</module>
<module>spring-security-mvc-boot</module> <module>spring-security-mvc-boot</module>
<module>spring-security-mvc-custom</module> <module>spring-security-mvc-custom</module>
<module>spring-security-mvc-digest-auth</module> <module>spring-security-mvc-digest-auth</module>
<module>spring-security-mvc-ldap</module> <module>spring-security-mvc-ldap</module>
<module>spring-security-mvc-persisted-remember-me</module> <module>spring-security-mvc-persisted-remember-me</module>
<module>spring-security-mvc-session</module> <module>spring-security-mvc</module>
<module>spring-security-mvc-socket</module> <module>spring-security-mvc-socket</module>
<module>spring-security-rest</module> <module>spring-security-rest</module>
<module>spring-security-sso</module> <module>spring-security-sso</module>
@ -931,7 +931,6 @@
<module>spring-state-machine</module> <module>spring-state-machine</module>
<module>spring-swagger-codegen/spring-swagger-codegen-app</module> <module>spring-swagger-codegen/spring-swagger-codegen-app</module>
<module>spring-thymeleaf</module> <module>spring-thymeleaf</module>
<module>spring-userservice</module>
<module>spring-vault</module> <module>spring-vault</module>
<module>spring-vertx</module> <module>spring-vertx</module>
<module>spring-zuul/spring-zuul-foos-resource</module> <module>spring-zuul/spring-zuul-foos-resource</module>
@ -959,6 +958,10 @@
<configuration> <configuration>
<forkCount>3</forkCount> <forkCount>3</forkCount>
<reuseForks>true</reuseForks> <reuseForks>true</reuseForks>
<includes>
<include>SpringContextTest</include>
<include>**/*UnitTest</include>
</includes>
<excludes> <excludes>
<exclude>**/*IntegrationTest.java</exclude> <exclude>**/*IntegrationTest.java</exclude>
<exclude>**/*IntTest.java</exclude> <exclude>**/*IntTest.java</exclude>
@ -987,17 +990,19 @@
<module>core-kotlin-io</module> <module>core-kotlin-io</module>
<module>jenkins/hello-world</module> <module>jenkins/hello-world</module>
<module>jhipster</module>
<module>jws</module> <module>jws</module>
<module>libraries</module> <!-- very long running --> <module>libraries</module> <!-- very long running -->
<module>persistence-modules/hibernate5</module> <module>persistence-modules/hibernate5</module>
<module>persistence-modules/hibernate-mapping</module> <module>persistence-modules/hibernate-mapping</module>
<module>persistence-modules/java-jpa</module> <module>persistence-modules/java-jpa</module>
<module>persistence-modules/java-jpa-2</module>
<module>persistence-modules/java-mongodb</module> <module>persistence-modules/java-mongodb</module>
<module>persistence-modules/jnosql</module> <module>persistence-modules/jnosql</module>
<module>vaadin</module> <module>vaadin</module>
<module>vavr</module>
</modules> </modules>
</profile> </profile>
@ -1081,6 +1086,7 @@
<!--<module>core-java-modules/core-java-9</module> --> <!-- We haven't upgraded to java 9. Fixing in BAEL-10841 --> <!--<module>core-java-modules/core-java-9</module> --> <!-- We haven't upgraded to java 9. Fixing in BAEL-10841 -->
<!--<module>core-java-modules/core-java-os</module> --> <!-- We haven't upgraded to java 9.--> <!--<module>core-java-modules/core-java-os</module> --> <!-- We haven't upgraded to java 9.-->
<module>core-java-modules/core-java-arrays</module> <module>core-java-modules/core-java-arrays</module>
<module>core-java-modules/core-java-arrays-2</module>
<module>core-java-modules/core-java-collections</module> <module>core-java-modules/core-java-collections</module>
<module>core-java-modules/core-java-collections-list</module> <module>core-java-modules/core-java-collections-list</module>
<module>core-java-modules/core-java-collections-list-2</module> <module>core-java-modules/core-java-collections-list-2</module>
@ -1150,12 +1156,14 @@
<module>java-ee-8-security-api</module> <module>java-ee-8-security-api</module>
<module>java-lite</module> <module>java-lite</module>
<module>java-numbers</module> <module>java-numbers</module>
<module>java-numbers-2</module>
<module>java-rmi</module> <module>java-rmi</module>
<module>java-spi</module> <module>java-spi</module>
<module>java-streams</module> <module>java-streams</module>
<!-- <module>java-streams-2</module> --> <!-- We haven't upgraded to java 9. Fixing in BAEL-10841 --> <!-- <module>java-streams-2</module> --> <!-- We haven't upgraded to java 9. Fixing in BAEL-10841 -->
<module>java-strings</module> <module>java-strings</module>
<module>java-strings-2</module> <module>java-strings-2</module>
<module>java-strings-ops</module>
<module>java-vavr-stream</module> <module>java-vavr-stream</module>
<module>java-websocket</module> <module>java-websocket</module>
<module>javafx</module> <module>javafx</module>
@ -1166,9 +1174,8 @@
<module>jee-7</module> --> <module>jee-7</module> -->
<module>jee-7-security</module> <module>jee-7-security</module>
<module>jersey</module> <module>jersey</module>
<module>JGit</module> <module>jgit</module>
<module>jgroups</module> <module>jgroups</module>
<module>jhipster</module>
<module>jhipster-5</module> <module>jhipster-5</module>
<module>jib</module> <module>jib</module>
<module>jjwt</module> <module>jjwt</module>
@ -1230,7 +1237,6 @@
<!-- <module>raml</module> --> <!-- Not a maven project --> <!-- <module>raml</module> --> <!-- Not a maven project -->
<module>ratpack</module> <module>ratpack</module>
<module>reactor-core</module> <module>reactor-core</module>
<module>rest-with-spark-java</module>
<module>resteasy</module> <module>resteasy</module>
<module>restx</module> <module>restx</module>
<!-- <module>rmi</module> --> <!-- Not a maven project --> <!-- <module>rmi</module> --> <!-- Not a maven project -->
@ -1238,6 +1244,7 @@
<module>rsocket</module> <module>rsocket</module>
<module>rxjava</module> <module>rxjava</module>
<module>rxjava-2</module> <module>rxjava-2</module>
<module>oauth2-framework-impl</module>
</modules> </modules>
@ -1282,6 +1289,7 @@
<module>spring-5-data-reactive</module> <module>spring-5-data-reactive</module>
<module>spring-5-mvc</module> <module>spring-5-mvc</module>
<module>spring-5-reactive</module> <module>spring-5-reactive</module>
<module>spring-5-reactive-2</module>
<module>spring-5-reactive-client</module> <module>spring-5-reactive-client</module>
<module>spring-5-reactive-oauth</module> <module>spring-5-reactive-oauth</module>
<module>spring-5-reactive-security</module> <module>spring-5-reactive-security</module>
@ -1395,9 +1403,6 @@
<module>spring-security-acl</module> <module>spring-security-acl</module>
<module>spring-security-angular/server</module> <module>spring-security-angular/server</module>
<module>spring-security-cache-control</module> <module>spring-security-cache-control</module>
<module>spring-security-client</module>
<module>spring-security-core</module> <module>spring-security-core</module>
<module>spring-security-mvc-boot</module> <module>spring-security-mvc-boot</module>
<module>spring-security-mvc-custom</module> <module>spring-security-mvc-custom</module>
@ -1405,7 +1410,7 @@
<module>spring-security-mvc-ldap</module> <module>spring-security-mvc-ldap</module>
<module>spring-security-mvc-login</module> <module>spring-security-mvc-login</module>
<module>spring-security-mvc-persisted-remember-me</module> <module>spring-security-mvc-persisted-remember-me</module>
<module>spring-security-mvc-session</module> <module>spring-security-mvc</module>
<module>spring-security-mvc-socket</module> <module>spring-security-mvc-socket</module>
<module>spring-security-openid</module> <module>spring-security-openid</module>
<!--<module>spring-security-react</module> --> <!-- fails on Travis, fails intermittently on the new Jenkins (01.12.2018) BAEL-10834 --> <!--<module>spring-security-react</module> --> <!-- fails on Travis, fails intermittently on the new Jenkins (01.12.2018) BAEL-10834 -->
@ -1427,8 +1432,6 @@
<module>spring-thymeleaf</module> <module>spring-thymeleaf</module>
<module>spring-userservice</module>
<module>spring-vault</module> <module>spring-vault</module>
<module>spring-vertx</module> <module>spring-vertx</module>
@ -1444,11 +1447,10 @@
<module>testing-modules</module> <module>testing-modules</module>
<module>twilio</module> <module>twilio</module>
<module>Twitter4J</module> <module>twitter4j</module>
<module>undertow</module> <module>undertow</module>
<module>vavr</module>
<module>vertx</module> <module>vertx</module>
<module>vertx-and-rxjava</module> <module>vertx-and-rxjava</module>
<module>video-tutorials</module> <module>video-tutorials</module>
@ -1457,9 +1459,7 @@
<module>wicket</module> <module>wicket</module>
<module>xml</module> <module>xml</module>
<module>xmlunit-2</module>
<module>xstream</module> <module>xstream</module>
</modules> </modules>
</profile> </profile>
@ -1500,16 +1500,19 @@
<module>core-kotlin-2</module> <module>core-kotlin-2</module>
<module>jenkins/hello-world</module> <module>jenkins/hello-world</module>
<module>jhipster</module>
<module>jws</module> <module>jws</module>
<module>libraries</module> <!-- very long running --> <module>libraries</module> <!-- very long running -->
<module>persistence-modules/hibernate5</module> <module>persistence-modules/hibernate5</module>
<module>persistence-modules/java-jpa</module> <module>persistence-modules/java-jpa</module>
<module>persistence-modules/java-jpa-2</module>
<module>persistence-modules/java-mongodb</module> <module>persistence-modules/java-mongodb</module>
<module>persistence-modules/jnosql</module> <module>persistence-modules/jnosql</module>
<module>vaadin</module> <module>vaadin</module>
<module>vavr</module>
</modules> </modules>
</profile> </profile>
@ -1561,6 +1564,7 @@
<maven-failsafe-plugin.version>2.21.0</maven-failsafe-plugin.version> <maven-failsafe-plugin.version>2.21.0</maven-failsafe-plugin.version>
<commons-io.version>2.5</commons-io.version> <commons-io.version>2.5</commons-io.version>
<commons-lang.version>2.6</commons-lang.version> <commons-lang.version>2.6</commons-lang.version>
<commons-lang3.version>3.5</commons-lang3.version>
<commons-cli.version>1.4</commons-cli.version> <commons-cli.version>1.4</commons-cli.version>
<maven-war-plugin.version>3.0.0</maven-war-plugin.version> <maven-war-plugin.version>3.0.0</maven-war-plugin.version>
<javax.servlet-api.version>3.1.0</javax.servlet-api.version> <javax.servlet-api.version>3.1.0</javax.servlet-api.version>
@ -1582,4 +1586,5 @@
<lombok.version>1.16.12</lombok.version> <lombok.version>1.16.12</lombok.version>
<h2.version>1.4.197</h2.version> <h2.version>1.4.197</h2.version>
</properties> </properties>
</project> </project>