Skip to content

Commit 33406ca

Browse files
vojtechhabartavojtechhabarta
committed
Support build using Java 13 and 14
- solve error: "As of JDK 13, the com.sun.javadoc API is no longer supported" - generated `test-javadoc.xml` file moved to sources - only re-generate this file using `test-javadoc` Maven profile
1 parent 935e4d4 commit 33406ca

File tree

5 files changed

+3542
-49
lines changed

5 files changed

+3542
-49
lines changed

‎typescript-generator-core/pom.xml‎

Lines changed: 56 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -165,52 +165,6 @@
165165
</execution>
166166
</executions>
167167
</plugin>
168-
<plugin>
169-
<groupId>org.apache.maven.plugins</groupId>
170-
<artifactId>maven-javadoc-plugin</artifactId>
171-
<version>3.0.1</version>
172-
<executions>
173-
<execution>
174-
<id>test-xml-doclet</id>
175-
<phase>process-test-classes</phase>
176-
<goals>
177-
<goal>test-javadoc</goal>
178-
</goals>
179-
<configuration>
180-
<doclet>com.github.markusbernhardt.xmldoclet.XmlDoclet</doclet>
181-
<additionalOptions>-d ${project.build.directory} -filename test-javadoc.xml</additionalOptions>
182-
<useStandardDocletOptions>false</useStandardDocletOptions>
183-
<docletArtifacts>
184-
<docletArtifact>
185-
<groupId>com.github.markusbernhardt</groupId>
186-
<artifactId>xml-doclet</artifactId>
187-
<version>1.0.5</version>
188-
</docletArtifact>
189-
<docletArtifact>
190-
<groupId>javax.xml.bind</groupId>
191-
<artifactId>jaxb-api</artifactId>
192-
<version>${jaxb.version}</version>
193-
</docletArtifact>
194-
<docletArtifact>
195-
<groupId>com.sun.xml.bind</groupId>
196-
<artifactId>jaxb-impl</artifactId>
197-
<version>${jaxb.version}</version>
198-
</docletArtifact>
199-
<docletArtifact>
200-
<groupId>org.glassfish.jaxb</groupId>
201-
<artifactId>jaxb-runtime</artifactId>
202-
<version>${jaxb.version}</version>
203-
</docletArtifact>
204-
<docletArtifact>
205-
<groupId>javax.activation</groupId>
206-
<artifactId>javax.activation-api</artifactId>
207-
<version>${javax.activation.version}</version>
208-
</docletArtifact>
209-
</docletArtifacts>
210-
</configuration>
211-
</execution>
212-
</executions>
213-
</plugin>
214168
<plugin>
215169
<groupId>org.apache.maven.plugins</groupId>
216170
<artifactId>maven-jar-plugin</artifactId>
@@ -241,4 +195,60 @@
241195
</plugins>
242196
</build>
243197

198+
<profiles>
199+
<profile>
200+
<id>test-javadoc</id>
201+
<build>
202+
<plugins>
203+
<plugin>
204+
<groupId>org.apache.maven.plugins</groupId>
205+
<artifactId>maven-javadoc-plugin</artifactId>
206+
<version>3.0.1</version>
207+
<executions>
208+
<execution>
209+
<id>test-xml-doclet</id>
210+
<phase>process-test-classes</phase>
211+
<goals>
212+
<goal>test-javadoc</goal>
213+
</goals>
214+
<configuration>
215+
<doclet>com.github.markusbernhardt.xmldoclet.XmlDoclet</doclet>
216+
<additionalOptions>-d ${project.basedir}/src/test/javadoc -filename test-javadoc.xml</additionalOptions>
217+
<useStandardDocletOptions>false</useStandardDocletOptions>
218+
<docletArtifacts>
219+
<docletArtifact>
220+
<groupId>com.github.markusbernhardt</groupId>
221+
<artifactId>xml-doclet</artifactId>
222+
<version>1.0.5</version>
223+
</docletArtifact>
224+
<docletArtifact>
225+
<groupId>javax.xml.bind</groupId>
226+
<artifactId>jaxb-api</artifactId>
227+
<version>${jaxb.version}</version>
228+
</docletArtifact>
229+
<docletArtifact>
230+
<groupId>com.sun.xml.bind</groupId>
231+
<artifactId>jaxb-impl</artifactId>
232+
<version>${jaxb.version}</version>
233+
</docletArtifact>
234+
<docletArtifact>
235+
<groupId>org.glassfish.jaxb</groupId>
236+
<artifactId>jaxb-runtime</artifactId>
237+
<version>${jaxb.version}</version>
238+
</docletArtifact>
239+
<docletArtifact>
240+
<groupId>javax.activation</groupId>
241+
<artifactId>javax.activation-api</artifactId>
242+
<version>${javax.activation.version}</version>
243+
</docletArtifact>
244+
</docletArtifacts>
245+
</configuration>
246+
</execution>
247+
</executions>
248+
</plugin>
249+
</plugins>
250+
</build>
251+
</profile>
252+
</profiles>
253+
244254
</project>

‎typescript-generator-core/src/test/java/cz/habarta/typescript/generator/JavadocTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public class JavadocTest {
1818
@Test
1919
public void testJavadoc() {
2020
final Settings settings = TestUtils.settings();
21-
settings.javadocXmlFiles = Arrays.asList(new File("target/test-javadoc.xml"));
21+
settings.javadocXmlFiles = Arrays.asList(new File("src/test/javadoc/test-javadoc.xml"));
2222
final TypeProcessor typeProcessor = new DefaultTypeProcessor();
2323
{
2424
final Model model = new Jackson2Parser(settings, typeProcessor).parseModel(ClassWithJavadoc.class);

‎typescript-generator-core/src/test/java/cz/habarta/typescript/generator/JaxrsApplicationTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@ public void testJavadoc() {
442442
final Settings settings = TestUtils.settings();
443443
settings.outputFileType = TypeScriptFileType.implementationFile;
444444
settings.generateJaxrsApplicationInterface = true;
445-
settings.javadocXmlFiles = Arrays.asList(new File("target/test-javadoc.xml"));
445+
settings.javadocXmlFiles = Arrays.asList(new File("src/test/javadoc/test-javadoc.xml"));
446446
final String output = new TypeScriptGenerator(settings).generateTypeScript(Input.from(OrganizationApplication.class));
447447
Assert.assertTrue(output.contains("Returns person with specified ID."));
448448
}

‎typescript-generator-core/src/test/java/cz/habarta/typescript/generator/NumberEnumTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public void testNonConstAnnotationEnum() {
7575
@Test
7676
public void testJavadoc() {
7777
final Settings settings = TestUtils.settings();
78-
settings.javadocXmlFiles = Arrays.asList(new File("target/test-javadoc.xml"));
78+
settings.javadocXmlFiles = Arrays.asList(new File("src/test/javadoc/test-javadoc.xml"));
7979
final String output = new TypeScriptGenerator(settings).generateTypeScript(Input.from(SomeCode.class));
8080
Assert.assertTrue(output.contains("Documentation for SomeCode enum."));
8181
Assert.assertTrue(output.contains("Documentation for VALUE0."));

0 commit comments

Comments
 (0)