Skip to content

Commit 76f26cb

Browse files
frantumafrantuma
authored
Merge pull request #2592 from abimarank/master
Moved project dependencies' versions to parent pom
2 parents 58551e4 + 74441b1 commit 76f26cb

File tree

9 files changed

+115
-47
lines changed

9 files changed

+115
-47
lines changed

‎modules/swagger-core/pom.xml‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,10 @@
7373
<dependency>
7474
<groupId>com.fasterxml.jackson.core</groupId>
7575
<artifactId>jackson-annotations</artifactId>
76-
<version>${jackson-version}</version>
7776
</dependency>
7877
<dependency>
7978
<groupId>com.fasterxml.jackson.core</groupId>
8079
<artifactId>jackson-databind</artifactId>
81-
<version>${jackson-version}</version>
8280
<exclusions>
8381
<exclusion>
8482
<groupId>com.fasterxml.jackson.core</groupId>
@@ -89,7 +87,6 @@
8987
<dependency>
9088
<groupId>com.fasterxml.jackson.dataformat</groupId>
9189
<artifactId>jackson-dataformat-yaml</artifactId>
92-
<version>${jackson-version}</version>
9390
</dependency>
9491
<dependency>
9592
<groupId>io.swagger</groupId>
@@ -99,7 +96,6 @@
9996
<dependency>
10097
<groupId>joda-time</groupId>
10198
<artifactId>joda-time</artifactId>
102-
<version>${joda-time-version}</version>
10399
<scope>test</scope>
104100
</dependency>
105101
<dependency>
@@ -109,30 +105,25 @@
109105
<dependency>
110106
<groupId>org.joda</groupId>
111107
<artifactId>joda-convert</artifactId>
112-
<version>${joda-version}</version>
113108
<scope>test</scope>
114109
</dependency>
115110
<dependency>
116111
<groupId>ch.qos.logback</groupId>
117112
<artifactId>logback-classic</artifactId>
118-
<version>${logback-version}</version>
119113
<scope>provided</scope>
120114
</dependency>
121115
<dependency>
122116
<groupId>ch.qos.logback</groupId>
123117
<artifactId>logback-core</artifactId>
124-
<version>${logback-version}</version>
125118
<scope>provided</scope>
126119
</dependency>
127120
<dependency>
128121
<groupId>javax.validation</groupId>
129122
<artifactId>validation-api</artifactId>
130-
<version>${validation-api-version}</version>
131123
</dependency>
132124
<dependency>
133125
<groupId>org.immutables</groupId>
134126
<artifactId>value</artifactId>
135-
<version>2.4.4</version>
136127
<scope>test</scope>
137128
</dependency>
138129
<dependency>
@@ -147,19 +138,17 @@
147138
<dependency>
148139
<groupId>javax.ws.rs</groupId>
149140
<artifactId>jsr311-api</artifactId>
150-
<version>1.1.1</version>
151141
<scope>test</scope>
152142
</dependency>
153143
<dependency>
154144
<groupId>org.glassfish.hk2.external</groupId>
155145
<artifactId>javax.inject</artifactId>
156-
<version>2.2.0</version>
157146
<scope>test</scope>
158147
</dependency>
159148
</dependencies>
160149
<properties>
161150
<!-- TODO increase coverage -->
162-
<validation-api-version>1.1.0.Final</validation-api-version>
151+
163152
<coverage.complexity.minimum>0.60</coverage.complexity.minimum>
164153
<coverage.line.minimum>0.0</coverage.line.minimum>
165154
<coverage.missed.classes>3</coverage.missed.classes>

