Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for building against Java 11 #65

Merged
merged 9 commits into from
Oct 9, 2020
Merged

Add support for building against Java 11 #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2e84bcf
Ignore .java-version
eric-weaver Sep 12, 2020
3696aca
dependency version variables
eric-weaver Sep 12, 2020
2e53af3
add surefire plugin version
eric-weaver Sep 12, 2020
f0ddf72
Add required maven version
eric-weaver Sep 12, 2020
dc12126
update shade plugin
eric-weaver Sep 12, 2020
eaa9a44
add jdk 11 profile
eric-weaver Sep 13, 2020
2cc3ae9
Add openjdk11 to build matrix
eric-weaver Sep 13, 2020
32ea223
remove cobertura
eric-weaver Sep 15, 2020
dedaaa8
move xml bind into dependency section
eric-weaver Oct 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,6 @@ relations/
# IntelliJ
.idea/
*.iml

# jenv
*.java-version
1 change: 1 addition & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ cache:
- $HOME/.m2/repository
jdk:
- openjdk8
- openjdk11
153 changes: 109 additions & 44 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,126 +21,163 @@
</repository>
</repositories>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<jackson.version>2.11.1</jackson.version>
<guava.version>29.0-jre</guava.version>
<release>8</release>

<version.amazonaws>1.11.292</version.amazonaws>
<version.apache.commons>4.1</version.apache.commons>
<version.avro>1.8.2</version.avro>
<version.commons.io>2.6</version.commons.io>
<version.commons.lang>2.6</version.commons.lang>
<version.confluent>4.0.0</version.confluent>
<version.dropwizard>4.0.2</version.dropwizard>
<version.guava>29.0-jre</version.guava>
<version.jackson>2.11.1</version.jackson>
<version.jopt.simple>4.9</version.jopt.simple>
<version.kafka>1.0.0</version.kafka>
<version.logback>1.2.3</version.logback>
<version.rocksdb>5.17.2</version.rocksdb>
<version.snakeyaml>1.20</version.snakeyaml>
<version.xml.bind>2.3.1</version.xml.bind>

<!-- Testing -->
<version.curator>2.12.0</version.curator>
<version.junit>4.11</version.junit>
<version.mockito>2.25.1</version.mockito>
<version.s3mock>0.2.5</version.s3mock>

<modules.argline />

<!-- Plugins -->
<version.compiler.plugin>3.8.1</version.compiler.plugin>
<version.enforcer.plugin>3.0.0-M3</version.enforcer.plugin>
<version.jsonschema2pojo.plugin>1.0.0</version.jsonschema2pojo.plugin>
<version.shade.plugin>3.2.4</version.shade.plugin>
<version.surefire.plugin>3.0.0-M5</version.surefire.plugin>
</properties>
<dependencies>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.2.3</version>
<version>${version.logback}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
<version>${version.guava}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
<version>4.1</version>
<version>${version.apache.commons}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.6</version>
<version>${version.commons.io}</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.6</version>
<version>${version.commons.lang}</version>
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-streams</artifactId>
<version>1.0.0</version>
<version>${version.kafka}</version>
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
<version>1.0.0</version>
<version>${version.kafka}</version>
</dependency>
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
<version>1.8.2</version>
<version>${version.avro}</version>
</dependency>
<dependency>
<groupId>io.confluent</groupId>
<artifactId>kafka-streams-avro-serde</artifactId>
<version>4.0.0</version>
<version>${version.confluent}</version>
</dependency>
<dependency>
<groupId>io.confluent</groupId>
<artifactId>kafka-json-serializer</artifactId>
<version>4.0.0</version>
<version>${version.confluent}</version>
</dependency>
<dependency>
<groupId>org.rocksdb</groupId>
<artifactId>rocksdbjni</artifactId>
<version>5.17.2</version>
<version>${version.rocksdb}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
<version>${version.jackson}</version>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-s3</artifactId>
<version>1.11.292</version>
<version>${version.amazonaws}</version>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>1.20</version>
<version>${version.snakeyaml}</version>
</dependency>
<dependency>
<groupId>net.sf.jopt-simple</groupId>
<artifactId>jopt-simple</artifactId>
<version>4.9</version>
<version>${version.jopt.simple}</version>
</dependency>
<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-core</artifactId>
<version>4.0.2</version>
<version>${version.dropwizard}</version>
</dependency>
<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-jmx</artifactId>
<version>4.0.2</version>
<version>${version.dropwizard}</version>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>${version.xml.bind}</version>
</dependency>

<!-- Test Dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<version>${version.junit}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka_2.12</artifactId>
<version>1.0.0</version>
<version>${version.kafka}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-test</artifactId>
<version>2.12.0</version>
<version>${version.curator}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.findify</groupId>
<artifactId>s3mock_2.12</artifactId>
<version>0.2.5</version>
<version>${version.s3mock}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.25.1</version>
<version>${version.mockito}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand All @@ -149,10 +186,40 @@
<testSourceDirectory>src/test/java</testSourceDirectory>
<finalName>southpaw</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${version.compiler.plugin}</version>
<configuration>
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 this could help with enforcing some of the transitive dependency issues this project currently has

<artifactId>maven-enforcer-plugin</artifactId>
<version>${version.enforcer.plugin}</version>
<executions>
<execution>
<id>enforce-maven</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireMavenVersion>
<version>3.6.3</version>
</requireMavenVersion>
</rules>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>2.3</version>
<version>${version.shade.plugin}</version>
<executions>
<execution>
<phase>package</phase>
Expand All @@ -165,14 +232,15 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${version.surefire.plugin}</version>
<configuration>
<argLine>-Xmx1024m</argLine>
<argLine>-Djava.awt.headless=true ${modules.argline}</argLine>
</configuration>
</plugin>
<plugin>
<groupId>org.jsonschema2pojo</groupId>
<artifactId>jsonschema2pojo-maven-plugin</artifactId>
<version>1.0.0</version>
<version>${version.jsonschema2pojo.plugin}</version>
<configuration>
<sourceDirectory>${basedir}/src/main/resources/southpaw/schema</sourceDirectory>
<targetPackage>com.jwplayer.southpaw.json</targetPackage>
Expand All @@ -188,23 +256,20 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<version>2.7</version>
<configuration>
<check>
</check>
</configuration>
<executions>
<execution>
<goals>
<goal>clean</goal>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>jdk11</id>
<activation>
<jdk>11</jdk>
</activation>
<properties>
<modules.argline>--illegal-access=permit</modules.argline>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<release>11</release>
</properties>
</profile>
</profiles>
</project>