Repository: incubator-tamaya-extensions Updated Branches: refs/heads/master 426d4a58c -> df3e3f1a4
TAMAYA-330: Add jdk9+ build support This change makes it possible to build Tamaya extensions on JDK 9 and 10. Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/commit/54b19066 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/54b19066 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/54b19066 Branch: refs/heads/master Commit: 54b190666c28df138595cc0fdc39a632e5842a7b Parents: 30d5b2e Author: Aaron Coburn <[email protected]> Authored: Tue Mar 20 15:33:11 2018 -0400 Committer: Aaron Coburn <[email protected]> Committed: Tue Mar 20 15:33:11 2018 -0400 ---------------------------------------------------------------------- distribution/pom.xml | 1 + .../microprofile/MicroprofileConfigTest.java | 3 +- modules/osgi/common/bnd.bnd | 1 + modules/osgi/pom.xml | 1 - pom.xml | 30 ++++++++++++++++++-- 5 files changed, 32 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/54b19066/distribution/pom.xml ---------------------------------------------------------------------- diff --git a/distribution/pom.xml b/distribution/pom.xml index 117984f..6754987 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -50,6 +50,7 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> + <version>${assembly.version}</version> <executions> <execution> <id>attach-distribution-src</id> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/54b19066/modules/microprofile/src/test/java/org/apache/tamaya/microprofile/MicroprofileConfigTest.java ---------------------------------------------------------------------- diff --git a/modules/microprofile/src/test/java/org/apache/tamaya/microprofile/MicroprofileConfigTest.java b/modules/microprofile/src/test/java/org/apache/tamaya/microprofile/MicroprofileConfigTest.java index 5d61c8c..9d0ea2b 100644 --- a/modules/microprofile/src/test/java/org/apache/tamaya/microprofile/MicroprofileConfigTest.java +++ b/modules/microprofile/src/test/java/org/apache/tamaya/microprofile/MicroprofileConfigTest.java @@ -23,6 +23,7 @@ import org.eclipse.microprofile.config.ConfigProvider; import org.eclipse.microprofile.config.spi.ConfigSource; import org.junit.Test; +import java.time.Instant; import java.util.NoSuchElementException; import java.util.Optional; @@ -76,7 +77,7 @@ public class MicroprofileConfigTest { @Test(expected = IllegalArgumentException.class) public void testGetValue_InvalidType(){ Config config = ConfigProvider.getConfig(); - config.getValue("java.version", Integer.class); + config.getValue("java.version", Instant.class); } @Test http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/54b19066/modules/osgi/common/bnd.bnd ---------------------------------------------------------------------- diff --git a/modules/osgi/common/bnd.bnd b/modules/osgi/common/bnd.bnd index e75d2b1..d4ee4ae 100644 --- a/modules/osgi/common/bnd.bnd +++ b/modules/osgi/common/bnd.bnd @@ -25,6 +25,7 @@ Export-Package: \ org.apache.tamaya.osgi,\ org.apache.tamaya.osgi.commands Import-Package: \ + javax.annotation,\ org.osgi.framework,\ org.osgi.service.cm,\ org.apache.tamaya,\ http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/54b19066/modules/osgi/pom.xml ---------------------------------------------------------------------- diff --git a/modules/osgi/pom.xml b/modules/osgi/pom.xml index 36e6524..1f604cd 100644 --- a/modules/osgi/pom.xml +++ b/modules/osgi/pom.xml @@ -60,7 +60,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.20.1</version> </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/54b19066/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 06fdca3..37c4116 100644 --- a/pom.xml +++ b/pom.xml @@ -70,18 +70,20 @@ under the License. <asciidoctor.version>1.5.6</asciidoctor.version> <asciidoctor-diagramm.version>1.2.1</asciidoctor-diagramm.version> <asciidoctorj.version>1.5.6</asciidoctorj.version> + <assembly.version>3.1.0</assembly.version> <checkstyle.version>2.15</checkstyle.version> - <enforcer.version>1.4.1</enforcer.version> + <enforcer.version>3.0.0-M1</enforcer.version> <gem.plugin>1.0.7</gem.plugin> <sources.plugin>3.0.1</sources.plugin> <hamcrest.version>2.0.0.0</hamcrest.version> - <javadoc.version>2.10.4</javadoc.version> + <javadoc.version>3.0.0</javadoc.version> <!-- Must/should match the JRuby version used by AsciidoctorJ --> <jruby.version>1.7.26</jruby.version> <findbugs.version>3.0.4</findbugs.version> <mockito.version>1.10.19</mockito.version> <pitest-plugin.version>1.3.1</pitest-plugin.version> <rat.version>0.12</rat.version> + <surefire.version>2.21.0</surefire.version> <toolchains.plugin>1.1</toolchains.plugin> <!-- Dependencies for site generation --> @@ -490,6 +492,7 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> + <version>${surefire.version}</version> <inherited>true</inherited> </plugin> @@ -669,6 +672,20 @@ under the License. </configuration> </execution> </executions> + <!-- compiling on JDK 9+ requires these Java EE modules + it should be possible to remove this after Karaf 4.2.0 GA has been released --> + <dependencies> + <dependency> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> + <version>2.3.0</version> + </dependency> + <dependency> + <groupId>javax.activation</groupId> + <artifactId>javax.activation-api</artifactId> + <version>1.2.0</version> + </dependency> + </dependencies> </plugin> <plugin> @@ -744,6 +761,15 @@ under the License. <source>${maven.compile.sourceLevel}</source> <verbose>false</verbose> </configuration> + <!-- compiling on JDK 10 requires a newer version of commons-lang3 + it should be possible to remove this once a newer javadoc plugin becomes available --> + <dependencies> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>3.7</version> + </dependency> + </dependencies> </plugin> <plugin>