‎modules/swagger-hibernate-validations/pom.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,19 +65,16 @@
6565
<dependency>
6666
<groupId>org.hibernate</groupId>
6767
<artifactId>hibernate-validator</artifactId>
68-
<version>${hibernate-validator-version}</version>
6968
<scope>provided</scope>
7069
</dependency>
7170
<dependency>
7271
<groupId>ch.qos.logback</groupId>
7372
<artifactId>logback-classic</artifactId>
74-
<version>${logback-version}</version>
7573
<scope>provided</scope>
7674
</dependency>
7775
<dependency>
7876
<groupId>ch.qos.logback</groupId>
7977
<artifactId>logback-core</artifactId>
80-
<version>${logback-version}</version>
8178
<scope>provided</scope>
8279
</dependency>
8380
<dependency>

‎modules/swagger-jaxrs/pom.xml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,13 +185,11 @@
185185
<dependency>
186186
<groupId>ch.qos.logback</groupId>
187187
<artifactId>logback-classic</artifactId>
188-
<version>${logback-version}</version>
189188
<scope>provided</scope>
190189
</dependency>
191190
<dependency>
192191
<groupId>ch.qos.logback</groupId>
193192
<artifactId>logback-core</artifactId>
194-
<version>${logback-version}</version>
195193
<scope>provided</scope>
196194
</dependency>
197195
<dependency>

‎modules/swagger-jersey-jaxrs/pom.xml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,11 @@
5656
<dependency>
5757
<groupId>com.sun.jersey.contribs</groupId>
5858
<artifactId>jersey-multipart</artifactId>
59-
<version>${jersey-version}</version>
6059
<scope>compile</scope>
6160
</dependency>
6261
<dependency>
6362
<groupId>com.sun.jersey</groupId>
6463
<artifactId>jersey-core</artifactId>
65-
<version>${jersey-version}</version>
6664
<scope>compile</scope>
6765
</dependency>
6866
<dependency>

‎modules/swagger-jersey2-jaxrs/pom.xml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@
6767
<dependency>
6868
<groupId>org.glassfish.jersey.containers</groupId>
6969
<artifactId>jersey-container-servlet-core</artifactId>
70-
<version>${jersey2-version}</version>
7170
<exclusions>
7271
<exclusion>
7372
<groupId>com.google.guava</groupId>
@@ -78,7 +77,6 @@
7877
<dependency>
7978
<groupId>org.glassfish.jersey.media</groupId>
8079
<artifactId>jersey-media-multipart</artifactId>
81-
<version>${jersey2-version}</version>
8280
</dependency>
8381
<dependency>
8482
<groupId>org.testng</groupId>

‎modules/swagger-models/pom.xml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
<dependency>
5252
<groupId>com.fasterxml.jackson.core</groupId>
5353
<artifactId>jackson-annotations</artifactId>
54-
<version>${jackson-version}</version>
5554
<scope>compile</scope>
5655
</dependency>
5756
<dependency>
@@ -72,7 +71,6 @@
7271
<dependency>
7372
<groupId>com.openpojo</groupId>
7473
<artifactId>openpojo</artifactId>
75-
<version>0.8.0</version>
7674
<scope>test</scope>
7775
<exclusions>
7876
<exclusion>
@@ -84,13 +82,11 @@
8482
<dependency>
8583
<groupId>org.powermock</groupId>
8684
<artifactId>powermock-module-testng</artifactId>
87-
<version>${powermock.version}</version>
8885
<scope>test</scope>
8986
</dependency>
9087
<dependency>
9188
<groupId>org.powermock</groupId>
9289
<artifactId>powermock-api-mockito</artifactId>
93-
<version>${powermock.version}</version>
9490
<exclusions>
9591
<exclusion>
9692
<groupId>junit</groupId>
@@ -106,19 +102,16 @@
106102
<dependency>
107103
<groupId>org.mockito</groupId>
108104
<artifactId>mockito-core</artifactId>
109-
<version>${mockito-version}</version>
110105
<scope>test</scope>
111106
</dependency>
112107
<dependency>
113108
<groupId>asm</groupId>
114109
<artifactId>asm</artifactId>
115-
<version>3.3.1</version>
116110
<scope>test</scope>
117111
</dependency>
118112
</dependencies>
119113
<properties>
120114
<!-- TODO increase coverage -->
121-
<validation-api-version>1.1.0.Final</validation-api-version>
122115
<coverage.complexity.minimum>0.07</coverage.complexity.minimum>
123116
<coverage.line.minimum>0.0</coverage.line.minimum>
124117
<!-- Setting this to a really high number since this module has almost no coverage -->

