Skip to content

Commit b5b48de

Browse files
seth-mgLi Xu
seth-mg
authored and
Li Xu
committed
Consolidate some plugin versions, cleanup after mockserver, combine j… (#119)
* Consolidate some plugin versions, cleanup after mockserver, combine javadoc calls. * Fix Javadoc for oss and gh-pages. * Remove javadoc aggregation from travis. * Disable Javadoc generation in Travis due to source exclusion bug.
1 parent 441b338 commit b5b48de

File tree

5 files changed

+77
-57
lines changed

5 files changed

+77
-57
lines changed

‎.travis.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
language: java
2-
script: mvn clean verify javadoc:aggregate
2+
# Javadoc exclusions don't work with JDK 1.7.
3+
script: mvn -Dmaven.javadoc.skip=true clean verify
34
jdk:
45
- oraclejdk8
56
- openjdk7

‎annotations/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
<plugin>
5858
<groupId>org.apache.maven.plugins</groupId>
5959
<artifactId>maven-compiler-plugin</artifactId>
60+
<version>${maven-compiler-plugin.version}</version>
6061
<configuration>
6162
<compilerArgument>-proc:none</compilerArgument>
6263
</configuration>

‎api/pom.xml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright 2017 Basis Technology Corp.
3+
Copyright 2018 Basis Technology Corp.
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.
@@ -25,9 +25,7 @@
2525
<name>rosette-api</name>
2626
<description>Rosette API Communications</description>
2727
<properties>
28-
<mockserver-version>3.10.2</mockserver-version>
2928
<skip-mockserver>false</skip-mockserver>
30-
<http-components-version>4.5.2</http-components-version>
3129
</properties>
3230
<dependencies>
3331
<dependency>
@@ -118,7 +116,7 @@
118116
<plugin>
119117
<groupId>org.codehaus.mojo</groupId>
120118
<artifactId>build-helper-maven-plugin</artifactId>
121-
<version>3.0.0</version>
119+
<version>${build-helper-maven-plugin.version}</version>
122120
<executions>
123121
<execution>
124122
<id>reserve-network-port</id>
@@ -164,7 +162,7 @@
164162
<groupId>org.apache.maven.plugins</groupId>
165163
<artifactId>maven-surefire-plugin</artifactId>
166164
<configuration>
167-
<argLine>-Xmx1024m -XX:MaxPermSize=256m</argLine>
165+
<argLine>-Xmx1024m</argLine>
168166
</configuration>
169167
</plugin>
170168
</plugins>

‎json/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright 2017 Basis Technology Corp.
3+
Copyright 2018 Basis Technology Corp.
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.
@@ -81,7 +81,7 @@
8181
<plugin>
8282
<groupId>org.codehaus.mojo</groupId>
8383
<artifactId>build-helper-maven-plugin</artifactId>
84-
<version>3.0.0</version>
84+
<version>${build-helper-maven-plugin.version}</version>
8585
<executions>
8686
<execution>
8787
<id>add-source</id>

‎pom.xml‎

Lines changed: 69 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright 2017 Basis Technology Corp.
3+
Copyright 2018 Basis Technology Corp.
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.
@@ -42,7 +42,17 @@
4242
</distributionManagement>
4343
<properties>
4444
<bnd-maven-plugin.version>3.2.0</bnd-maven-plugin.version>
45-
<maven-javadoc-plugin.version>3.0.0</maven-javadoc-plugin.version>
45+
<build-helper-maven-plugin.version>3.0.0</build-helper-maven-plugin.version>
46+
<http-components-version>4.5.2</http-components-version>
47+
<maven-clean-plugin.version>3.0.0</maven-clean-plugin.version>
48+
<maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
49+
<!-- There appears to be a regression between 3.0.0-M1 and 3.0.0 that causes
50+
exclusions to fail. And javadoc does not like the generated annotations
51+
source in the models sub-module. And none of these versions work with
52+
JDK 1.7. Hence the exclusion in Travis. -->
53+
<maven-javadoc-plugin.version>3.0.0-M1</maven-javadoc-plugin.version>
54+
<maven-source-plugin.version>2.4</maven-source-plugin.version>
55+
<mockserver-version>3.10.2</mockserver-version>
4656
<site-skin-version>1.5</site-skin-version>
4757
</properties>
4858
<modules>
@@ -75,10 +85,26 @@
7585
</dependencyManagement>
7686
<build>
7787
<plugins>
88+
<plugin>
89+
<groupId>org.apache.maven.plugins</groupId>
90+
<artifactId>maven-clean-plugin</artifactId>
91+
<version>${maven-clean-plugin.version}</version>
92+
<configuration>
93+
<filesets>
94+
<fileset>
95+
<directory>${project.basedir}</directory>
96+
<includes>
97+
<include>**/mockserver.log</include>
98+
</includes>
99+
</fileset>
100+
</filesets>
101+
<followSymlinks>false</followSymlinks>
102+
</configuration>
103+
</plugin>
78104
<plugin>
79105
<groupId>org.apache.maven.plugins</groupId>
80106
<artifactId>maven-compiler-plugin</artifactId>
81-
<version>3.7.0</version>
107+
<version>${maven-compiler-plugin.version}</version>
82108
<configuration>
83109
<compilerVersion>1.7</compilerVersion>
84110
<source>1.7</source>
@@ -102,28 +128,25 @@
102128
<plugin>
103129
<groupId>org.apache.maven.plugins</groupId>
104130
<artifactId>maven-javadoc-plugin</artifactId>
105-
<version>2.10.3</version>
131+
<version>${maven-javadoc-plugin.version}</version>
106132
<executions>
107133
<execution>
108-
<id>aggregate</id>
109-
<goals>
110-
<goal>aggregate</goal>
111-
</goals>
112-
<phase>site</phase>
113-
</execution>
114-
<execution>
115-
<id>plain</id>
134+
<id>attach-javadocs</id>
116135
<goals>
117136
<goal>jar</goal>
118137
</goals>
119-
<phase>package</phase>
120138
</execution>
121139
</executions>
140+
<configuration>
141+
<sourceFileExcludes>
142+
<exclude>**/target/generated-sources/annotations/com/basistech/rosette/apimodel/**</exclude>
143+
</sourceFileExcludes>
144+
</configuration>
122145
</plugin>
123146
<plugin>
124147
<groupId>org.apache.maven.plugins</groupId>
125148
<artifactId>maven-source-plugin</artifactId>
126-
<version>2.4</version>
149+
<version>${maven-source-plugin.version}</version>
127150
<executions>
128151
<execution>
129152
<id>attach-sources</id>
@@ -151,7 +174,7 @@
151174
<plugin>
152175
<groupId>org.codehaus.mojo</groupId>
153176
<artifactId>build-helper-maven-plugin</artifactId>
154-
<version>3.0.0</version>
177+
<version>${build-helper-maven-plugin.version}</version>
155178
<executions>
156179
<execution>
157180
<id>add-source</id>
@@ -167,17 +190,6 @@
167190
</execution>
168191
</executions>
169192
</plugin>
170-
<plugin>
171-
<groupId>org.apache.maven.plugins</groupId>
172-
<artifactId>maven-javadoc-plugin</artifactId>
173-
<configuration>
174-
<!-- is there a better way? builder-helper has add-source but no remove-source -->
175-
<sourcepath>model/target/generated-sources/delombok;
176-
json/src/main/java;
177-
common/src/main/java;
178-
api/src/main/java</sourcepath>
179-
</configuration>
180-
</plugin>
181193
</plugins>
182194
<pluginManagement>
183195
<plugins>
@@ -196,27 +208,35 @@
196208
</plugins>
197209
</pluginManagement>
198210
</build>
199-
<reporting>
200-
<plugins>
201-
<plugin>
202-
<groupId>org.apache.maven.plugins</groupId>
203-
<artifactId>maven-javadoc-plugin</artifactId>
204-
<version>2.10.3</version>
205-
<reportSets>
206-
<reportSet>
207-
<id>non-aggregate</id>
208-
<reports>
209-
<report>javadoc</report>
210-
</reports>
211-
</reportSet>
212-
<reportSet>
213-
<id>aggregate</id>
214-
<reports>
215-
<report>aggregate</report>
216-
</reports>
217-
</reportSet>
218-
</reportSets>
219-
</plugin>
220-
</plugins>
221-
</reporting>
211+
<profiles>
212+
<profile>
213+
<id>aggregate-javadoc</id>
214+
<build>
215+
<pluginManagement>
216+
<plugins>
217+
<plugin>
218+
<groupId>org.apache.maven.plugins</groupId>
219+
<artifactId>maven-javadoc-plugin</artifactId>
220+
<version>${maven-javadoc-plugin.version}</version>
221+
<executions>
222+
<execution>
223+
<id>gh-pages</id>
224+
<goals>
225+
<goal>aggregate-jar</goal>
226+
</goals>
227+
</execution>
228+
</executions>
229+
<configuration>
230+
<!-- is there a better way? builder-helper has add-source but no remove-source -->
231+
<sourcepath>model/target/generated-sources/delombok;
232+
json/src/main/java;
233+
common/src/main/java;
234+
api/src/main/java</sourcepath>
235+
</configuration>
236+
</plugin>
237+
</plugins>
238+
</pluginManagement>
239+
</build>
240+
</profile>
241+
</profiles>
222242
</project>

0 commit comments

Comments
 (0)