Skip to content

Commit 47c7851

Browse files
highsourcehighsource
committed
Fixing plugin and dependency versions for #91.
1 parent 4ab0560 commit 47c7851

File tree

4 files changed

+139
-87
lines changed

4 files changed

+139
-87
lines changed

‎basic/pom.xml‎

Lines changed: 66 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -40,61 +40,73 @@
4040
<scope>test</scope>
4141
</dependency>
4242
</dependencies>
43+
<profiles>
44+
<profile>
45+
<id>only-eclipse</id>
46+
<activation>
47+
<property>
48+
<name>m2e.version</name>
49+
</property>
50+
</activation>
51+
<build>
52+
<pluginManagement>
53+
<plugins>
54+
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
55+
<plugin>
56+
<groupId>org.eclipse.m2e</groupId>
57+
<artifactId>lifecycle-mapping</artifactId>
58+
<version>1.0.0</version>
59+
<configuration>
60+
<lifecycleMappingMetadata>
61+
<pluginExecutions>
62+
<pluginExecution>
63+
<pluginExecutionFilter>
64+
<groupId>
65+
org.apache.felix
66+
</groupId>
67+
<artifactId>
68+
maven-bundle-plugin
69+
</artifactId>
70+
<versionRange>
71+
[2.3.7,)
72+
</versionRange>
73+
<goals>
74+
<goal>manifest</goal>
75+
</goals>
76+
</pluginExecutionFilter>
77+
<action>
78+
<ignore></ignore>
79+
</action>
80+
</pluginExecution>
81+
<pluginExecution>
82+
<pluginExecutionFilter>
83+
<groupId>
84+
org.jvnet.jaxb2.maven2
85+
</groupId>
86+
<artifactId>
87+
maven-jaxb2-plugin
88+
</artifactId>
89+
<versionRange>
90+
[0.8.1,)
91+
</versionRange>
92+
<goals>
93+
<goal>generate</goal>
94+
</goals>
95+
</pluginExecutionFilter>
96+
<action>
97+
<ignore></ignore>
98+
</action>
99+
</pluginExecution>
100+
</pluginExecutions>
101+
</lifecycleMappingMetadata>
102+
</configuration>
103+
</plugin>
104+
</plugins>
105+
</pluginManagement>
106+
</build>
107+
</profile>
108+
</profiles>
43109
<build>
44110
<defaultGoal>install</defaultGoal>
45-
<pluginManagement>
46-
<plugins>
47-
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
48-
<plugin>
49-
<groupId>org.eclipse.m2e</groupId>
50-
<artifactId>lifecycle-mapping</artifactId>
51-
<version>1.0.0</version>
52-
<configuration>
53-
<lifecycleMappingMetadata>
54-
<pluginExecutions>
55-
<pluginExecution>
56-
<pluginExecutionFilter>
57-
<groupId>
58-
org.apache.felix
59-
</groupId>
60-
<artifactId>
61-
maven-bundle-plugin
62-
</artifactId>
63-
<versionRange>
64-
[2.3.7,)
65-
</versionRange>
66-
<goals>
67-
<goal>manifest</goal>
68-
</goals>
69-
</pluginExecutionFilter>
70-
<action>
71-
<ignore></ignore>
72-
</action>
73-
</pluginExecution>
74-
<pluginExecution>
75-
<pluginExecutionFilter>
76-
<groupId>
77-
org.jvnet.jaxb2.maven2
78-
</groupId>
79-
<artifactId>
80-
maven-jaxb2-plugin
81-
</artifactId>
82-
<versionRange>
83-
[0.8.1,)
84-
</versionRange>
85-
<goals>
86-
<goal>generate</goal>
87-
</goals>
88-
</pluginExecutionFilter>
89-
<action>
90-
<ignore></ignore>
91-
</action>
92-
</pluginExecution>
93-
</pluginExecutions>
94-
</lifecycleMappingMetadata>
95-
</configuration>
96-
</plugin>
97-
</plugins>
98-
</pluginManagement>
99111
</build>
100112
</project>

