DBZ-1402 Support for JDK 11

2019-09-23 13:01:44 -04:00 · 2019-09-23 13:01:44 -04:00 · a0f7f6ec6b
commit a0f7f6ec6b
parent bf25aeb1de
14 changed files with 113 additions and 38 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -19,7 +19,7 @@ sudo: required
 dist: trusty

 jdk:
-  - oraclejdk8
+  - oraclejdk11

 services:
  - docker
--- a/debezium-connector-mongodb/pom.xml
+++ b/debezium-connector-mongodb/pom.xml
@ -246,6 +246,7 @@
                    <plugin>
                        <groupId>org.apache.maven.plugins</groupId>
                        <artifactId>maven-assembly-plugin</artifactId>
+                        <version>${version.assembly.plugin}</version>
                        <dependencies>
                            <dependency>
                                <groupId>io.debezium</groupId>
--- a/debezium-connector-mysql/pom.xml
+++ b/debezium-connector-mysql/pom.xml
@ -349,6 +349,11 @@
                    </execution>
                </executions>
            </plugin>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-assembly-plugin</artifactId>
+              <version>${version.assembly.plugin}</version>
+            </plugin>
        </plugins>
        <resources>
            <!-- Apply the properties set in the POM to the resource files -->
@ -433,6 +438,7 @@
                    <plugin>
                        <groupId>org.apache.maven.plugins</groupId>
                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <version>${version.failsafe.plugin}</version>
                        <configuration>
                            <skipTests>${skipITs}</skipTests>
                            <enableAssertions>true</enableAssertions>
--- a/debezium-connector-postgres/pom.xml
+++ b/debezium-connector-postgres/pom.xml
@ -266,6 +266,7 @@
                    <plugin>
                        <groupId>org.apache.maven.plugins</groupId>
                        <artifactId>maven-assembly-plugin</artifactId>
+                        <version>${version.assembly.plugin}</version>
                        <dependencies>
                            <dependency>
                                <groupId>io.debezium</groupId>
--- a/debezium-connector-sqlserver/pom.xml
+++ b/debezium-connector-sqlserver/pom.xml
@ -225,6 +225,7 @@
                    <plugin>
                        <groupId>org.apache.maven.plugins</groupId>
                        <artifactId>maven-assembly-plugin</artifactId>
+                        <version>${version.assembly.plugin}</version>
                        <dependencies>
                            <dependency>
                                <groupId>io.debezium</groupId>
