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

Updates for Java 11 #173

Merged
merged 9 commits into from Jan 7, 2019
Merged

Updates for Java 11 #173

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
3c3d251
Update JaCoCo to 0.8.2
electrum Jan 4, 2019
c59acfb
Update PMD to 3.11.0
electrum Jan 4, 2019
90e0d9c
Update SpotBugs annotations and plugin to 3.1.10
electrum Jan 4, 2019
d2a20ce
Update Modernizer plugin to 1.7.1
electrum Jan 4, 2019
bf3ca5a
Update Javadoc plugin to 3.0.1
electrum Jan 4, 2019
1db8d47
Enforce maximum bytecode version for dependencies
electrum Jan 4, 2019
2a8f499
Fix dependency plugin for Java 11 bytecode
electrum Jan 4, 2019
7bf2d76
Add property to configure Modernizer Java version
electrum Jan 4, 2019
aecdd71
Update to Guava 26.0 and Guice 4.2.2
electrum Jan 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 11 additions & 0 deletions CHANGES.md
View file
Open in desktop
@@ -1,13 +1,24 @@
Airbase 89

* Set the default JVM local for Surefire tests to `en-US`
* Add property to configure Modernizer Java version
* Enforce maximum bytecode version for dependencies
* Allow dependency plugin to work with Java 11 bytecode
* Dependency updates:
- Guava 26.0 (from 24.1)
- Guice 4.2.2 (from 4.2.0)
- validation-api 2.0.1 (from 1.1.0)
- BVal 2.0.0 (from 1.1.1)
- SpotBugs annotations 3.1.10 (from 3.1.6)
* Plugin updates:
- Checkstyle 3.0.0 (from 2.17)
- compiler 3.8.0 (from 3.7.0)
- dependency 3.1.1 (from 2.10)
- JaCoCo 0.8.2 (from 0.8.1)
- Javadoc 3.0.1 (from 3.0.0)
- Modernizer 1.7.1 (from 1.5.0)
- PMD 3.11.0 (from 3.10.0)
- SpotBugs 3.1.10 (from 3.1.6)
* Checkstyle updates:
- Version 8.16 (from 8.7)
- Enforce empty lines around program elements
Expand Down
45 changes: 36 additions & 9 deletions airbase/pom.xml
View file
Open in desktop
Expand Up @@ -113,6 +113,9 @@
<!-- Lint mode for Javadoc. Defaults to 'all'. -->
<air.javadoc.lint>all</air.javadoc.lint>

<!-- Target Java version for Modernizer -->
<air.modernizer.java-version>${project.build.targetJdk}</air.modernizer.java-version>

<!-- Controls all the checkers run when building the project. -->
<!-- Can be activated with -Dair.check.skip-all=true on the command line. -->
<air.check.skip-all>false</air.check.skip-all>
Expand Down Expand Up @@ -170,8 +173,8 @@
<dep.packaging.version>0.163</dep.packaging.version>

<!-- Dependency versions that should be the same everywhere. -->
<dep.guice.version>4.2.0</dep.guice.version>
<dep.guava.version>24.1-jre</dep.guava.version>
<dep.guice.version>4.2.2</dep.guice.version>
<dep.guava.version>26.0-jre</dep.guava.version>
<dep.slf4j.version>1.7.25</dep.slf4j.version>
<dep.logback.version>1.2.3</dep.logback.version>
<dep.javax-inject.version>1</dep.javax-inject.version>
Expand All @@ -182,7 +185,7 @@
<dep.jmxutils.version>1.19</dep.jmxutils.version>
<dep.cglib.version>3.2.5</dep.cglib.version>
<dep.joda.version>2.9.9</dep.joda.version>
<dep.spotbugs-annotations.version>3.1.6</dep.spotbugs-annotations.version>
<dep.spotbugs-annotations.version>3.1.10</dep.spotbugs-annotations.version>
<dep.testng.version>6.9.6</dep.testng.version>
<dep.assertj-core.version>3.5.2</dep.assertj-core.version>
<dep.assertj-guava.version>3.1.0</dep.assertj-guava.version>
Expand Down Expand Up @@ -257,6 +260,13 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0-M2</version>
<dependencies>
<dependency>
<groupId>org.codehaus.mojo</groupId>
<artifactId>extra-enforcer-rules</artifactId>
<version>1.1</version>
</dependency>
</dependencies>
<executions>
<execution>
<id>default</id>
Expand Down Expand Up @@ -314,6 +324,14 @@
<requireJavaVersion>
<version>${air.java.version}</version>
</requireJavaVersion>
<enforceBytecodeVersion>
<maxJdkVersion>${project.build.targetJdk}</maxJdkVersion>
<ignoredScopes>test</ignoredScopes>
<excludes>
<exclude>org.eclipse.jetty:jetty-alpn-java-client</exclude>
<exclude>org.eclipse.jetty:jetty-alpn-java-server</exclude>
</excludes>
</enforceBytecodeVersion>
</rules>
</configuration>
</plugin>
Expand All @@ -322,6 +340,15 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.1.1</version>
<dependencies>
<!-- TODO: remove after updating to 3.1.2 -->
<!-- see https://issues.apache.org/jira/browse/MDEP-613 -->
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-dependency-analyzer</artifactId>
<version>1.11.1</version>
</dependency>
</dependencies>
<configuration>
<skip>${air.check.skip-dependency}</skip>
<failOnWarning>${air.check.fail-dependency}</failOnWarning>
Expand Down Expand Up @@ -430,7 +457,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.0.0</version>
<version>3.0.1</version>
<configuration>
<quiet>true</quiet>
<source>${project.build.targetJdk}</source>
Expand Down Expand Up @@ -624,7 +651,7 @@
<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<version>3.1.6</version>
<version>3.1.10</version>
<configuration>
<skip>${air.check.skip-spotbugs}</skip>
<jvmArgs>-Xmx${air.build.jvmsize}</jvmArgs>
Expand All @@ -644,7 +671,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<version>3.10.0</version>
<version>3.11.0</version>
<configuration>
<skip>${air.check.skip-pmd}</skip>
<failOnViolation>${air.check.fail-pmd}</failOnViolation>
Expand Down Expand Up @@ -752,7 +779,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.1</version>
<version>0.8.2</version>
<executions>
<execution>
<id>default</id>
Expand All @@ -776,11 +803,11 @@
<plugin>
<groupId>org.gaul</groupId>
<artifactId>modernizer-maven-plugin</artifactId>
<version>1.5.0</version>
<version>1.7.1</version>
<configuration>
<skip>${air.check.skip-modernizer}</skip>
<failOnViolations>${air.check.fail-modernizer}</failOnViolations>
<javaVersion>${project.build.targetJdk}</javaVersion>
<javaVersion>${air.modernizer.java-version}</javaVersion>
</configuration>
<executions>
<execution>
Expand Down