Skip to content

Commit 945a082

Browse files
author
adriancole
committed
fixes javadoc
1 parent 182a582 commit 945a082

File tree

1 file changed

+49
-41
lines changed

1 file changed

+49
-41
lines changed

pom.xml

Lines changed: 49 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
<junit.version>4.13.1</junit.version>
5555
<scalatest.version>3.0.9</scalatest.version>
5656

57+
<genjavadoc-plugin.version>0.16</genjavadoc-plugin.version>
5758
<go-offline-maven-plugin.version>1.2.7</go-offline-maven-plugin.version>
5859
<!-- TODO: cleanup any redundant ignores now also in the 4.0 release (once final) -->
5960
<license-maven-plugin.version>4.0.rc2</license-maven-plugin.version>
@@ -193,6 +194,8 @@
193194
</dependencies>
194195

195196
<build>
197+
<sourceDirectory>${project.basedir}/src/main/scala</sourceDirectory>
198+
<testSourceDirectory>${project.basedir}/src/test/scala</testSourceDirectory>
196199
<pluginManagement>
197200
<plugins>
198201
<!-- mvn -N io.takari:maven:wrapper generates the ./mvnw script -->
@@ -220,6 +223,12 @@
220223
<type>signature</type>
221224
<repositoryType>MAIN</repositoryType>
222225
</DynamicDependency>
226+
<DynamicDependency>
227+
<groupId>com.typesafe.genjavadoc</groupId>
228+
<artifactId>genjavadoc-plugin_${scala-library.version}</artifactId>
229+
<version>${genjavadoc-plugin.version}</version>
230+
<repositoryType>MAIN</repositoryType>
231+
</DynamicDependency>
223232
<DynamicDependency>
224233
<groupId>com.mycila</groupId>
225234
<artifactId>license-maven-plugin-git</artifactId>
@@ -349,32 +358,6 @@
349358
</executions>
350359
</plugin>
351360

352-
<plugin>
353-
<artifactId>maven-invoker-plugin</artifactId>
354-
<version>3.2.1</version>
355-
<configuration>
356-
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
357-
<settingsFile>${main.basedir}/src/it/settings.xml</settingsFile>
358-
<profiles>
359-
<profile>!release</profile>
360-
</profiles>
361-
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
362-
<postBuildHookScript>verify</postBuildHookScript>
363-
<addTestClassPath>true</addTestClassPath>
364-
<skipInvocation>${skipTests}</skipInvocation>
365-
<streamLogs>true</streamLogs>
366-
<mavenOpts>-Dorg.slf4j.simpleLogger.defaultLogLevel=WARN</mavenOpts>
367-
</configuration>
368-
<executions>
369-
<execution>
370-
<goals>
371-
<goal>install</goal>
372-
<goal>run</goal>
373-
</goals>
374-
</execution>
375-
</executions>
376-
</plugin>
377-
378361
<plugin>
379362
<groupId>com.mycila</groupId>
380363
<artifactId>license-maven-plugin</artifactId>
@@ -486,37 +469,62 @@
486469
</executions>
487470
</plugin>
488471

472+
<!-- Creates source jar -->
489473
<plugin>
490-
<artifactId>maven-enforcer-plugin</artifactId>
474+
<artifactId>maven-source-plugin</artifactId>
475+
<version>3.2.1</version>
491476
<executions>
492477
<execution>
493-
<id>enforce-java</id>
478+
<id>attach-sources</id>
494479
<goals>
495-
<goal>enforce</goal>
480+
<goal>jar</goal>
481+
</goals>
482+
</execution>
483+
</executions>
484+
</plugin>
485+
486+
<plugin>
487+
<groupId>org.scala-tools</groupId>
488+
<artifactId>maven-scala-plugin</artifactId>
489+
<version>2.15.2</version>
490+
<executions>
491+
<execution>
492+
<id>scala-compile-first</id>
493+
<phase>prepare-package</phase>
494+
<goals>
495+
<goal>compile</goal>
496496
</goals>
497497
<configuration>
498-
<rules>
499-
<!-- JDK 12+ can no longer generate Java 1.6 bytecode, so we require JDK 11.
500-
https://www.oracle.com/java/technologies/javase/12-relnote-issues.html -->
501-
<requireJavaVersion>
502-
<version>[11,12)</version>
503-
</requireJavaVersion>
504-
</rules>
498+
<args>
499+
<arg>-P:genjavadoc:out=${project.build.directory}/genjavadoc</arg>
500+
</args>
501+
<compilerPlugins>
502+
<compilerPlugin>
503+
<groupId>com.typesafe.genjavadoc</groupId>
504+
<artifactId>genjavadoc-plugin_${scala-library.version}</artifactId>
505+
<version>${genjavadoc-plugin.version}</version>
506+
</compilerPlugin>
507+
</compilerPlugins>
505508
</configuration>
506509
</execution>
507510
</executions>
508511
</plugin>
509512

510-
<!-- Creates source jar -->
511513
<plugin>
512-
<artifactId>maven-source-plugin</artifactId>
513-
<version>3.2.1</version>
514+
<groupId>org.codehaus.mojo</groupId>
515+
<artifactId>build-helper-maven-plugin</artifactId>
516+
<version>3.2.0</version>
514517
<executions>
515518
<execution>
516-
<id>attach-sources</id>
519+
<phase>package</phase>
517520
<goals>
518-
<goal>jar</goal>
521+
<goal>add-source</goal>
519522
</goals>
523+
<configuration>
524+
<sources>
525+
<source>${project.build.directory}/genjavadoc</source>
526+
</sources>
527+
</configuration>
520528
</execution>
521529
</executions>
522530
</plugin>

0 commit comments

Comments
 (0)