‎pom.xml‎

Lines changed: 73 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,16 @@
9898
</profile>
9999
</profiles>
100100
<properties>
101-
<jaxb.version>2.2.11</jaxb.version>
102-
<maven-jaxb2-plugin.version>0.13.1</maven-jaxb2-plugin.version>
101+
<jaxb.version>2.3.0</jaxb.version>
102+
<activation.version>1.2.0</activation.version>
103+
<maven-jaxb2-plugin.version>0.14.0</maven-jaxb2-plugin.version>
103104
<jaxws-maven-plugin.version>2.3</jaxws-maven-plugin.version>
104105
<cxf-codegen-plugin.version>3.1.4</cxf-codegen-plugin.version>
105106
<slf4j.version>1.7.7</slf4j.version>
106107
</properties>
108+
<prerequisites>
109+
<maven>3.1</maven>
110+
</prerequisites>
107111
<dependencies>
108112
<!-- JUnit -->
109113
<dependency>
@@ -176,6 +180,11 @@
176180
<artifactId>jaxb-xjc</artifactId>
177181
<version>${jaxb.version}</version>
178182
</dependency>
183+
<dependency>
184+
<groupId>com.sun.activation</groupId>
185+
<artifactId>javax.activation</artifactId>
186+
<version>${activation.version}</version>
187+
</dependency>
179188
<!-- JUnit -->
180189
<dependency>
181190
<groupId>junit</groupId>
@@ -264,32 +273,32 @@
264273
<plugin>
265274
<groupId>org.apache.maven.plugins</groupId>
266275
<artifactId>maven-release-plugin</artifactId>
267-
<version>2.1</version>
276+
<version>2.5.3</version>
268277
<configuration>
269278
<mavenExecutorId>forked-path</mavenExecutorId>
270279
<useReleaseProfile>false</useReleaseProfile>
271280
<arguments>-Psonatype-oss-release -Psamples</arguments>
272281
</configuration>
273282
</plugin>
274283
<plugin>
275-
<inherited>true</inherited>
276284
<artifactId>maven-compiler-plugin</artifactId>
285+
<version>3.7.0</version>
277286
<configuration>
278-
<source>1.6</source>
279-
<target>1.6</target>
287+
<source>1.7</source>
288+
<target>1.7</target>
280289
</configuration>
281290
</plugin>
282291
<plugin>
283292
<artifactId>maven-antrun-plugin</artifactId>
284-
<inherited>true</inherited>
293+
<version>1.8</version>
285294
<dependencies>
286-
<dependency>
295+
<!--dependency>
287296
<groupId>sun.jdk</groupId>
288297
<artifactId>tools</artifactId>
289298
<version>1.5.0</version>
290299
<scope>system</scope>
291300
<systemPath>${java.home}/../lib/tools.jar</systemPath>
292-
</dependency>
301+
</dependency-->
293302
<dependency>
294303
<groupId>junit</groupId>
295304
<artifactId>junit</artifactId>
@@ -306,42 +315,90 @@
306315
<plugin>
307316
<groupId>org.apache.maven.plugins</groupId>
308317
<artifactId>maven-deploy-plugin</artifactId>
309-
<version>2.8.1</version>
318+
<version>2.8.2</version>
310319
</plugin>
311320
<plugin>
312321
<groupId>org.apache.maven.plugins</groupId>
313322
<artifactId>maven-javadoc-plugin</artifactId>
314-
<version>2.9.1</version>
323+
<version>3.0.1</version>
315324
</plugin>
316325
<plugin>
317326
<groupId>org.apache.maven.plugins</groupId>
318327
<artifactId>maven-source-plugin</artifactId>
319-
<version>2.3</version>
328+
<version>3.0.1</version>
320329
</plugin>
321330
<plugin>
322331
<groupId>org.apache.maven.plugins</groupId>
323332
<artifactId>maven-jar-plugin</artifactId>
324-
<version>2.5</version>
333+
<version>3.1.0</version>
334+
</plugin>
335+
<plugin>
336+
<groupId>org.apache.maven.plugins</groupId>
337+
<artifactId>maven-clean-plugin</artifactId>
338+
<version>3.1.0</version>
339+
</plugin>
340+
<plugin>
341+
<groupId>org.apache.maven.plugins</groupId>
342+
<artifactId>maven-install-plugin</artifactId>
343+
<version>2.5.2</version>
344+
</plugin>
345+
<plugin>
346+
<groupId>org.apache.maven.plugins</groupId>
347+
<artifactId>maven-site-plugin</artifactId>
348+
<version>3.7.1</version>
349+
</plugin>
350+
<plugin>
351+
<groupId>org.apache.maven.plugins</groupId>
352+
<artifactId>maven-resources-plugin</artifactId>
353+
<version>3.1.0</version>
354+
</plugin>
355+
<plugin>
356+
<groupId>org.apache.maven.plugins</groupId>
357+
<artifactId>maven-surefire-plugin</artifactId>
358+
<version>2.21.0</version>
359+
</plugin>
360+
<plugin>
361+
<groupId>org.apache.maven.plugins</groupId>
362+
<artifactId>maven-dependency-plugin</artifactId>
363+
<version>3.1.1</version>
364+
</plugin>
365+
<plugin>
366+
<groupId>org.apache.maven.plugins</groupId>
367+
<artifactId>maven-assembly-plugin</artifactId>
368+
<version>3.1.0</version>
325369
</plugin>
326370
<plugin>
327371
<groupId>org.apache.felix</groupId>
328372
<artifactId>maven-bundle-plugin</artifactId>
329-
<version>2.5.3</version>
373+
<version>3.5.0</version>
330374
</plugin>
331375
<plugin>
332376
<groupId>org.apache.maven.plugins</groupId>
333377
<artifactId>maven-invoker-plugin</artifactId>
334-
<version>1.9</version>
378+
<version>3.1.0</version>
335379
</plugin>
336380
<plugin>
337381
<groupId>org.owasp</groupId>
338382
<artifactId>dependency-check-maven</artifactId>
339-
<version>1.4.5</version>
383+
<version>3.2.1</version>
384+
</plugin>
385+
<plugin>
386+
<groupId>org.apache.maven.plugins</groupId>
387+
<artifactId>maven-shade-plugin</artifactId>
388+
<version>3.1.1</version>
340389
</plugin>
341390
<plugin>
342391
<groupId>org.jvnet.jaxb2.maven2</groupId>
343392
<artifactId>maven-jaxb2-plugin</artifactId>
344393
<version>${maven-jaxb2-plugin.version}</version>
394+
<executions>
395+
<execution>
396+
<id>generate</id>
397+
<goals>
398+
<goal>generate</goal>
399+
</goals>
400+
</execution>
401+
</executions>
345402
</plugin>
346403
</plugins>
347404
</pluginManagement>

‎samples/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
<plugins>
2323
<plugin>
2424
<artifactId>maven-assembly-plugin</artifactId>
25-
<version>2.6</version>
2625
<executions>
2726
<execution>
2827
<id>maven-assembly</id>

‎tests/pom.xml‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -39,22 +39,6 @@
3939
</dependencies>
4040
<build>
4141
<defaultGoal>test</defaultGoal>
42-
<pluginManagement>
43-
<plugins>
44-
<plugin>
45-
<groupId>org.jvnet.jaxb2.maven2</groupId>
46-
<artifactId>maven-jaxb2-plugin</artifactId>
47-
<executions>
48-
<execution>
49-
<id>generate</id>
50-
<goals>
51-
<goal>generate</goal>
52-
</goals>
53-
</execution>
54-
</executions>
55-
</plugin>
56-
</plugins>
57-
</pluginManagement>
5842
<plugins>
5943
<plugin>
6044
<groupId>org.apache.maven.plugins</groupId>

0 commit comments

Comments
 (0)