--- a/debezium-core/src/main/java/io/debezium/config/Instantiator.java
+++ b/debezium-core/src/main/java/io/debezium/config/Instantiator.java
@ -30,7 +30,7 @@ static <T> T getInstance(String className, Supplier<ClassLoader> classloaderSupp
                    : Configuration.class.getClassLoader();
            try {
                Class<? extends T> clazz = (Class<? extends T>) classloader.loadClass(className);
-                return configuration == null ? clazz.newInstance()
+                return configuration == null ? clazz.getDeclaredConstructor().newInstance()
                        : clazz.getConstructor(Configuration.class).newInstance(configuration);
            }
            catch (ClassNotFoundException e) {
--- a/debezium-core/src/main/java/io/debezium/jdbc/JdbcConnection.java
+++ b/debezium-core/src/main/java/io/debezium/jdbc/JdbcConnection.java
@ -5,6 +5,7 @@
 */
 package io.debezium.jdbc;

+import java.lang.reflect.InvocationTargetException;
 import java.sql.CallableStatement;
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
@ -176,10 +177,10 @@ public static ConnectionFactory patternBasedFactory(String urlPattern, String dr
                    driverClassLoader = JdbcConnection.class.getClassLoader();
                }
                Class<java.sql.Driver> driverClazz = (Class<java.sql.Driver>) Class.forName(driverClassName, true, driverClassLoader);
-                java.sql.Driver driver = driverClazz.newInstance();
+                java.sql.Driver driver = driverClazz.getDeclaredConstructor().newInstance();
                conn = driver.connect(url, props);
            }
-            catch (ClassNotFoundException | IllegalAccessException | InstantiationException e) {
+            catch (ClassNotFoundException | IllegalAccessException | InstantiationException | NoSuchMethodException | InvocationTargetException e) {
                throw new SQLException(e);
            }
            LOGGER.debug("Connected to {} with {}", url, props);
--- a/debezium-core/src/main/java/io/debezium/relational/mapping/ColumnMappers.java
+++ b/debezium-core/src/main/java/io/debezium/relational/mapping/ColumnMappers.java
@ -275,7 +275,7 @@ protected boolean matches(ColumnId id) {

    protected static ColumnMapper instantiateMapper(Class<ColumnMapper> clazz, Configuration config) {
        try {
-            ColumnMapper mapper = clazz.newInstance();
+            ColumnMapper mapper = clazz.getDeclaredConstructor().newInstance();
            if (config != null) {
                mapper.initialize(config);
            }
--- a/debezium-core/src/test/java/io/debezium/junit/ConditionalFail.java
+++ b/debezium-core/src/test/java/io/debezium/junit/ConditionalFail.java
@ -5,6 +5,7 @@
 */
 package io.debezium.junit;

+import java.lang.reflect.InvocationTargetException;
 import java.util.function.Supplier;

 import org.junit.Assert;
@ -27,7 +28,7 @@ public Statement apply(final Statement base, final Description description) {
            return base;
        }
        try {
-            Supplier<Boolean> condition = conditionClass.value().newInstance();
+            Supplier<Boolean> condition = conditionClass.value().getDeclaredConstructor().newInstance();
            return new Statement() {
                @Override
                public void evaluate() throws Throwable {
@ -50,7 +51,7 @@ else if (failure != null) {
                }
            };
        }
-        catch (final InstantiationException | IllegalAccessException e) {
+        catch (final InstantiationException | IllegalAccessException | NoSuchMethodException | InvocationTargetException e) {
            throw new IllegalStateException(e);
        }
    }
--- a/debezium-ddl-parser/pom.xml
+++ b/debezium-ddl-parser/pom.xml
@ -78,7 +78,7 @@
                <!-- https://github.com/antlr/antlr4test-maven-plugin -->
                <groupId>com.khubla.antlr</groupId>
                <artifactId>antlr4test-maven-plugin</artifactId>
-                <version>1.10</version>
+                <version>1.11</version>
                <configuration>
                    <verbose>false</verbose>
                    <showTree>false</showTree>
--- a/debezium-embedded/src/main/java/io/debezium/embedded/EmbeddedEngine.java
+++ b/debezium-embedded/src/main/java/io/debezium/embedded/EmbeddedEngine.java
@ -707,7 +707,7 @@ public void run() {
                try {
                    @SuppressWarnings("unchecked")
                    Class<? extends SourceConnector> connectorClass = (Class<SourceConnector>) classLoader.loadClass(connectorClassName);
-                    connector = connectorClass.newInstance();
+                    connector = connectorClass.getDeclaredConstructor().newInstance();
                }
                catch (Throwable t) {
                    fail("Unable to instantiate connector class '" + connectorClassName + "'", t);
@ -720,7 +720,7 @@ public void run() {
                try {
                    @SuppressWarnings("unchecked")
                    Class<? extends OffsetBackingStore> offsetStoreClass = (Class<OffsetBackingStore>) classLoader.loadClass(offsetStoreClassName);
-                    offsetStore = offsetStoreClass.newInstance();
+                    offsetStore = offsetStoreClass.getDeclaredConstructor().newInstance();
                }
                catch (Throwable t) {
                    fail("Unable to instantiate OffsetBackingStore class '" + offsetStoreClassName + "'", t);
@ -771,7 +771,7 @@ public void raiseError(Exception e) {
                    Class<? extends Task> taskClass = connector.taskClass();
                    task = null;
                    try {
-                        task = (SourceTask) taskClass.newInstance();
+                        task = (SourceTask) taskClass.getDeclaredConstructor().newInstance();
                    }
                    catch (IllegalAccessException | InstantiationException t) {
                        fail("Unable to instantiate connector's task class '" + taskClass.getName() + "'", t);
--- a/debezium-embedded/src/test/java/io/debezium/embedded/ConnectorOutputTest.java
+++ b/debezium-embedded/src/test/java/io/debezium/embedded/ConnectorOutputTest.java
@ -622,7 +622,19 @@ protected TestSpecification usingSpec(String name) {
     * @return the test specification; never null
     */
    protected TestSpecification usingSpec(String name, String directory) {
-        return usingSpec(name, Paths.get(directory));
+        String version = System.getProperty("java.version");
+        String modulePath = "";
+        /**
+         * Java 11 seems to have issues finding the file when tests are invoked from the root directory. However, running
+         * the tests directory from the module directory work, so we only need to mess with the path when we are invoking
+         * the tests from the root.
+         */
+        if (!version.startsWith("1.")) {
+            if (!Paths.get(directory).toAbsolutePath().toString().contains("debezium-embedded")) {
+                modulePath = "debezium-embedded/";
+            }
+        }
+        return usingSpec(name, Paths.get(modulePath + directory));
    }

    /**
--- a/pom.xml
+++ b/pom.xml
@ -53,17 +53,18 @@
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <maven.compiler.source>1.8</maven.compiler.source>
        <maven.compiler.target>1.8</maven.compiler.target>
+        <release>8</release>

        <!-- Kafka and it's dependencies MUST reflect what the Kafka version uses -->
        <version.kafka>2.3.1</version.kafka>
        <version.kafka.scala>2.12</version.kafka.scala>
-        <version.curator>2.11.0</version.curator>
+        <version.curator>4.2.0</version.curator>
        <version.zookeeper>3.4.14</version.zookeeper>
        <version.jackson>2.10.0</version.jackson>
        <version.org.slf4j>1.7.26</version.org.slf4j>
        <version.log4j>1.2.17</version.log4j>
        <!-- check new release version at https://github.com/confluentinc/schema-registry/releases -->
-        <version.confluent.platform>5.1.2</version.confluent.platform>
+        <version.confluent.platform>5.3.1</version.confluent.platform>

        <!-- Databases -->
        <version.postgresql.driver>42.2.8</version.postgresql.driver>
@ -78,28 +79,35 @@
        <version.com.google.protobuf>3.8.0</version.com.google.protobuf>

        <!-- ANTLR -->
-        <antlr.version>4.7</antlr.version>
+        <antlr.version>4.7.2</antlr.version>

        <!-- Testing -->
        <version.junit>4.12</version.junit>
        <version.fest>1.4</version.fest>
        <version.jmh>1.21</version.jmh>
-        <version.mockito>2.13.0</version.mockito>
+        <version.mockito>3.0.0</version.mockito>
        <version.awaitility>3.1.6</version.awaitility>

        <!-- Maven Plugins -->
-        <version.resources.plugin>2.7</version.resources.plugin>
-        <version.dependency.plugin>2.10</version.dependency.plugin>
-        <version.enforcer.plugin>3.0.0-M1</version.enforcer.plugin>
+        <version.compiler.plugin>3.8.1</version.compiler.plugin>
+        <version.resources.plugin>3.1.0</version.resources.plugin>
+        <version.filtering.plugin>3.1.1</version.filtering.plugin>
+        <version.dependency.plugin>3.1.1</version.dependency.plugin>
+        <version.enforcer.plugin>3.0.0-M2</version.enforcer.plugin>
+
        <version.jar.plugin>3.0.2</version.jar.plugin>
-        <version.source.plugin>3.0.1</version.source.plugin>
-        <version.assembly.plugin>2.4</version.assembly.plugin>
+        <version.source.plugin>3.1.0</version.source.plugin>
+        <version.assembly.plugin>3.1.1</version.assembly.plugin>
        <version.war.plugin>2.5</version.war.plugin>
-        <version.google.formatter.plugin>0.3.1</version.google.formatter.plugin>
-        <version.docker.maven.plugin>0.26.0</version.docker.maven.plugin>
-        <version.staging.plugin>1.6.3</version.staging.plugin>
+        <version.google.formatter.plugin>0.4</version.google.formatter.plugin>
+        <version.docker.maven.plugin>0.31.0</version.docker.maven.plugin>
+        <version.staging.plugin>1.6.8</version.staging.plugin>
        <version.protoc.maven.plugin>3.8.0</version.protoc.maven.plugin>
+        <version.javadoc.plugin>3.1.1</version.javadoc.plugin>
        <version.code.formatter>2.8.1</version.code.formatter>
+        <version.surefire.plugin>3.0.0-M3</version.surefire.plugin>
+        <version.checkstyle.plugin>3.0.0</version.checkstyle.plugin>
+        <version.release.plugin>2.5.3</version.release.plugin>
        <version.impsort>1.2.0</version.impsort>

        <!-- Dockerfiles -->
@ -108,6 +116,13 @@
        <!--Skip long running tests by default-->
        <skipLongRunningTests>true</skipLongRunningTests>

+        <!--Configure forking for surefire plugin, jdk11 needs
+        different settings per
+        https://stackoverflow.com/questions/53437819/maven-surefire-and-jdk-11
+        https://winterbe.com/posts/2018/08/29/migrate-maven-projects-to-java-11-jigsaw/-->
+        <forkCount>2</forkCount>
+        <reuseForks>true</reuseForks>
+
        <!-- Don't skip integration tests by default -->
        <skipITs>false</skipITs>

@ -119,16 +134,19 @@
        <format.imports.goal>sort</format.imports.goal>

        <!-- No debug options by default -->
-        <debug.argline />
+        <debug.argline/>

        <!-- No modules options by default -->
-        <modules.argline />
+        <modules.argline/>

        <!-- No test options by default -->
-        <test.argline />
+        <test.argline/>

        <!-- Assembly configuration -->
        <assembly.descriptor>connector-distribution</assembly.descriptor>
+
+        <!-- Needed for pre jdk 9 -->
+        <useSystemClassLoader>true</useSystemClassLoader>
    </properties>

    <modules>
@ -170,7 +188,7 @@
        </repository>
        <repository>
            <id>ossrh</id>
-            <name>OSS Sonatype Nexus </name>
+            <name>OSS Sonatype Nexus</name>
            <url>https://oss.sonatype.org/content/groups/public/</url>
            <releases>
                <enabled>true</enabled>
@ -404,6 +422,11 @@
                <version>${project.version}</version>
                <type>test-jar</type>
            </dependency>
+            <dependency>
+                <groupId>javax.xml.bind</groupId>
+                <artifactId>jaxb-api</artifactId>
+                <version>2.3.1</version>
+            </dependency>

        </dependencies>
    </dependencyManagement>
@ -462,6 +485,11 @@
                    <artifactId>maven-resources-plugin</artifactId>
                    <version>${version.resources.plugin}</version>
                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.shared</groupId>
+                    <artifactId>maven-filtering</artifactId>
+                    <version>${version.filtering.plugin}</version>
+                </plugin>
                <plugin>
                    <groupId>org.apache.maven.plugins</groupId>
                    <artifactId>maven-dependency-plugin</artifactId>
@ -478,6 +506,7 @@
                    <version>${version.failsafe.plugin}</version>
                    <configuration>
                        <argLine>${debug.argline} ${modules.argline} ${test.argline}</argLine>
+                        <useSystemClassLoader>${useSystemClassLoader}</useSystemClassLoader>
                    </configuration>
                </plugin>
                <plugin>
@ -626,7 +655,7 @@
                        <configuration>
                            <rules>
                                <requireMavenVersion>
-                                    <version>3.0.0</version>
+                                    <version>3.0.5</version>
                                </requireMavenVersion>
                            </rules>
                        </configuration>
@ -672,6 +701,9 @@
                    <!--runOrder>alphabetical</runOrder-->
                    <useFile>false</useFile>
                    <enableAssertions>true</enableAssertions>
+                    <forkCount>${forkCount}</forkCount>
+                    <reuseForks>${reuseForks}</reuseForks>
+                    <useSystemClassLoader>${useSystemClassLoader}</useSystemClassLoader>
                </configuration>
            </plugin>
            <plugin>
@ -821,12 +853,20 @@
            </build>
        </profile>
        <profile>
-            <id>jdk9</id>
+            <id>jdk11</id>
            <activation>
-                <jdk>9</jdk>
+                <jdk>11</jdk>
            </activation>
            <properties>
-                <modules.argline>--add-modules java.xml.bind</modules.argline>
+                <modules.argline>--add-modules java.xml.bind --illegal-access=permit</modules.argline>
+                <forkCount>0</forkCount>
+                <reuseForks>false</reuseForks>
+                <useSystemClassLoader>false</useSystemClassLoader>
+                <!-- When using this profile the following warning pops up,
+                [WARNING] bootstrap class path not set in conjunction with -source 8 -->
+                <maven.compiler.source>11</maven.compiler.source>
+                <maven.compiler.target>11</maven.compiler.target>
+                <release>11</release>
            </properties>
        </profile>
    </profiles>
--- a/support/checkstyle/pom.xml
+++ b/support/checkstyle/pom.xml
@ -18,12 +18,11 @@
    <properties>
        <!-- Instruct the build to use only UTF-8 encoding for source code -->
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>

-        <version.enforcer.plugin>3.0.0-M1</version.enforcer.plugin>
+        <version.enforcer.plugin>3.0.0-M2</version.enforcer.plugin>
        <version.jar.plugin>3.0.2</version.jar.plugin>
-        <version.source.plugin>3.0.1</version.source.plugin>
+        <version.source.plugin>3.1.0</version.source.plugin>
+        <version.checkstyle.plugin>3.0.0</version.checkstyle.plugin>
    </properties>
   <!--
   This module is referenced by Debezium's parent POM, so it needs to be built before the parent
@ -35,6 +34,7 @@
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${version.compiler.plugin}</version>
                <configuration>
                    <showDeprecation>false</showDeprecation>
                    <showWarnings>false</showWarnings>
@ -43,6 +43,7 @@
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-checkstyle-plugin</artifactId>
+                <version>${version.checkstyle.plugin}</version>
            </plugin>
            <!-- 
            This is not deployed into a Maven repository. It is merely installed into the local Maven repository
@ -55,6 +56,17 @@
                    <skip>true</skip>
                </configuration>
            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <configuration>
+                    <rules>
+                        <requireMavenVersion>
+                            <version>3.0.5</version>
+                        </requireMavenVersion>
+                    </rules>
+                </configuration>
+            </plugin>
        </plugins>
    </build>