‎modules/swagger-mule/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,31 +49,26 @@
4949
<dependency>
5050
<groupId>joda-time</groupId>
5151
<artifactId>joda-time</artifactId>
52-
<version>2.7</version>
5352
<scope>test</scope>
5453
</dependency>
5554
<dependency>
5655
<groupId>org.joda</groupId>
5756
<artifactId>joda-convert</artifactId>
58-
<version>1.2</version>
5957
<scope>test</scope>
6058
</dependency>
6159
<dependency>
6260
<groupId>ch.qos.logback</groupId>
6361
<artifactId>logback-classic</artifactId>
64-
<version>${logback-version}</version>
6562
<scope>provided</scope>
6663
</dependency>
6764
<dependency>
6865
<groupId>ch.qos.logback</groupId>
6966
<artifactId>logback-core</artifactId>
70-
<version>${logback-version}</version>
7167
<scope>provided</scope>
7268
</dependency>
7369
<dependency>
7470
<groupId>javax.ws.rs</groupId>
7571
<artifactId>jsr311-api</artifactId>
76-
<version>1.1.1</version>
7772
</dependency>
7873
<dependency>
7974
<groupId>org.testng</groupId>

‎modules/swagger-servlet/pom.xml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,11 @@
4949
<dependency>
5050
<groupId>ch.qos.logback</groupId>
5151
<artifactId>logback-classic</artifactId>
52-
<version>${logback-version}</version>
5352
<scope>provided</scope>
5453
</dependency>
5554
<dependency>
5655
<groupId>ch.qos.logback</groupId>
5756
<artifactId>logback-core</artifactId>
58-
<version>${logback-version}</version>
5957
<scope>provided</scope>
6058
</dependency>
6159
<dependency>

‎pom.xml‎

