Merge remote-tracking branch 'upstream/master' into BAEL-3456_Springfox
This commit is contained in:
Anshul BANSAL
@@ -484,7 +484,7 @@
|
||||
<module>guava-io</module>
|
||||
<module>guava-collections</module>
|
||||
<module>guava-collections-map</module>
|
||||
<module>guava-collections-set</module>
|
||||
<module>guava-collections-set</module>
|
||||
<module>guava-modules</module>
|
||||
<!-- <module>guest</module> --> <!-- not to be built as its for guest articles -->
|
||||
<module>guice</module>
|
||||
@@ -503,6 +503,8 @@
|
||||
<module>jackson-simple</module>
|
||||
<module>jackson-annotations</module>
|
||||
<module>jackson-exceptions</module>
|
||||
<module>jackson-conversions</module>
|
||||
<module>jackson-conversions-2</module>
|
||||
<module>java-collections-conversions</module>
|
||||
<module>java-collections-conversions-2</module>
|
||||
<module>java-collections-maps</module>
|
||||
@@ -512,7 +514,7 @@
|
||||
<!-- <module>java-ee-8-security-api</module> --> <!-- long running -->
|
||||
<module>java-lite</module>
|
||||
<module>java-math</module>
|
||||
<module>java-math-2</module> <!-- Added for BAEL-3506 -->
|
||||
<module>java-math-2</module> <!-- Added for BAEL-3506 -->
|
||||
<module>java-numbers</module>
|
||||
<module>java-numbers-2</module>
|
||||
<module>java-rmi</module>
|
||||
@@ -554,8 +556,8 @@
|
||||
<module>libraries-data</module>
|
||||
<module>libraries-data-2</module>
|
||||
<module>libraries-data-db</module>
|
||||
<module>libraries-data-io</module>
|
||||
<module>libraries-apache-commons</module>
|
||||
<module>libraries-data-io</module>
|
||||
<module>libraries-apache-commons</module>
|
||||
<module>libraries-apache-commons-collections</module>
|
||||
<module>libraries-apache-commons-io</module>
|
||||
<module>libraries-primitive</module>
|
||||
@@ -710,7 +712,7 @@
|
||||
<module>spring-boot-camel</module>
|
||||
<!-- <module>spring-boot-cli</module> --> <!-- Not a maven project -->
|
||||
<module>spring-boot-config-jpa-error</module>
|
||||
<module>spring-boot-client</module>
|
||||
<module>spring-boot-client</module>
|
||||
|
||||
<module>spring-boot-crud</module>
|
||||
<module>spring-boot-ctx-fluent</module>
|
||||
@@ -723,10 +725,10 @@
|
||||
<module>spring-boot-mvc</module>
|
||||
<module>spring-boot-mvc-birt</module>
|
||||
<module>spring-boot-environment</module>
|
||||
<module>spring-boot-deployment</module>
|
||||
<module>spring-boot-runtime</module>
|
||||
<module>spring-boot-runtime/disabling-console-jul</module>
|
||||
<module>spring-boot-runtime/disabling-console-log4j2</module>
|
||||
<module>spring-boot-deployment</module>
|
||||
<module>spring-boot-runtime</module>
|
||||
<module>spring-boot-runtime/disabling-console-jul</module>
|
||||
<module>spring-boot-runtime/disabling-console-log4j2</module>
|
||||
<module>spring-boot-runtime/disabling-console-logback</module>
|
||||
<module>spring-boot-artifacts</module>
|
||||
<module>spring-boot-rest</module>
|
||||
@@ -749,7 +751,7 @@
|
||||
<module>spring-core</module>
|
||||
<module>spring-core-2</module>
|
||||
<module>spring-core-3</module>
|
||||
<module>spring-cucumber</module>
|
||||
<module>spring-cucumber</module>
|
||||
|
||||
<module>spring-data-rest</module>
|
||||
<module>spring-data-rest-querydsl</module>
|
||||
@@ -781,7 +783,7 @@
|
||||
<module>spring-mobile</module>
|
||||
<module>spring-mockito</module>
|
||||
<module>spring-mvc-basics-2</module>
|
||||
<module>spring-mvc-forms-jsp</module>
|
||||
<module>spring-mvc-forms-jsp</module>
|
||||
<module>spring-mvc-forms-thymeleaf</module>
|
||||
<module>spring-mvc-java</module>
|
||||
<module>spring-mvc-kotlin</module>
|
||||
@@ -802,7 +804,7 @@
|
||||
<module>spring-rest</module>
|
||||
<module>spring-rest-angular</module>
|
||||
<module>spring-rest-compress</module>
|
||||
<module>spring-rest-full</module>
|
||||
<module>spring-rest-testing</module>
|
||||
<module>spring-rest-hal-browser</module>
|
||||
<module>spring-rest-query-language</module>
|
||||
<module>spring-rest-shell</module>
|
||||
@@ -834,7 +836,7 @@
|
||||
<module>spring-security-x509</module>
|
||||
<module>spring-session</module>
|
||||
<module>spring-shell</module>
|
||||
<module>spring-sleuth</module>
|
||||
<module>spring-sleuth</module>
|
||||
<module>spring-soap</module>
|
||||
<module>spring-social-login</module>
|
||||
<module>spring-spel</module>
|
||||
@@ -882,146 +884,6 @@
|
||||
|
||||
</profile>
|
||||
|
||||
<profile>
|
||||
<id>spring-context</id>
|
||||
<build>
|
||||
<plugins>
|
||||
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-surefire-plugin</artifactId>
|
||||
<version>${maven-surefire-plugin.version}</version>
|
||||
<configuration>
|
||||
<forkCount>3</forkCount>
|
||||
<reuseForks>true</reuseForks>
|
||||
<includes>
|
||||
<include>**/*SpringContextIntegrationTest.java</include>
|
||||
</includes>
|
||||
</configuration>
|
||||
</plugin>
|
||||
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
<modules>
|
||||
<module>spring-5</module>
|
||||
<module>spring-5-data-reactive</module>
|
||||
<module>spring-5-reactive</module>
|
||||
<module>spring-5-reactive-2</module>
|
||||
<module>spring-5-reactive-client</module>
|
||||
<module>spring-5-reactive-security</module>
|
||||
<module>spring-5-security</module>
|
||||
<module>spring-5-security-oauth</module>
|
||||
<module>spring-5-security-cognito</module>
|
||||
<module>spring-activiti</module>
|
||||
<module>spring-akka</module>
|
||||
<module>spring-aop</module>
|
||||
<module>spring-apache-camel</module>
|
||||
<module>spring-batch</module>
|
||||
<module>spring-bom</module>
|
||||
<module>spring-boot-admin</module>
|
||||
<module>spring-boot-bootstrap</module>
|
||||
<module>spring-boot-bootstrap</module>
|
||||
<module>spring-boot-camel</module>
|
||||
<module>spring-boot-client</module>
|
||||
<module>spring-boot-custom-starter</module>
|
||||
<module>spring-boot-di</module>
|
||||
<module>greeter-spring-boot-autoconfigure</module>
|
||||
<module>greeter-spring-boot-sample-app</module>
|
||||
<module>spring-boot-jasypt</module>
|
||||
<module>spring-boot-keycloak</module>
|
||||
<module>spring-boot-mvc</module>
|
||||
<module>spring-boot-property-exp</module>
|
||||
<module>spring-boot-springdoc</module>
|
||||
<module>spring-boot-vue</module>
|
||||
<module>spring-cloud</module>
|
||||
<module>spring-cloud/spring-cloud-archaius/basic-config</module>
|
||||
<module>spring-cloud/spring-cloud-archaius/extra-configs</module>
|
||||
<module>spring-cloud/spring-cloud-bootstrap/config</module>
|
||||
<module>spring-cloud/spring-cloud-contract</module>
|
||||
<module>spring-cloud/spring-cloud-gateway</module>
|
||||
<module>spring-cloud/spring-cloud-kubernetes/demo-backend</module>
|
||||
<module>spring-cloud/spring-cloud-rest/spring-cloud-rest-config-server</module>
|
||||
<module>spring-cloud/spring-cloud-ribbon-client </module>
|
||||
<module>spring-cloud/spring-cloud-security</module>
|
||||
<module>spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit</module>
|
||||
<module>spring-cloud/spring-cloud-task/springcloudtasksink</module>
|
||||
<module>spring-cloud/spring-cloud-zookeeper </module>
|
||||
<module>spring-cloud/spring-cloud-bus/spring-cloud-config-server</module>
|
||||
<module>spring-cloud/spring-cloud-data-flow/log-sink</module>
|
||||
<module>spring-cloud/spring-cloud-data-flow/time-processor</module>
|
||||
<module>spring-cloud/spring-cloud-data-flow/time-source</module>
|
||||
<module>spring-cucumber</module>
|
||||
<module>spring-data-rest</module>
|
||||
<module>spring-dispatcher-servlet</module>
|
||||
<module>spring-drools</module>
|
||||
<module>spring-di</module>
|
||||
<module>spring-ehcache</module>
|
||||
<module>spring-freemarker</module>
|
||||
<module>spring-integration</module>
|
||||
<module>spring-jenkins-pipeline</module>
|
||||
<module>spring-jersey</module>
|
||||
<module>spring-jinq</module>
|
||||
<module>spring-jms</module>
|
||||
<module>spring-kafka</module>
|
||||
<module>spring-katharsis</module>
|
||||
<module>spring-ldap</module>
|
||||
<module>spring-mobile</module>
|
||||
<module>spring-mockito</module>
|
||||
<module>spring-mvc-forms-thymeleaf</module>
|
||||
<module>spring-mvc-java</module>
|
||||
<module>spring-mvc-velocity</module>
|
||||
<module>spring-mvc-webflow</module>
|
||||
<module>spring-protobuf</module>
|
||||
<module>spring-quartz</module>
|
||||
<module>remoting-hessian-burlap/spring-remoting-hessian-burlap-client</module>
|
||||
<module>remoting-hessian-burlap/remoting-hessian-burlap-server</module>
|
||||
<module>spring-reactor</module>
|
||||
<module>spring-remoting/</module>
|
||||
<module>spring-remoting/remoting-http/remoting-http-server</module>
|
||||
<module>spring-remoting/remoting-jms/remoting-jms-client</module>
|
||||
<module>spring-remoting/remoting-rmi/remoting-rmi-server</module>
|
||||
<module>spring-rest</module>
|
||||
<module>spring-rest-angular</module>
|
||||
<module>spring-rest-compress</module>
|
||||
<module>spring-rest-full</module>
|
||||
<module>spring-rest-simple</module>
|
||||
<module>spring-resttemplate</module>
|
||||
<module>spring-security-acl</module>
|
||||
<module>spring-security-angular</module>
|
||||
<module>spring-security-cache-control</module>
|
||||
<module>spring-security-core</module>
|
||||
<module>spring-security-mvc-boot</module>
|
||||
<module>spring-security-mvc-custom</module>
|
||||
<module>spring-security-mvc-digest-auth</module>
|
||||
<module>spring-security-mvc-ldap</module>
|
||||
<module>spring-security-mvc-persisted-remember-me</module>
|
||||
<module>spring-security-mvc</module>
|
||||
<module>spring-security-mvc-socket</module>
|
||||
<module>spring-security-rest</module>
|
||||
<module>spring-security-sso</module>
|
||||
<module>spring-security-thymeleaf/spring-security-thymeleaf-authentication</module>
|
||||
<module>spring-security-thymeleaf/spring-security-thymeleaf-authorize</module>
|
||||
<module>spring-security-thymeleaf/spring-security-thymeleaf-config</module>
|
||||
<module>spring-security-x509</module>
|
||||
<module>spring-session/spring-session-jdbc</module>
|
||||
<module>spring-sleuth</module>
|
||||
<module>spring-social-login</module>
|
||||
<module>spring-spel</module>
|
||||
<module>spring-state-machine</module>
|
||||
<module>spring-swagger-codegen/spring-swagger-codegen-app</module>
|
||||
<module>spring-thymeleaf</module>
|
||||
<module>spring-vault</module>
|
||||
<module>spring-vertx</module>
|
||||
<module>spring-zuul/spring-zuul-foos-resource</module>
|
||||
|
||||
<module>spring-boot-flowable</module>
|
||||
<module>spring-security-kerberos</module>
|
||||
<module>spring-boot-nashorn</module>
|
||||
</modules>
|
||||
|
||||
</profile>
|
||||
|
||||
<profile>
|
||||
<id>default-heavy</id>
|
||||
<build>
|
||||
@@ -1063,7 +925,7 @@
|
||||
<module>core-java-modules/core-java-concurrency-advanced</module> <!-- very long running? -->
|
||||
<module>core-java-modules/core-java-concurrency-advanced-2</module>
|
||||
<module>core-java-modules/core-java-concurrency-advanced-3</module>
|
||||
<module>core-kotlin</module> <!-- long running? -->
|
||||
<module>core-kotlin</module> <!-- long running? -->
|
||||
<module>core-kotlin-2</module>
|
||||
<module>core-kotlin-io</module>
|
||||
|
||||
@@ -1206,7 +1068,7 @@
|
||||
<module>core-java-modules/core-java-nio</module>
|
||||
<module>core-java-modules/core-java-nio-2</module>
|
||||
<module>core-java-modules/core-java-security</module>
|
||||
<module>core-java-modules/core-java-exceptions</module>
|
||||
<module>core-java-modules/core-java-exceptions</module>
|
||||
<module>core-java-modules/core-java-lang-syntax</module>
|
||||
<module>core-java-modules/core-java-lang-syntax-2</module>
|
||||
<module>core-java-modules/core-java-lang</module>
|
||||
@@ -1257,7 +1119,7 @@
|
||||
<module>guava-io</module>
|
||||
<module>guava-collections</module>
|
||||
<module>guava-collections-map</module>
|
||||
<module>guava-collections-set</module>
|
||||
<module>guava-collections-set</module>
|
||||
<module>guava-modules</module>
|
||||
<!-- <module>guest</module> --> <!-- not to be built as its for guest articles -->
|
||||
<module>guice</module>
|
||||
@@ -1276,6 +1138,8 @@
|
||||
<module>jackson-simple</module>
|
||||
<module>jackson-annotations</module>
|
||||
<module>jackson-exceptions</module>
|
||||
<module>jackson-conversions</module>
|
||||
<module>jackson-conversions-2</module>
|
||||
<module>java-collections-conversions</module>
|
||||
<module>java-collections-conversions-2</module>
|
||||
<module>java-collections-maps</module>
|
||||
@@ -1285,7 +1149,7 @@
|
||||
<module>java-ee-8-security-api</module>
|
||||
<module>java-lite</module>
|
||||
<module>java-math</module>
|
||||
<module>java-math-2</module> <!-- Added for BAEL-3506 -->
|
||||
<module>java-math-2</module> <!-- Added for BAEL-3506 -->
|
||||
<module>java-numbers</module>
|
||||
<module>java-numbers-2</module>
|
||||
<module>java-rmi</module>
|
||||
@@ -1325,8 +1189,8 @@
|
||||
<module>libraries-data</module>
|
||||
<module>libraries-data-2</module>
|
||||
<module>libraries-data-db</module>
|
||||
<module>libraries-data-io</module>
|
||||
<module>libraries-apache-commons</module>
|
||||
<module>libraries-data-io</module>
|
||||
<module>libraries-apache-commons</module>
|
||||
<module>libraries-apache-commons-collections</module>
|
||||
<module>libraries-apache-commons-io</module>
|
||||
<module>libraries-testing</module>
|
||||
@@ -1468,10 +1332,10 @@
|
||||
<module>spring-boot-mvc</module>
|
||||
<module>spring-boot-mvc-birt</module>
|
||||
<module>spring-boot-environment</module>
|
||||
<module>spring-boot-deployment</module>
|
||||
<module>spring-boot-runtime</module>
|
||||
<module>spring-boot-runtime/disabling-console-jul</module>
|
||||
<module>spring-boot-runtime/disabling-console-log4j2</module>
|
||||
<module>spring-boot-deployment</module>
|
||||
<module>spring-boot-runtime</module>
|
||||
<module>spring-boot-runtime/disabling-console-jul</module>
|
||||
<module>spring-boot-runtime/disabling-console-log4j2</module>
|
||||
<module>spring-boot-runtime/disabling-console-logback</module>
|
||||
<module>spring-boot-artifacts</module>
|
||||
<module>spring-boot-rest</module>
|
||||
@@ -1490,7 +1354,7 @@
|
||||
<module>spring-core</module>
|
||||
<module>spring-core-2</module>
|
||||
<module>spring-core-3</module>
|
||||
<module>spring-cucumber</module>
|
||||
<module>spring-cucumber</module>
|
||||
|
||||
<module>spring-data-rest</module>
|
||||
<module>spring-data-rest-querydsl</module>
|
||||
@@ -1522,7 +1386,7 @@
|
||||
<module>spring-mobile</module>
|
||||
<module>spring-mockito</module>
|
||||
<module>spring-mvc-basics-2</module>
|
||||
<module>spring-mvc-forms-jsp</module>
|
||||
<module>spring-mvc-forms-jsp</module>
|
||||
<module>spring-mvc-forms-thymeleaf</module>
|
||||
<module>spring-mvc-java</module>
|
||||
<module>spring-mvc-kotlin</module>
|
||||
@@ -1543,7 +1407,7 @@
|
||||
<module>spring-rest</module>
|
||||
<module>spring-rest-angular</module>
|
||||
<module>spring-rest-compress</module>
|
||||
<module>spring-rest-full</module>
|
||||
<module>spring-rest-testing</module>
|
||||
<module>spring-rest-hal-browser</module>
|
||||
<module>spring-rest-query-language</module>
|
||||
<module>spring-rest-shell</module>
|
||||
@@ -1552,7 +1416,7 @@
|
||||
<module>spring-roo</module>
|
||||
|
||||
<module>spring-scheduling</module>
|
||||
<module>spring-security-acl</module>
|
||||
<module>spring-security-acl</module>
|
||||
<module>spring-security-angular/server</module>
|
||||
<module>spring-security-cache-control</module>
|
||||
<module>spring-security-core</module>
|
||||
@@ -1574,7 +1438,7 @@
|
||||
<module>spring-security-thymeleaf</module>
|
||||
<module>spring-security-x509</module>
|
||||
<module>spring-session</module>
|
||||
<module>spring-shell</module>
|
||||
<module>spring-shell</module>
|
||||
<module>spring-sleuth</module>
|
||||
<module>spring-soap</module>
|
||||
<module>spring-social-login</module>
|
||||
@@ -1660,7 +1524,7 @@
|
||||
<module>libraries</module> <!-- very long running -->
|
||||
|
||||
<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-2</module>
|
||||
<module>persistence-modules/java-mongodb</module>
|
||||
@@ -1743,4 +1607,3 @@
|
||||
</properties>
|
||||
|
||||
</project>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user