Skip to content

Commit 2332ab3

Browse files
seth-mgseth-mg
committed
WS-2537: Fix Javadoc generation. Remove Travis file. A few upgrades.
1 parent c71d228 commit 2332ab3

File tree

3 files changed

+42
-46
lines changed

3 files changed

+42
-46
lines changed

‎.travis.yml‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎model/pom.xml‎

Lines changed: 21 additions & 4 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 2017-2022 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.
@@ -24,6 +24,9 @@
2424
<artifactId>rosette-api-model</artifactId>
2525
<name>rosette-api-model</name>
2626
<description>Rosette API data models</description>
27+
<properties>
28+
<delombok.output.directory>${project.build.directory}/delombok</delombok.output.directory>
29+
</properties>
2730
<dependencies>
2831
<dependency>
2932
<groupId>com.basistech.rosette</groupId>
@@ -100,16 +103,30 @@
100103
<configuration>
101104
<addOutputDirectory>false</addOutputDirectory>
102105
<sourceDirectory>src/main/java</sourceDirectory>
103-
<outputDirectory>
104-
${project.build.directory}/delombok
105-
</outputDirectory>
106+
<outputDirectory>${delombok.output.directory}</outputDirectory>
106107
<formatPreferences>
107108
<javaLangAsFQN>skip</javaLangAsFQN>
108109
</formatPreferences>
109110
</configuration>
110111
</execution>
111112
</executions>
112113
</plugin>
114+
<plugin>
115+
<groupId>org.apache.maven.plugins</groupId>
116+
<artifactId>maven-javadoc-plugin</artifactId>
117+
<version>${maven-javadoc-plugin.version}</version>
118+
<executions>
119+
<execution>
120+
<id>attach-javadocs</id>
121+
<goals>
122+
<goal>jar</goal>
123+
</goals>
124+
</execution>
125+
</executions>
126+
<configuration>
127+
<sourcepath>${delombok.output.directory}</sourcepath>
128+
</configuration>
129+
</plugin>
113130
</plugins>
114131
</build>
115132
</project>

‎pom.xml‎

Lines changed: 21 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright 2018 Basis Technology Corp.
3+
Copyright 2018-2022 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,19 +42,15 @@
4242
</distributionManagement>
4343
<properties>
4444
<bnd-maven-plugin.version>6.2.0</bnd-maven-plugin.version>
45-
<build-helper-maven-plugin.version>3.0.0</build-helper-maven-plugin.version>
45+
<build-helper-maven-plugin.version>3.3.0</build-helper-maven-plugin.version>
4646
<http-components-version>4.5.13</http-components-version>
4747
<http-components-core-version>4.4.15</http-components-core-version>
48-
<maven-clean-plugin.version>3.0.0</maven-clean-plugin.version>
49-
<maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
50-
<!-- There appears to be a regression between 3.0.0-M1 and 3.0.0 that causes
51-
exclusions to fail. And javadoc does not like the generated annotations
52-
source in the models sub-module. And none of these versions work with
53-
JDK 1.7. Hence the exclusion in Travis. -->
54-
<maven-javadoc-plugin.version>3.4.0</maven-javadoc-plugin.version>
55-
<maven-source-plugin.version>2.4</maven-source-plugin.version>
56-
<mockserver-version>4.1.0</mockserver-version>
57-
<nexus-staging-plugin-version>1.6.13</nexus-staging-plugin-version>
48+
<maven-clean-plugin.version>3.2.0</maven-clean-plugin.version>
49+
<maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
50+
<maven-javadoc-plugin.version>3.4.1</maven-javadoc-plugin.version>
51+
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
52+
<mockserver-version>4.1.0</mockserver-version>
53+
<nexus-staging-plugin-version>1.6.13</nexus-staging-plugin-version>
5854
<site-skin-version>1.5</site-skin-version>
5955
<bt-adm-version>2.7.2</bt-adm-version>
6056
</properties>
@@ -129,25 +125,6 @@
129125
</execution>
130126
</executions>
131127
</plugin>
132-
<plugin>
133-
<groupId>org.apache.maven.plugins</groupId>
134-
<artifactId>maven-javadoc-plugin</artifactId>
135-
<version>${maven-javadoc-plugin.version}</version>
136-
<executions>
137-
<execution>
138-
<id>attach-javadocs</id>
139-
<goals>
140-
<goal>jar</goal>
141-
</goals>
142-
</execution>
143-
</executions>
144-
<configuration>
145-
<sourcepath>target/generated-sources/delombok</sourcepath>
146-
<sourceFileExcludes>
147-
<exclude>**/target/generated-sources/annotations/com/basistech/rosette/apimodel/**</exclude>
148-
</sourceFileExcludes>
149-
</configuration>
150-
</plugin>
151128
<plugin>
152129
<groupId>org.apache.maven.plugins</groupId>
153130
<artifactId>maven-source-plugin</artifactId>
@@ -198,6 +175,19 @@
198175
</plugins>
199176
<pluginManagement>
200177
<plugins>
178+
<plugin>
179+
<groupId>org.apache.maven.plugins</groupId>
180+
<artifactId>maven-javadoc-plugin</artifactId>
181+
<version>${maven-javadoc-plugin.version}</version>
182+
<executions>
183+
<execution>
184+
<id>attach-javadocs</id>
185+
<goals>
186+
<goal>jar</goal>
187+
</goals>
188+
</execution>
189+
</executions>
190+
</plugin>
201191
<plugin>
202192
<groupId>biz.aQute.bnd</groupId>
203193
<artifactId>bnd-maven-plugin</artifactId>

0 commit comments

Comments
 (0)