Lines changed: 114 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -82,19 +82,19 @@
8282
<artifactId>maven-enforcer-plugin</artifactId>
8383
<version>${enforcer-plugin-version}</version>
8484
<executions>
85-
<execution>
86-
<id>enforce-versions</id>
87-
<goals>
88-
<goal>enforce</goal>
89-
</goals>
90-
<configuration>
91-
<rules>
92-
<DependencyConvergence/>
93-
</rules>
94-
</configuration>
95-
</execution>
85+
<execution>
86+
<id>enforce-versions</id>
87+
<goals>
88+
<goal>enforce</goal>
89+
</goals>
90+
<configuration>
91+
<rules>
92+
<DependencyConvergence/>
93+
</rules>
94+
</configuration>
95+
</execution>
9696
</executions>
97-
</plugin>
97+
</plugin>
9898
<plugin>
9999
<artifactId>maven-dependency-plugin</artifactId>
100100
<executions>
@@ -488,6 +488,107 @@
488488
<artifactId>javassist</artifactId>
489489
<version>${javassist-version}</version>
490490
</dependency>
491+
<dependency>
492+
<groupId>com.fasterxml.jackson.core</groupId>
493+
<artifactId>jackson-annotations</artifactId>
494+
<version>${jackson-version}</version>
495+
</dependency>
496+
<dependency>
497+
<groupId>com.fasterxml.jackson.core</groupId>
498+
<artifactId>jackson-databind</artifactId>
499+
<version>${jackson-version}</version>
500+
</dependency>
501+
<dependency>
502+
<groupId>com.fasterxml.jackson.dataformat</groupId>
503+
<artifactId>jackson-dataformat-yaml</artifactId>
504+
<version>${jackson-version}</version>
505+
</dependency>
506+
<dependency>
507+
<groupId>joda-time</groupId>
508+
<artifactId>joda-time</artifactId>
509+
<version>${joda-time-version}</version>
510+
</dependency>
511+
<dependency>
512+
<groupId>org.joda</groupId>
513+
<artifactId>joda-convert</artifactId>
514+
<version>${joda-version}</version>
515+
</dependency>
516+
<dependency>
517+
<groupId>ch.qos.logback</groupId>
518+
<artifactId>logback-classic</artifactId>
519+
<version>${logback-version}</version>
520+
</dependency>
521+
<dependency>
522+
<groupId>ch.qos.logback</groupId>
523+
<artifactId>logback-core</artifactId>
524+
<version>${logback-version}</version>
525+
</dependency>
526+
<dependency>
527+
<groupId>javax.validation</groupId>
528+
<artifactId>validation-api</artifactId>
529+
<version>${validation-api-version}</version>
530+
</dependency>
531+
<dependency>
532+
<groupId>org.immutables</groupId>
533+
<artifactId>value</artifactId>
534+
<version>2.4.4</version>
535+
</dependency>
536+
<dependency>
537+
<groupId>javax.ws.rs</groupId>
538+
<artifactId>jsr311-api</artifactId>
539+
<version>1.1.1</version>
540+
</dependency>
541+
<dependency>
542+
<groupId>org.glassfish.hk2.external</groupId>
543+
<artifactId>javax.inject</artifactId>
544+
<version>2.2.0</version>
545+
</dependency>
546+
<dependency>
547+
<groupId>org.hibernate</groupId>
548+
<artifactId>hibernate-validator</artifactId>
549+
<version>${hibernate-validator-version}</version>
550+
</dependency>
551+
<dependency>
552+
<groupId>org.glassfish.jersey.media</groupId>
553+
<artifactId>jersey-media-multipart</artifactId>
554+
<version>${jersey2-version}</version>
555+
</dependency>
556+
<dependency>
557+
<groupId>org.glassfish.jersey.containers</groupId>
558+
<artifactId>jersey-container-servlet-core</artifactId>
559+
<version>${jersey2-version}</version>
560+
</dependency>
561+
<dependency>
562+
<groupId>com.sun.jersey.contribs</groupId>
563+
<artifactId>jersey-multipart</artifactId>
564+
<version>${jersey-version}</version>
565+
</dependency>
566+
<dependency>
567+
<groupId>com.openpojo</groupId>
568+
<artifactId>openpojo</artifactId>
569+
<version>0.8.0</version>
570+
</dependency>
571+
<dependency>
572+
<groupId>org.powermock</groupId>
573+
<artifactId>powermock-module-testng</artifactId>
574+
<version>${powermock.version}</version>
575+
<scope>test</scope>
576+
</dependency>
577+
<dependency>
578+
<groupId>org.powermock</groupId>
579+
<artifactId>powermock-api-mockito</artifactId>
580+
<version>${powermock.version}</version>
581+
</dependency>
582+
<dependency>
583+
<groupId>org.mockito</groupId>
584+
<artifactId>mockito-core</artifactId>
585+
<version>${mockito-version}</version>
586+
</dependency>
587+
<dependency>
588+
<groupId>asm</groupId>
589+
<artifactId>asm</artifactId>
590+
<version>3.3.1</version>
591+
</dependency>
491592
</dependencies>
492593
</dependencyManagement>
493594
<properties>
@@ -519,5 +620,6 @@
519620
<commons-io-version>2.5</commons-io-version>
520621
<enforcer-plugin-version>1.4</enforcer-plugin-version>
521622
<failsafe-plugin-version>2.19.1</failsafe-plugin-version>
623+
<validation-api-version>1.1.0.Final</validation-api-version>
522624
</properties>
523625
</project>

0 commit comments

Comments
 (0)