From 5b66639f343d8fef4b55b311a2ea2c68686dbe73 Mon Sep 17 00:00:00 2001 From: Erik Kemperman Date: Mon, 9 Oct 2017 11:59:31 +0200 Subject: [PATCH 01/10] Align with server library --- jhipster-dependencies/pom.xml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/jhipster-dependencies/pom.xml b/jhipster-dependencies/pom.xml index 5a53fd8a28ac..ed3f307ee07a 100644 --- a/jhipster-dependencies/pom.xml +++ b/jhipster-dependencies/pom.xml @@ -1,12 +1,14 @@ 4.0.0 + io.github.jhipster jhipster-dependencies - 1.1.9-SNAPSHOT + 1.1.11 pom - jhipster-dependencies - Jhipster dependency management + JHipster dependencies + JHipster dependency management + 3.3.0 0.12 @@ -56,6 +58,7 @@ ${org.springframework.cloud_spring-cloud-dependencies.version} 1.0.0.RELEASE + @@ -257,4 +260,5 @@ + From e8233f8354a52e31a146494e8a9f3d19444b1185 Mon Sep 17 00:00:00 2001 From: Erik Kemperman Date: Mon, 9 Oct 2017 11:59:41 +0200 Subject: [PATCH 02/10] No groupId in version properties --- jhipster-dependencies/pom.xml | 172 +++++++++++++++++----------------- 1 file changed, 86 insertions(+), 86 deletions(-) diff --git a/jhipster-dependencies/pom.xml b/jhipster-dependencies/pom.xml index ed3f307ee07a..703e92c5860c 100644 --- a/jhipster-dependencies/pom.xml +++ b/jhipster-dependencies/pom.xml @@ -10,53 +10,53 @@ JHipster dependency management - 3.3.0 - 0.12 - 1.5 - 2.0.1 - ${com.github.vladimir-bukhtoyarov_bucket4j.version} - ${com.github.vladimir-bukhtoyarov_bucket4j.version} - 1.2 - 3.7 - 1.1.3 - 2.0.0 - 6.1.0.jre8 - 12.1.0.2 - 3.1.3 - 2.5 - 1.2.4 - ${info.cukes_cucumber.version} - ${info.cukes_cucumber.version} - 3.2.2 - ${io.dropwizard.metrics_metrics.version} - ${io.dropwizard.metrics_metrics.version} - ${io.dropwizard.metrics_metrics.version} - ${io.dropwizard.metrics_metrics.version} - ${io.dropwizard.metrics_metrics.version} - 2.2.5 - 0.7.0 - 2.7.0 - ${io.springfox.version} - ${io.springfox.version} - 0.0.20 - ${io.prometheus_simpleclient.version} - ${io.prometheus_simpleclient.version} - 1.1.0.Final - 1.3.0 - 4.9 - 3.5 - 3.6.2 - 2.0.0 - 3.0.0.1 - 5.2.10.Final - ${org.hibernate_hibernate.version} - ${org.hibernate_hibernate.version} - 8.2.5.Final - 9.0.0.Final - 1.0.0.Final - 1.1.0.Final - ${org.springframework.cloud_spring-cloud-dependencies.version} - 1.0.0.RELEASE + 3.3.0 + 0.12 + 1.5 + 2.0.1 + ${bucket4j.version} + ${bucket4j.version} + 1.2 + 3.7 + 1.1.3 + 2.0.0 + 6.1.0.jre8 + 12.1.0.2 + 3.1.3 + 2.5 + 1.2.4 + ${cucumber.version} + ${cucumber.version} + 3.2.2 + ${dropwizard-metrics.version} + ${dropwizard-metrics.version} + ${dropwizard-metrics.version} + ${dropwizard-metrics.version} + ${dropwizard-metrics.version} + 2.2.5 + 0.7.0 + 2.7.0 + ${springfox.version} + ${springfox.version} + 0.0.20 + ${prometheus-simpleclient.version} + ${prometheus-simpleclient.version} + 1.1.0.Final + 1.3.0 + 4.9 + 3.5 + 3.6.2 + 2.0.0 + 3.0.0.1 + 5.2.10.Final + ${hibernate.version} + ${hibernate.version} + 8.2.5.Final + 9.0.0.Final + 1.0.0.Final + 1.1.0.Final + ${spring-cloud-dependencies.version} + 1.0.0.RELEASE @@ -64,199 +64,199 @@ com.datastax.cassandra cassandra-driver-extras - ${com.datastax.cassandra_cassandra-driver-extras.version} + ${cassandra-driver-extras.version} com.github.mongobee mongobee - ${com.github.mongobee_mongobee.version} + ${mongobee.version} com.github.sabomichal liquibase-mssql - ${com.github.sabomichal_liquibase-mssql.version} + ${liquibase-mssql.version} com.github.vladimir-bukhtoyarov bucket4j-core - ${com.github.vladimir-bukhtoyarov_bucket4j-core.version} + ${bucket4j-core.version} com.github.vladimir-bukhtoyarov bucket4j-jcache - ${com.github.vladimir-bukhtoyarov_bucket4j-jcache.version} + ${bucket4j-jcache.version} com.hazelcast hazelcast-hibernate52 - ${com.hazelcast_hazelcast-hibernate52.version} + ${hazelcast-hibernate52.version} com.hazelcast hazelcast-wm - ${com.hazelcast_hazelcast-wm.version} + ${hazelcast-wm.version} com.jcraft jzlib - ${com.jcraft_jzlib.version} + ${jzlib.version} com.mattbertolini liquibase-slf4j - ${com.mattbertolini_liquibase-slf4j.version} + ${liquibase-slf4j.version} com.microsoft.sqlserver mssql-jdbc - ${com.microsoft.sqlserver_mssql-jdbc.version} + ${mssql-jdbc.version} com.oracle.jdbc ojdbc7 - ${com.oracle.jdbc_ojdbc7.version} + ${ojdbc7.version} com.ryantenney.metrics metrics-spring - ${com.ryantenney.metrics_metrics-spring.version} + ${metrics-spring.version} commons-io commons-io - ${commons-io_commons-io.version} + ${commons-io.version} info.cukes cucumber-junit - ${info.cukes_cucumber-junit.version} + ${cucumber-junit.version} info.cukes cucumber-spring - ${info.cukes_cucumber-spring.version} + ${cucumber-spring.version} io.dropwizard.metrics metrics-annotation - ${io.dropwizard.metrics_metrics-annotation.version} + ${dropwizard-metrics-annotation.version} io.dropwizard.metrics metrics-jcache - ${io.dropwizard.metrics_metrics-jcache.version} + ${dropwizard-metrics-jcache.version} io.dropwizard.metrics metrics-json - ${io.dropwizard.metrics_metrics-json.version} + ${dropwizard-metrics-json.version} io.dropwizard.metrics metrics-jvm - ${io.dropwizard.metrics_metrics-jvm.version} + ${dropwizard-metrics-jvm.version} io.dropwizard.metrics metrics-servlets - ${io.dropwizard.metrics_metrics-servlets.version} + ${dropwizard-metrics-servlets.version} io.gatling.highcharts gatling-charts-highcharts - ${io.gatling.highcharts_gatling-charts-highcharts.version} + ${gatling-charts-highcharts.version} io.jsonwebtoken jjwt - ${io.jsonwebtoken_jjwt.version} + ${jjwt.version} io.springfox springfox-swagger2 - ${io.springfox_springfox-swagger2.version} + ${springfox-swagger2.version} io.prometheus simpleclient - ${io.prometheus_simpleclient.version} + ${prometheus-simpleclient.version} io.prometheus simpleclient_servlet - ${io.prometheus_simpleclient_servlet.version} + ${prometheus-simpleclient_servlet.version} io.prometheus simpleclient_dropwizard - ${io.prometheus_simpleclient_dropwizard.version} + ${prometheus-simpleclient_dropwizard.version} io.springfox springfox-bean-validators - ${io.springfox_springfox-bean-validators.version} + ${springfox-bean-validators.version} net.jpountz.lz4 lz4 - ${net.jpountz.lz4_lz4.version} + ${lz4.version} net.logstash.logback logstash-logback-encoder - ${net.logstash.logback_logstash-logback-encoder.version} + ${logstash-logback-encoder.version} org.apache.commons commons-lang3 - ${org.apache.commons_commons-lang3.version} + ${commons-lang3.version} org.assertj assertj-core - ${org.assertj_assertj-core.version} + ${assertj-core.version} org.awaitility awaitility - ${org.awaitility_awaitility.version} + ${awaitility.version} org.cassandraunit cassandra-unit-spring - ${org.cassandraunit_cassandra-unit-spring.version} + ${cassandra-unit-spring.version} org.hibernate hibernate-infinispan - ${org.hibernate_hibernate-infinispan.version} + ${hibernate-infinispan.version} org.hibernate hibernate-jcache - ${org.hibernate_hibernate-jcache.version} + ${hibernate-jcache.version} org.infinispan infinispan-bom - ${org.infinispan_infinispan-bom.version} + ${infinispan-bom.version} pom import org.infinispan infinispan-cloud - ${org.infinispan_infinispan-cloud.version} + ${infinispan-cloud.version} org.infinispan infinispan-spring-boot-starter - ${org.infinispan_infinispan-spring-boot-starter.version} + ${infinispan-spring-boot-starter.version} org.mapstruct mapstruct-jdk8 - ${org.mapstruct_mapstruct-jdk8.version} + ${mapstruct-jdk8.version} From c034deb11152ad29d1ae02a75370251f51f39777 Mon Sep 17 00:00:00 2001 From: Erik Kemperman Date: Mon, 9 Oct 2017 11:59:56 +0200 Subject: [PATCH 03/10] Re-sort properties alphabetically --- jhipster-dependencies/pom.xml | 48 +++++++++++++++++------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/jhipster-dependencies/pom.xml b/jhipster-dependencies/pom.xml index 703e92c5860c..2e5d0d699a7c 100644 --- a/jhipster-dependencies/pom.xml +++ b/jhipster-dependencies/pom.xml @@ -10,20 +10,15 @@ JHipster dependency management - 3.3.0 - 0.12 - 1.5 + 3.6.2 + 2.0.0 2.0.1 ${bucket4j.version} ${bucket4j.version} - 1.2 - 3.7 - 1.1.3 - 2.0.0 - 6.1.0.jre8 - 12.1.0.2 - 3.1.3 + 3.3.0 + 3.0.0.1 2.5 + 3.5 1.2.4 ${cucumber.version} ${cucumber.version} @@ -33,28 +28,33 @@ ${dropwizard-metrics.version} ${dropwizard-metrics.version} ${dropwizard-metrics.version} + 3.1.3 2.2.5 - 0.7.0 - 2.7.0 - ${springfox.version} - ${springfox.version} - 0.0.20 - ${prometheus-simpleclient.version} - ${prometheus-simpleclient.version} - 1.1.0.Final - 1.3.0 - 4.9 - 3.5 - 3.6.2 - 2.0.0 - 3.0.0.1 + 1.2 + 3.7 5.2.10.Final ${hibernate.version} ${hibernate.version} 8.2.5.Final 9.0.0.Final 1.0.0.Final + 0.7.0 + 1.1.3 + 1.5 + 2.0.0 + 4.9 + 1.3.0 1.1.0.Final + 0.12 + 6.1.0.jre8 + 12.1.0.2 + 0.0.20 + ${prometheus-simpleclient.version} + ${prometheus-simpleclient.version} + 2.7.0 + ${springfox.version} + ${springfox.version} + 1.1.0.Final ${spring-cloud-dependencies.version} 1.0.0.RELEASE From 82ae3bee4f493b4b4acec71374a745104d66902b Mon Sep 17 00:00:00 2001 From: Erik Kemperman Date: Mon, 9 Oct 2017 12:00:42 +0200 Subject: [PATCH 04/10] Remove redundant properties --- jhipster-dependencies/pom.xml | 45 ++++++++++++----------------------- 1 file changed, 15 insertions(+), 30 deletions(-) diff --git a/jhipster-dependencies/pom.xml b/jhipster-dependencies/pom.xml index 2e5d0d699a7c..f206db3a300e 100644 --- a/jhipster-dependencies/pom.xml +++ b/jhipster-dependencies/pom.xml @@ -13,28 +13,17 @@ 3.6.2 2.0.0 2.0.1 - ${bucket4j.version} - ${bucket4j.version} 3.3.0 3.0.0.1 2.5 3.5 1.2.4 - ${cucumber.version} - ${cucumber.version} 3.2.2 - ${dropwizard-metrics.version} - ${dropwizard-metrics.version} - ${dropwizard-metrics.version} - ${dropwizard-metrics.version} - ${dropwizard-metrics.version} 3.1.3 2.2.5 1.2 3.7 5.2.10.Final - ${hibernate.version} - ${hibernate.version} 8.2.5.Final 9.0.0.Final 1.0.0.Final @@ -49,11 +38,7 @@ 6.1.0.jre8 12.1.0.2 0.0.20 - ${prometheus-simpleclient.version} - ${prometheus-simpleclient.version} 2.7.0 - ${springfox.version} - ${springfox.version} 1.1.0.Final ${spring-cloud-dependencies.version} 1.0.0.RELEASE @@ -79,12 +64,12 @@ com.github.vladimir-bukhtoyarov bucket4j-core - ${bucket4j-core.version} + ${bucket4j.version} com.github.vladimir-bukhtoyarov bucket4j-jcache - ${bucket4j-jcache.version} + ${bucket4j.version} com.hazelcast @@ -129,37 +114,37 @@ info.cukes cucumber-junit - ${cucumber-junit.version} + ${cucumber.version} info.cukes cucumber-spring - ${cucumber-spring.version} + ${cucumber.version} io.dropwizard.metrics metrics-annotation - ${dropwizard-metrics-annotation.version} + ${dropwizard-metrics.version} io.dropwizard.metrics metrics-jcache - ${dropwizard-metrics-jcache.version} + ${dropwizard-metrics.version} io.dropwizard.metrics metrics-json - ${dropwizard-metrics-json.version} + ${dropwizard-metrics.version} io.dropwizard.metrics metrics-jvm - ${dropwizard-metrics-jvm.version} + ${dropwizard-metrics.version} io.dropwizard.metrics metrics-servlets - ${dropwizard-metrics-servlets.version} + ${dropwizard-metrics.version} io.gatling.highcharts @@ -174,7 +159,7 @@ io.springfox springfox-swagger2 - ${springfox-swagger2.version} + ${springfox.version} io.prometheus @@ -184,17 +169,17 @@ io.prometheus simpleclient_servlet - ${prometheus-simpleclient_servlet.version} + ${prometheus-simpleclient.version} io.prometheus simpleclient_dropwizard - ${prometheus-simpleclient_dropwizard.version} + ${prometheus-simpleclient.version} io.springfox springfox-bean-validators - ${springfox-bean-validators.version} + ${springfox.version} net.jpountz.lz4 @@ -229,12 +214,12 @@ org.hibernate hibernate-infinispan - ${hibernate-infinispan.version} + ${hibernate.version} org.hibernate hibernate-jcache - ${hibernate-jcache.version} + ${hibernate.version} org.infinispan From e12d30ef6106f0d78159b26b4e91dee3ff2a8085 Mon Sep 17 00:00:00 2001 From: Erik Kemperman Date: Mon, 9 Oct 2017 12:00:48 +0200 Subject: [PATCH 05/10] Re-sort dependencies alphabetically --- jhipster-dependencies/pom.xml | 212 +++++++++++++++++----------------- 1 file changed, 106 insertions(+), 106 deletions(-) diff --git a/jhipster-dependencies/pom.xml b/jhipster-dependencies/pom.xml index f206db3a300e..3f6fc4af3ae5 100644 --- a/jhipster-dependencies/pom.xml +++ b/jhipster-dependencies/pom.xml @@ -47,19 +47,14 @@ - com.datastax.cassandra - cassandra-driver-extras - ${cassandra-driver-extras.version} - - - com.github.mongobee - mongobee - ${mongobee.version} + org.assertj + assertj-core + ${assertj-core.version} - com.github.sabomichal - liquibase-mssql - ${liquibase-mssql.version} + org.awaitility + awaitility + ${awaitility.version} com.github.vladimir-bukhtoyarov @@ -71,6 +66,41 @@ bucket4j-jcache ${bucket4j.version} + + com.datastax.cassandra + cassandra-driver-extras + ${cassandra-driver-extras.version} + + + org.cassandraunit + cassandra-unit-spring + ${cassandra-unit-spring.version} + + + commons-io + commons-io + ${commons-io.version} + + + org.apache.commons + commons-lang3 + ${commons-lang3.version} + + + info.cukes + cucumber-junit + ${cucumber.version} + + + info.cukes + cucumber-spring + ${cucumber.version} + + + io.gatling.highcharts + gatling-charts-highcharts + ${gatling-charts-highcharts.version} + com.hazelcast hazelcast-hibernate52 @@ -82,44 +112,66 @@ ${hazelcast-wm.version} - com.jcraft - jzlib - ${jzlib.version} + org.hibernate + hibernate-infinispan + ${hibernate.version} - com.mattbertolini - liquibase-slf4j - ${liquibase-slf4j.version} + org.hibernate + hibernate-jcache + ${hibernate.version} - com.microsoft.sqlserver - mssql-jdbc - ${mssql-jdbc.version} + org.infinispan + infinispan-bom + ${infinispan-bom.version} + pom + import - com.oracle.jdbc - ojdbc7 - ${ojdbc7.version} + org.infinispan + infinispan-cloud + ${infinispan-cloud.version} - com.ryantenney.metrics - metrics-spring - ${metrics-spring.version} + org.infinispan + infinispan-spring-boot-starter + ${infinispan-spring-boot-starter.version} - commons-io - commons-io - ${commons-io.version} + io.jsonwebtoken + jjwt + ${jjwt.version} - info.cukes - cucumber-junit - ${cucumber.version} + com.jcraft + jzlib + ${jzlib.version} - info.cukes - cucumber-spring - ${cucumber.version} + com.github.sabomichal + liquibase-mssql + ${liquibase-mssql.version} + + + com.mattbertolini + liquibase-slf4j + ${liquibase-slf4j.version} + + + net.logstash.logback + logstash-logback-encoder + ${logstash-logback-encoder.version} + + + net.jpountz.lz4 + lz4 + ${lz4.version} + + + org.mapstruct + mapstruct-jdk8 + ${mapstruct-jdk8.version} io.dropwizard.metrics @@ -147,19 +199,24 @@ ${dropwizard-metrics.version} - io.gatling.highcharts - gatling-charts-highcharts - ${gatling-charts-highcharts.version} + com.ryantenney.metrics + metrics-spring + ${metrics-spring.version} - io.jsonwebtoken - jjwt - ${jjwt.version} + com.github.mongobee + mongobee + ${mongobee.version} - io.springfox - springfox-swagger2 - ${springfox.version} + com.microsoft.sqlserver + mssql-jdbc + ${mssql-jdbc.version} + + + com.oracle.jdbc + ojdbc7 + ${ojdbc7.version} io.prometheus @@ -168,12 +225,12 @@ io.prometheus - simpleclient_servlet + simpleclient_dropwizard ${prometheus-simpleclient.version} io.prometheus - simpleclient_dropwizard + simpleclient_servlet ${prometheus-simpleclient.version} @@ -182,66 +239,9 @@ ${springfox.version} - net.jpountz.lz4 - lz4 - ${lz4.version} - - - net.logstash.logback - logstash-logback-encoder - ${logstash-logback-encoder.version} - - - org.apache.commons - commons-lang3 - ${commons-lang3.version} - - - org.assertj - assertj-core - ${assertj-core.version} - - - org.awaitility - awaitility - ${awaitility.version} - - - org.cassandraunit - cassandra-unit-spring - ${cassandra-unit-spring.version} - - - org.hibernate - hibernate-infinispan - ${hibernate.version} - - - org.hibernate - hibernate-jcache - ${hibernate.version} - - - org.infinispan - infinispan-bom - ${infinispan-bom.version} - pom - import - - - org.infinispan - infinispan-cloud - ${infinispan-cloud.version} - - - org.infinispan - infinispan-spring-boot-starter - ${infinispan-spring-boot-starter.version} - - - org.mapstruct - mapstruct-jdk8 - ${mapstruct-jdk8.version} + io.springfox + springfox-swagger2 + ${springfox.version} From 5419419a84c69b781ae40ce721b0e547cb91369d Mon Sep 17 00:00:00 2001 From: Erik Kemperman Date: Mon, 9 Oct 2017 12:01:07 +0200 Subject: [PATCH 06/10] Add XML prolog --- jhipster-dependencies/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/jhipster-dependencies/pom.xml b/jhipster-dependencies/pom.xml index 3f6fc4af3ae5..586becf5fa15 100644 --- a/jhipster-dependencies/pom.xml +++ b/jhipster-dependencies/pom.xml @@ -1,3 +1,4 @@ + 4.0.0 From fcd993d6ed33f848000e2ef91404c13dba783baf Mon Sep 17 00:00:00 2001 From: Erik Kemperman Date: Mon, 9 Oct 2017 12:01:18 +0200 Subject: [PATCH 07/10] Inherit from spring-boot-dependencies, remove duplicates --- jhipster-dependencies/pom.xml | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/jhipster-dependencies/pom.xml b/jhipster-dependencies/pom.xml index 586becf5fa15..ebd44f1ea633 100644 --- a/jhipster-dependencies/pom.xml +++ b/jhipster-dependencies/pom.xml @@ -3,6 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + + spring-boot-dependencies + org.springframework.boot + 1.5.7.RELEASE + + + io.github.jhipster jhipster-dependencies 1.1.11 @@ -11,7 +18,7 @@ JHipster dependency management - 3.6.2 + 3.6.2 2.0.0 2.0.1 3.3.0 @@ -25,7 +32,6 @@ 1.2 3.7 5.2.10.Final - 8.2.5.Final 9.0.0.Final 1.0.0.Final 0.7.0 @@ -47,11 +53,6 @@ - - org.assertj - assertj-core - ${assertj-core.version} - org.awaitility awaitility @@ -125,7 +126,7 @@ org.infinispan infinispan-bom - ${infinispan-bom.version} + ${infinispan.version} pom import @@ -194,11 +195,6 @@ metrics-jvm ${dropwizard-metrics.version} - - io.dropwizard.metrics - metrics-servlets - ${dropwizard-metrics.version} - com.ryantenney.metrics metrics-spring From b74c19eee07cb7162780861ccd7feb4a2bd215e7 Mon Sep 17 00:00:00 2001 From: Erik Kemperman Date: Mon, 9 Oct 2017 12:01:37 +0200 Subject: [PATCH 08/10] Align properties with latest jhipster-generator --- jhipster-dependencies/pom.xml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/jhipster-dependencies/pom.xml b/jhipster-dependencies/pom.xml index ebd44f1ea633..de38fa0e6947 100644 --- a/jhipster-dependencies/pom.xml +++ b/jhipster-dependencies/pom.xml @@ -20,15 +20,14 @@ 3.6.2 2.0.0 - 2.0.1 + 3.0.1 3.3.0 3.0.0.1 2.5 3.5 1.2.4 3.2.2 - 3.1.3 - 2.2.5 + 2.2.5 1.2 3.7 5.2.10.Final @@ -38,16 +37,17 @@ 1.1.3 1.5 2.0.0 - 4.9 + 4.11 1.3.0 - 1.1.0.Final + 1.1.0.Final + 3.1.3 0.12 6.1.0.jre8 - 12.1.0.2 + 12.1.0.2 0.0.20 2.7.0 1.1.0.Final - ${spring-cloud-dependencies.version} + Dalston.SR2 1.0.0.RELEASE @@ -173,7 +173,7 @@ org.mapstruct mapstruct-jdk8 - ${mapstruct-jdk8.version} + ${mapstruct.version} io.dropwizard.metrics @@ -213,7 +213,8 @@ com.oracle.jdbc ojdbc7 - ${ojdbc7.version} + ${oracle-jdbc.version} + io.prometheus From 0cc902ac357441582734e5c82b5f6372d9ad10f2 Mon Sep 17 00:00:00 2001 From: Erik Kemperman Date: Mon, 9 Oct 2017 12:01:47 +0200 Subject: [PATCH 09/10] Add missing dependencyManagement from jhipster-generator --- jhipster-dependencies/pom.xml | 125 +++++++++++++++++++++++++++++++++- 1 file changed, 124 insertions(+), 1 deletion(-) diff --git a/jhipster-dependencies/pom.xml b/jhipster-dependencies/pom.xml index de38fa0e6947..25a0c761df70 100644 --- a/jhipster-dependencies/pom.xml +++ b/jhipster-dependencies/pom.xml @@ -28,11 +28,13 @@ 1.2.4 3.2.2 2.2.5 + 23.0 1.2 3.7 5.2.10.Final 9.0.0.Final 1.0.0.Final + 1.1.11 0.7.0 1.1.3 1.5 @@ -44,10 +46,15 @@ 0.12 6.1.0.jre8 12.1.0.2 + 0.20.1 0.0.20 2.7.0 1.1.0.Final Dalston.SR2 + + 1.3.2.RELEASE + Chelsea.SR2 1.0.0.RELEASE @@ -77,6 +84,16 @@ org.cassandraunit cassandra-unit-spring ${cassandra-unit-spring.version} + + + org.slf4j + jcl-over-slf4j + + + org.slf4j + slf4j-log4j12 + + commons-io @@ -101,7 +118,12 @@ io.gatling.highcharts gatling-charts-highcharts - ${gatling-charts-highcharts.version} + ${gatling.version} + + + com.google.guava + guava + ${guava.version} com.hazelcast @@ -134,12 +156,23 @@ org.infinispan infinispan-cloud ${infinispan-cloud.version} + + + io.undertow + undertow-core + + org.infinispan infinispan-spring-boot-starter ${infinispan-spring-boot-starter.version} + + io.github.jhipster + jhipster + ${jhipster-server.version} + io.jsonwebtoken jjwt @@ -175,6 +208,11 @@ mapstruct-jdk8 ${mapstruct.version} + + org.mapstruct + mapstruct-processor + ${mapstruct.version} + io.dropwizard.metrics metrics-annotation @@ -195,6 +233,11 @@ metrics-jvm ${dropwizard-metrics.version} + + io.dropwizard.metrics + metrics-servlet + ${dropwizard-metrics.version} + com.ryantenney.metrics metrics-spring @@ -216,6 +259,11 @@ ${oracle-jdbc.version} + + org.zalando + problem-spring-web + ${problem-spring-web.version} + io.prometheus simpleclient @@ -231,6 +279,75 @@ simpleclient_servlet ${prometheus-simpleclient.version} + + org.springframework.boot + spring-boot-configuration-processor + ${project.parent.version} + + + com.vaadin.external.google + android-json + + + + + org.springframework.boot + spring-boot-starter-test + ${project.parent.version} + + + com.vaadin.external.google + android-json + + + commons-logging + commons-logging + + + + + org.springframework.boot + spring-boot-starter-web + ${project.parent.version} + + + org.springframework.boot + spring-boot-starter-tomcat + + + + + org.springframework.cloud + spring-cloud-starter-ribbon + ${spring-cloud-netflix.version} + + + + io.netty + netty-transport-native-epoll + + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + org.springframework.cloud + spring-cloud-stream-dependencies + ${spring-cloud-stream.version} + pom + import + + + org.springframework.social + spring-social-google + ${spring-social-google.version} + io.springfox springfox-bean-validators @@ -240,6 +357,12 @@ io.springfox springfox-swagger2 ${springfox.version} + + + org.mapstruct + mapstruct + + From ae50a88805d819c35100c448cd88eb51465d3a81 Mon Sep 17 00:00:00 2001 From: Erik Kemperman Date: Mon, 9 Oct 2017 12:02:14 +0200 Subject: [PATCH 10/10] Do BOM imports last --- jhipster-dependencies/pom.xml | 45 +++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/jhipster-dependencies/pom.xml b/jhipster-dependencies/pom.xml index 25a0c761df70..3f069be48ebb 100644 --- a/jhipster-dependencies/pom.xml +++ b/jhipster-dependencies/pom.xml @@ -145,13 +145,6 @@ hibernate-jcache ${hibernate.version} - - org.infinispan - infinispan-bom - ${infinispan.version} - pom - import - org.infinispan infinispan-cloud @@ -329,20 +322,6 @@ - - org.springframework.cloud - spring-cloud-dependencies - ${spring-cloud.version} - pom - import - - - org.springframework.cloud - spring-cloud-stream-dependencies - ${spring-cloud-stream.version} - pom - import - org.springframework.social spring-social-google @@ -364,6 +343,30 @@ + + + + org.infinispan + infinispan-bom + ${infinispan.version} + pom + import + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + org.springframework.cloud + spring-cloud-stream-dependencies + ${spring-cloud-stream.version} + pom + import + +