Skip to content

Commit

Permalink
JAVA-2067: Publish javadocs JAR for the shaded module
Browse files Browse the repository at this point in the history
  • Loading branch information
olim7t committed Jan 18, 2019
1 parent 71efaaf commit 8ef41a9
Show file tree
Hide file tree
Showing 3 changed files with 50 additions and 19 deletions.
1 change: 1 addition & 0 deletions changelog/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

### 4.0.0-rc1 (in progress)

- [improvement] JAVA-2067: Publish javadocs JAR for the shaded module
- [improvement] JAVA-2103: Expose partitioner name in TokenMap API
- [documentation] JAVA-2075: Document preference for LZ4 over Snappy

Expand Down
65 changes: 49 additions & 16 deletions core-shaded/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -140,22 +140,6 @@
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>3.0.2</version>
<executions>
<execution>
<id>empty-javadoc-jar</id>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<classifier>javadoc</classifier>
<classesDirectory>${basedir}/src/main/javadoc</classesDirectory>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
Expand Down Expand Up @@ -185,6 +169,55 @@
</excludes>
</configuration>
</execution>
<!-- Unpack shaded sources in order to run javadoc on them: -->
<execution>
<id>unpack-shaded-sources</id>
<phase>package</phase>
<goals>
<goal>unpack</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>com.datastax.oss</groupId>
<artifactId>java-driver-core-shaded</artifactId>
<version>${project.version}</version>
<type>jar</type>
<classifier>sources</classifier>
<outputDirectory>${project.build.directory}/shaded-sources</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
<id>attach-shaded-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<sourcepath>${project.build.directory}/shaded-sources</sourcepath>
<excludePackageNames>
com.datastax.oss.driver.internal:com.datastax.oss.driver.shaded
</excludePackageNames>
<!--
javadoc processes the shaded Netty sources (even though they're not included in the
report), and will complain if it doesn't find JCTools classes.
Add the dependency just to avoid warnings:
-->
<additionalDependencies>
<additionalDependency>
<groupId>org.jctools</groupId>
<artifactId>jctools-core</artifactId>
<version>2.1.2</version>
</additionalDependency>
</additionalDependencies>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
Expand Down
3 changes: 0 additions & 3 deletions core-shaded/src/main/javadoc/README.txt

This file was deleted.

0 comments on commit 8ef41a9

Please sign in to comment.