Skip to content
Permalink
Browse files
Fix build - broken compaction IT and javadoc
* Fix javadoc plugin configuration for JDK11 builds
* Add missing test jar for testing custom compaction strategies
* Fix class loading of compaction strategy test jar
* Update plugin versions in pom.xml
  • Loading branch information
ctubbsii committed Dec 18, 2019
1 parent b665bf4 commit 099e6863123e6de72aa5c4439c9c033bf129c494
Showing 3 changed files with 16 additions and 9 deletions.
21 pom.xml
@@ -244,6 +244,11 @@
</plugins>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.1.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
@@ -275,6 +280,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>3.1.0</version>
<configuration>
<filesets>
<fileset>
@@ -319,16 +325,17 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.1.1</version>
<configuration>
<quiet>true</quiet>
<javadocVersion>1.8.0</javadocVersion>
<additionalJOption>-J-Xmx512m</additionalJOption>
<doclint>all,-missing</doclint>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.5.3</version>
<configuration>
<arguments>-P !autoformat,thrift,sunny -Dtimeout.factor=2 ${extraReleaseArguments}</arguments>
<autoVersionSubmodules>true</autoVersionSubmodules>
@@ -344,6 +351,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M3</version>
<configuration>
<excludedGroups>${surefire.excludedGroups}</excludedGroups>
<groups>${surefire.groups}</groups>
@@ -356,6 +364,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.0.0-M3</version>
<configuration>
<excludedGroups>${failsafe.excludedGroups}</excludedGroups>
<groups>${failsafe.groups}</groups>
@@ -370,10 +379,9 @@
<version>3.0.0</version>
</plugin>
<plugin>
<!-- version 1.6.0 is broken; see https://github.com/mojohaus/exec-maven-plugin/issues/75 -->
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.5.0</version>
<version>1.6.0</version>
</plugin>
<plugin>
<groupId>net.revelc.code</groupId>
@@ -383,7 +391,7 @@
<plugin>
<groupId>net.revelc.code.formatter</groupId>
<artifactId>formatter-maven-plugin</artifactId>
<version>2.10.0</version>
<version>2.11.0</version>
<configuration>
<configFile>${eclipseFormatterStyle}</configFile>
<compilerCompliance>${maven.compiler.source}</compilerCompliance>
@@ -405,6 +413,7 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<version>0.13</version>
<configuration>
<excludes>
<exclude>src/main/resources/META-INF/services/*</exclude>
@@ -414,7 +423,7 @@
<plugin>
<groupId>net.revelc.code</groupId>
<artifactId>impsort-maven-plugin</artifactId>
<version>1.3.0</version>
<version>1.3.2</version>
<configuration>
<removeUnused>true</removeUnused>
<groups>java.,javax.,org.,com.</groups>
@@ -692,10 +701,8 @@
<build>
<plugins>
<plugin>
<!-- version 1.6.0 is broken; see https://github.com/mojohaus/exec-maven-plugin/issues/75 -->
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.5.0</version>
<executions>
<execution>
<id>generate-thrift</id>
@@ -2730,8 +2730,8 @@ public void testCompactionStrategy() throws Exception {
File jarDir = new File(System.getProperty("user.dir"), "target");
assertTrue(jarDir.mkdirs() || jarDir.isDirectory());
File jarFile = new File(jarDir, "TestCompactionStrat.jar");
FileUtils.copyInputStreamToFile(Class.class.getResourceAsStream("/TestCompactionStrat.jar"),
jarFile);
FileUtils.copyInputStreamToFile(
SimpleProxyBase.class.getResourceAsStream("/TestCompactionStrat.jar"), jarFile);
client.setProperty(creds, Property.VFS_CONTEXT_CLASSPATH_PROPERTY.getKey() + "context1",
jarFile.toString());
client.setTableProperty(creds, tableName, Property.TABLE_CLASSPATH.getKey(), "context1");
Binary file not shown.

0 comments on commit 099e686

Please sign in to comment.