Skip to content

Commit 142c183

Browse files
wilkinsonawilkinsona
committed
Fix the ordering of versions and dependencies in the dependencies pom
1 parent a832944 commit 142c183

File tree

1 file changed

+56
-56
lines changed

1 file changed

+56
-56
lines changed

‎spring-boot-dependencies/pom.xml

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -68,18 +68,18 @@
6868
<hibernate-jpa-api.version>1.0.1.Final</hibernate-jpa-api.version>
6969
<hibernate-validator.version>5.0.3.Final</hibernate-validator.version>
7070
<hikaricp.version>1.4.0</hikaricp.version>
71-
<httpclient.version>4.3.6</httpclient.version>
72-
<httpasyncclient.version>4.0.2</httpasyncclient.version>
7371
<hornetq.version>2.4.5.Final</hornetq.version>
7472
<hsqldb.version>2.3.2</hsqldb.version>
73+
<httpasyncclient.version>4.0.2</httpasyncclient.version>
74+
<httpclient.version>4.3.6</httpclient.version>
7575
<jackson.version>2.3.4</jackson.version>
7676
<janino.version>2.6.1</janino.version>
7777
<javassist.version>3.18.1-GA</javassist.version> <!-- Same as Hibernate -->
78+
<jaxen.version>1.1.6</jaxen.version>
79+
<jdom2.version>2.0.5</jdom2.version>
7880
<jedis.version>2.4.2</jedis.version>
7981
<jetty.version>8.1.15.v20140411</jetty.version>
8082
<jetty-jsp.version>2.2.0.v201112011158</jetty-jsp.version>
81-
<jaxen.version>1.1.6</jaxen.version>
82-
<jdom2.version>2.0.5</jdom2.version>
8383
<joda-time.version>2.3</joda-time.version>
8484
<jolokia.version>1.2.3</jolokia.version>
8585
<json-path.version>0.9.1</json-path.version>
@@ -106,12 +106,12 @@
106106
<spring-integration.version>4.0.4.RELEASE</spring-integration.version>
107107
<spring-loaded.version>1.2.1.RELEASE</spring-loaded.version>
108108
<spring-mobile.version>1.1.3.RELEASE</spring-mobile.version>
109+
<spring-security.version>3.2.5.RELEASE</spring-security.version>
110+
<spring-security-jwt.version>1.0.2.RELEASE</spring-security-jwt.version>
109111
<spring-social.version>1.1.0.RELEASE</spring-social.version>
110112
<spring-social-facebook.version>1.1.1.RELEASE</spring-social-facebook.version>
111-
<spring-social-twitter.version>1.1.0.RELEASE</spring-social-twitter.version>
112113
<spring-social-linkedin.version>1.0.1.RELEASE</spring-social-linkedin.version>
113-
<spring-security.version>3.2.5.RELEASE</spring-security.version>
114-
<spring-security-jwt.version>1.0.2.RELEASE</spring-security-jwt.version>
114+
<spring-social-twitter.version>1.1.0.RELEASE</spring-social-twitter.version>
115115
<spring-ws.version>2.2.0.RELEASE</spring-ws.version>
116116
<thymeleaf.version>2.1.3.RELEASE</thymeleaf.version>
117117
<thymeleaf-extras-springsecurity3.version>2.1.1.RELEASE</thymeleaf-extras-springsecurity3.version>
@@ -349,7 +349,7 @@
349349
</dependency>
350350
<dependency>
351351
<groupId>com.codahale.metrics</groupId>
352-
<artifactId>metrics-graphite</artifactId>
352+
<artifactId>metrics-core</artifactId>
353353
<version>${codahale-metrics.version}</version>
354354
</dependency>
355355
<dependency>
@@ -359,19 +359,14 @@
359359
</dependency>
360360
<dependency>
361361
<groupId>com.codahale.metrics</groupId>
362-
<artifactId>metrics-core</artifactId>
362+
<artifactId>metrics-graphite</artifactId>
363363
<version>${codahale-metrics.version}</version>
364364
</dependency>
365365
<dependency>
366366
<groupId>com.codahale.metrics</groupId>
367367
<artifactId>metrics-servlets</artifactId>
368368
<version>${codahale-metrics.version}</version>
369369
</dependency>
370-
<dependency>
371-
<groupId>org.codehaus.janino</groupId>
372-
<artifactId>janino</artifactId>
373-
<version>${janino.version}</version>
374-
</dependency>
375370
<dependency>
376371
<groupId>com.fasterxml.jackson.core</groupId>
377372
<artifactId>jackson-annotations</artifactId>
@@ -501,12 +496,12 @@
501496
</dependency>
502497
<dependency>
503498
<groupId>org.apache.activemq</groupId>
504-
<artifactId>activemq-client</artifactId>
499+
<artifactId>activemq-broker</artifactId>
505500
<version>${activemq.version}</version>
506501
</dependency>
507502
<dependency>
508503
<groupId>org.apache.activemq</groupId>
509-
<artifactId>activemq-broker</artifactId>
504+
<artifactId>activemq-client</artifactId>
510505
<version>${activemq.version}</version>
511506
</dependency>
512507
<dependency>
@@ -521,8 +516,8 @@
521516
</dependency>
522517
<dependency>
523518
<groupId>org.apache.httpcomponents</groupId>
524-
<artifactId>httpclient</artifactId>
525-
<version>${httpclient.version}</version>
519+
<artifactId>httpasyncclient</artifactId>
520+
<version>${httpasyncclient.version}</version>
526521
<exclusions>
527522
<exclusion>
528523
<groupId>commons-logging</groupId>
@@ -532,20 +527,20 @@
532527
</dependency>
533528
<dependency>
534529
<groupId>org.apache.httpcomponents</groupId>
535-
<artifactId>httpmime</artifactId>
530+
<artifactId>httpclient</artifactId>
536531
<version>${httpclient.version}</version>
537-
</dependency>
538-
<dependency>
539-
<groupId>org.apache.httpcomponents</groupId>
540-
<artifactId>httpasyncclient</artifactId>
541-
<version>${httpasyncclient.version}</version>
542532
<exclusions>
543533
<exclusion>
544534
<groupId>commons-logging</groupId>
545535
<artifactId>commons-logging</artifactId>
546536
</exclusion>
547537
</exclusions>
548538
</dependency>
539+
<dependency>
540+
<groupId>org.apache.httpcomponents</groupId>
541+
<artifactId>httpmime</artifactId>
542+
<version>${httpclient.version}</version>
543+
</dependency>
549544
<dependency>
550545
<groupId>org.apache.tomcat.embed</groupId>
551546
<artifactId>tomcat-embed-core</artifactId>
@@ -558,12 +553,12 @@
558553
</dependency>
559554
<dependency>
560555
<groupId>org.apache.tomcat.embed</groupId>
561-
<artifactId>tomcat-embed-logging-juli</artifactId>
556+
<artifactId>tomcat-embed-jasper</artifactId>
562557
<version>${tomcat.version}</version>
563558
</dependency>
564559
<dependency>
565560
<groupId>org.apache.tomcat.embed</groupId>
566-
<artifactId>tomcat-embed-jasper</artifactId>
561+
<artifactId>tomcat-embed-logging-juli</artifactId>
567562
<version>${tomcat.version}</version>
568563
</dependency>
569564
<dependency>
@@ -707,6 +702,11 @@
707702
<artifactId>groovy-xml</artifactId>
708703
<version>${groovy.version}</version>
709704
</dependency>
705+
<dependency>
706+
<groupId>org.codehaus.janino</groupId>
707+
<artifactId>janino</artifactId>
708+
<version>${janino.version}</version>
709+
</dependency>
710710
<dependency>
711711
<groupId>org.crashub</groupId>
712712
<artifactId>crash.cli</artifactId>
@@ -766,29 +766,29 @@
766766
</dependency>
767767
<dependency>
768768
<groupId>org.eclipse.jetty</groupId>
769-
<artifactId>jetty-webapp</artifactId>
769+
<artifactId>jetty-util</artifactId>
770770
<version>${jetty.version}</version>
771771
</dependency>
772772
<dependency>
773773
<groupId>org.eclipse.jetty</groupId>
774-
<artifactId>jetty-util</artifactId>
774+
<artifactId>jetty-webapp</artifactId>
775775
<version>${jetty.version}</version>
776776
</dependency>
777777
<dependency>
778778
<groupId>org.eclipse.jetty.orbit</groupId>
779779
<artifactId>javax.servlet.jsp</artifactId>
780780
<version>${jetty-jsp.version}</version>
781781
</dependency>
782-
<dependency>
783-
<groupId>org.freemarker</groupId>
784-
<artifactId>freemarker</artifactId>
785-
<version>${freemarker.version}</version>
786-
</dependency>
787782
<dependency>
788783
<groupId>org.flywaydb</groupId>
789784
<artifactId>flyway-core</artifactId>
790785
<version>${flyway.version}</version>
791786
</dependency>
787+
<dependency>
788+
<groupId>org.freemarker</groupId>
789+
<artifactId>freemarker</artifactId>
790+
<version>${freemarker.version}</version>
791+
</dependency>
792792
<dependency>
793793
<groupId>org.hamcrest</groupId>
794794
<artifactId>hamcrest-core</artifactId>
@@ -816,12 +816,12 @@
816816
</dependency>
817817
<dependency>
818818
<groupId>org.hornetq</groupId>
819-
<artifactId>hornetq-jms-server</artifactId>
819+
<artifactId>hornetq-jms-client</artifactId>
820820
<version>${hornetq.version}</version>
821821
</dependency>
822822
<dependency>
823823
<groupId>org.hornetq</groupId>
824-
<artifactId>hornetq-jms-client</artifactId>
824+
<artifactId>hornetq-jms-server</artifactId>
825825
<version>${hornetq.version}</version>
826826
</dependency>
827827
<dependency>
@@ -834,21 +834,26 @@
834834
<artifactId>javassist</artifactId>
835835
<version>${javassist.version}</version>
836836
</dependency>
837-
<dependency>
838-
<groupId>org.jolokia</groupId>
839-
<artifactId>jolokia-core</artifactId>
840-
<version>${jolokia.version}</version>
841-
</dependency>
842837
<dependency>
843838
<groupId>org.jdom</groupId>
844839
<artifactId>jdom2</artifactId>
845840
<version>${jdom2.version}</version>
846841
</dependency>
842+
<dependency>
843+
<groupId>org.jolokia</groupId>
844+
<artifactId>jolokia-core</artifactId>
845+
<version>${jolokia.version}</version>
846+
</dependency>
847847
<dependency>
848848
<groupId>org.liquibase</groupId>
849849
<artifactId>liquibase-core</artifactId>
850850
<version>${liquibase.version}</version>
851851
</dependency>
852+
<dependency>
853+
<groupId>org.mockito</groupId>
854+
<artifactId>mockito-core</artifactId>
855+
<version>${mockito.version}</version>
856+
</dependency>
852857
<dependency>
853858
<groupId>org.mongodb</groupId>
854859
<artifactId>mongo-java-driver</artifactId>
@@ -881,12 +886,12 @@
881886
</dependency>
882887
<dependency>
883888
<groupId>org.projectreactor.spring</groupId>
884-
<artifactId>reactor-spring-core</artifactId>
889+
<artifactId>reactor-spring-context</artifactId>
885890
<version>${reactor-spring.version}</version>
886891
</dependency>
887892
<dependency>
888893
<groupId>org.projectreactor.spring</groupId>
889-
<artifactId>reactor-spring-context</artifactId>
894+
<artifactId>reactor-spring-core</artifactId>
890895
<version>${reactor-spring.version}</version>
891896
</dependency>
892897
<dependency>
@@ -899,29 +904,24 @@
899904
<artifactId>reactor-spring-webmvc</artifactId>
900905
<version>${reactor-spring.version}</version>
901906
</dependency>
902-
<dependency>
903-
<groupId>org.mockito</groupId>
904-
<artifactId>mockito-core</artifactId>
905-
<version>${mockito.version}</version>
906-
</dependency>
907907
<dependency>
908908
<groupId>org.slf4j</groupId>
909909
<artifactId>jcl-over-slf4j</artifactId>
910910
<version>${slf4j.version}</version>
911911
</dependency>
912912
<dependency>
913913
<groupId>org.slf4j</groupId>
914-
<artifactId>log4j-over-slf4j</artifactId>
914+
<artifactId>jul-to-slf4j</artifactId>
915915
<version>${slf4j.version}</version>
916916
</dependency>
917917
<dependency>
918918
<groupId>org.slf4j</groupId>
919-
<artifactId>slf4j-api</artifactId>
919+
<artifactId>log4j-over-slf4j</artifactId>
920920
<version>${slf4j.version}</version>
921921
</dependency>
922922
<dependency>
923923
<groupId>org.slf4j</groupId>
924-
<artifactId>jul-to-slf4j</artifactId>
924+
<artifactId>slf4j-api</artifactId>
925925
<version>${slf4j.version}</version>
926926
</dependency>
927927
<dependency>
@@ -957,15 +957,15 @@
957957
</dependency>
958958
<dependency>
959959
<groupId>org.springframework</groupId>
960-
<artifactId>spring-framework-bom</artifactId>
960+
<artifactId>spring-core</artifactId>
961961
<version>${spring.version}</version>
962-
<scope>import</scope>
963-
<type>pom</type>
964962
</dependency>
965963
<dependency>
966964
<groupId>org.springframework</groupId>
967-
<artifactId>spring-core</artifactId>
965+
<artifactId>spring-framework-bom</artifactId>
968966
<version>${spring.version}</version>
967+
<scope>import</scope>
968+
<type>pom</type>
969969
</dependency>
970970
<dependency>
971971
<groupId>org.springframework</groupId>
@@ -1111,7 +1111,7 @@
11111111
</dependency>
11121112
<dependency>
11131113
<groupId>org.springframework.ws</groupId>
1114-
<artifactId>spring-ws-support</artifactId>
1114+
<artifactId>spring-ws-security</artifactId>
11151115
<version>${spring-ws.version}</version>
11161116
<exclusions>
11171117
<exclusion>
@@ -1122,7 +1122,7 @@
11221122
</dependency>
11231123
<dependency>
11241124
<groupId>org.springframework.ws</groupId>
1125-
<artifactId>spring-ws-security</artifactId>
1125+
<artifactId>spring-ws-support</artifactId>
11261126
<version>${spring-ws.version}</version>
11271127
<exclusions>
11281128
<exclusion>

0 commit comments

Comments
 (0)