Skip to content

Commit 7d8c654

Browse files
rjeberhardrjeberhard
committed
Fix merge
1 parent 6166aeb commit 7d8c654

File tree

3 files changed

+199
-225
lines changed

3 files changed

+199
-225
lines changed

‎integration-tests/pom.xml

Lines changed: 0 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -38,34 +38,28 @@
3838
version of hamcrest -->
3939
<groupId>org.hamcrest</groupId>
4040
<artifactId>hamcrest-junit</artifactId>
41-
<version>2.0.0.0</version>
4241
<scope>test</scope>
4342
</dependency>
4443
<dependency>
4544
<groupId>junit</groupId>
4645
<artifactId>junit</artifactId>
47-
<version>${junit-version}</version>
4846
<scope>test</scope>
4947
</dependency>
5048
<dependency>
5149
<groupId>org.glassfish.jersey.core</groupId>
5250
<artifactId>jersey-client</artifactId>
53-
<version>${jersey-version}</version>
5451
</dependency>
5552
<dependency>
5653
<groupId>org.glassfish.jersey.media</groupId>
5754
<artifactId>jersey-media-json-processing</artifactId>
58-
<version>${jersey-version}</version>
5955
</dependency>
6056
<dependency>
6157
<groupId>org.glassfish.jersey.inject</groupId>
6258
<artifactId>jersey-hk2</artifactId>
63-
<version>${jersey-version}</version>
6459
</dependency>
6560
<dependency>
6661
<groupId>com.google.guava</groupId>
6762
<artifactId>guava</artifactId>
68-
<version>${guava-version}</version>
6963
</dependency>
7064
<!-- JSON processing: jackson -->
7165
<dependency>
@@ -100,17 +94,14 @@
10094
<dependency>
10195
<groupId>javax.jms</groupId>
10296
<artifactId>javax.jms-api</artifactId>
103-
<version>2.0.1</version>
10497
</dependency>
10598
<dependency>
10699
<groupId>javax.xml.bind</groupId>
107100
<artifactId>jaxb-api</artifactId>
108-
<version>2.3.1</version>
109101
</dependency>
110102
<dependency>
111103
<groupId>net.sourceforge.htmlunit</groupId>
112104
<artifactId>htmlunit</artifactId>
113-
<version>2.32</version>
114105
</dependency>
115106
</dependencies>
116107

@@ -119,105 +110,65 @@
119110
<plugin>
120111
<groupId>org.apache.maven.plugins</groupId>
121112
<artifactId>maven-enforcer-plugin</artifactId>
122-
<version>${maven-enforcer-plugin-version}</version>
123-
<executions>
124-
<execution>
125-
<id>enforce-maven</id>
126-
<goals>
127-
<goal>enforce</goal>
128-
</goals>
129-
<configuration>
130-
<rules>
131-
<requireMavenVersion>
132-
<version>${maven.version.range}</version>
133-
</requireMavenVersion>
134-
<requireJavaVersion>
135-
<version>${java.version.range}</version>
136-
</requireJavaVersion>
137-
<requirePluginVersions></requirePluginVersions>
138-
</rules>
139-
</configuration>
140-
</execution>
141-
</executions>
142113
</plugin>
143114
<plugin>
144115
<groupId>org.apache.maven.plugins</groupId>
145116
<artifactId>maven-compiler-plugin</artifactId>
146-
<version>${maven-compiler-plugin-version}</version>
147-
<configuration>
148-
<release>11</release>
149-
<compilerArgs>
150-
<arg>-Xpkginfo:always</arg>
151-
</compilerArgs>
152-
</configuration>
153117
</plugin>
154118
<plugin>
155119
<groupId>org.apache.maven.plugins</groupId>
156120
<artifactId>maven-release-plugin</artifactId>
157-
<version>${maven-release-plugin-version}</version>
158121
</plugin>
159122
<plugin>
160123
<groupId>org.apache.maven.plugins</groupId>
161124
<artifactId>maven-resources-plugin</artifactId>
162-
<version>${maven-resources-plugin-version}</version>
163125
</plugin>
164126
<plugin>
165127
<groupId>org.apache.maven.plugins</groupId>
166128
<artifactId>maven-surefire-plugin</artifactId>
167-
<version>${maven-surefire-plugin-version}</version>
168129
<configuration>
169130
<skipTests>true</skipTests>
170131
</configuration>
171132
</plugin>
172133
<plugin>
173134
<groupId>org.apache.maven.plugins</groupId>
174135
<artifactId>maven-jar-plugin</artifactId>
175-
<version>${maven-jar-plugin-version}</version>
176136
</plugin>
177137
<plugin>
178138
<groupId>org.apache.maven.plugins</groupId>
179139
<artifactId>maven-pmd-plugin</artifactId>
180-
<version>${maven-pmd-plugin-version}</version>
181140
</plugin>
182141
<plugin>
183142
<groupId>org.apache.maven.plugins</groupId>
184143
<artifactId>maven-site-plugin</artifactId>
185-
<version>${maven-site-plugin-version}</version>
186144
</plugin>
187145
<plugin>
188146
<groupId>org.apache.maven.plugins</groupId>
189147
<artifactId>maven-clean-plugin</artifactId>
190-
<version>${maven-clean-plugin-version}</version>
191148
</plugin>
192149
<plugin>
193150
<groupId>org.apache.maven.plugins</groupId>
194151
<artifactId>maven-checkstyle-plugin</artifactId>
195-
<version>${maven-checkstyle-plugin-version}</version>
196152
</plugin>
197153
<plugin>
198154
<groupId>org.apache.maven.plugins</groupId>
199155
<artifactId>maven-install-plugin</artifactId>
200-
<version>${maven-install-plugin-version}</version>
201156
</plugin>
202157
<plugin>
203158
<groupId>org.apache.maven.plugins</groupId>
204159
<artifactId>maven-deploy-plugin</artifactId>
205-
<version>${maven-deploy-plugin-version}</version>
206160
</plugin>
207161
<plugin>
208162
<groupId>com.github.spotbugs</groupId>
209163
<artifactId>spotbugs-maven-plugin</artifactId>
210-
<version>${spotbugs-maven-plugin-version}</version>
211164
</plugin>
212165
<plugin>
213166
<groupId>org.jacoco</groupId>
214167
<artifactId>jacoco-maven-plugin</artifactId>
215-
<version>${jacoco.version}</version>
216168
</plugin>
217169
<plugin>
218170
<groupId>org.codehaus.mojo</groupId>
219171
<artifactId>exec-maven-plugin</artifactId>
220-
<version>1.6.0</version>
221172
<executions>
222173
<execution>
223174
<goals>
@@ -246,7 +197,6 @@
246197
<plugin>
247198
<groupId>org.codehaus.mojo</groupId>
248199
<artifactId>build-helper-maven-plugin</artifactId>
249-
<version>3.0.0</version>
250200
<executions>
251201
<execution>
252202
<id>add-test-source</id>
@@ -280,7 +230,6 @@
280230
<plugin>
281231
<groupId>org.apache.maven.plugins</groupId>
282232
<artifactId>maven-failsafe-plugin</artifactId>
283-
<version>${maven-failsafe-plugin-version}</version>
284233
<configuration>
285234
<argLine>
286235
--illegal-access=permit

‎json-schema/pom.xml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,24 +13,10 @@
1313

1414
<build>
1515
<plugins>
16-
1716
<plugin>
1817
<groupId>org.apache.maven.plugins</groupId>
1918
<artifactId>maven-compiler-plugin</artifactId>
20-
<version>${maven-compiler-plugin-version}</version>
21-
<configuration>
22-
<release>11</release>
23-
<compilerArgs>
24-
<arg>-Xpkginfo:always</arg>
25-
</compilerArgs>
26-
</configuration>
27-
</plugin>
28-
29-
<plugin>
30-
<groupId>org.apache.maven.plugins</groupId>
31-
<artifactId>maven-checkstyle-plugin</artifactId>
3219
</plugin>
33-
3420
</plugins>
3521
</build>
3622

0 commit comments

Comments
 (0)