From commits-return-6065-archive-asf-public=cust-asf.ponee.io@tamaya.incubator.apache.org Thu Mar 22 21:08:30 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 9EEDC180676 for ; Thu, 22 Mar 2018 21:08:29 +0100 (CET) Received: (qmail 91820 invoked by uid 500); 22 Mar 2018 20:08:28 -0000 Mailing-List: contact commits-help@tamaya.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tamaya.incubator.apache.org Delivered-To: mailing list commits@tamaya.incubator.apache.org Received: (qmail 91811 invoked by uid 99); 22 Mar 2018 20:08:28 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 22 Mar 2018 20:08:28 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 40E891A17FC for ; Thu, 22 Mar 2018 20:08:28 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.231 X-Spam-Level: X-Spam-Status: No, score=-4.231 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_PASS=-0.001, T_RP_MATCHES_RCVD=-0.01] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id HCWHVFwdXRcV for ; Thu, 22 Mar 2018 20:08:26 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with SMTP id 3AF415FDF8 for ; Thu, 22 Mar 2018 20:08:26 +0000 (UTC) Received: (qmail 91787 invoked by uid 99); 22 Mar 2018 20:08:25 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 22 Mar 2018 20:08:25 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0BC16F6755; Thu, 22 Mar 2018 20:08:24 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: pottlinger@apache.org To: commits@tamaya.incubator.apache.org Date: Thu, 22 Mar 2018 20:08:24 -0000 Message-Id: <5247aac1d9c34c40a8046b85c0864692@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] incubator-tamaya-extensions git commit: TAMAYA-330: Add jdk9+ build support 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 Authored: Tue Mar 20 15:33:11 2018 -0400 Committer: Aaron Coburn 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. org.apache.maven.plugins maven-assembly-plugin + ${assembly.version} attach-distribution-src 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 @@ org.apache.maven.plugins maven-surefire-plugin - 2.20.1 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. 1.5.6 1.2.1 1.5.6 + 3.1.0 2.15 - 1.4.1 + 3.0.0-M1 1.0.7 3.0.1 2.0.0.0 - 2.10.4 + 3.0.0 1.7.26 3.0.4 1.10.19 1.3.1 0.12 + 2.21.0 1.1 @@ -490,6 +492,7 @@ under the License. org.apache.maven.plugins maven-surefire-plugin + ${surefire.version} true @@ -669,6 +672,20 @@ under the License. + + + + org.glassfish.jaxb + jaxb-runtime + 2.3.0 + + + javax.activation + javax.activation-api + 1.2.0 + + @@ -744,6 +761,15 @@ under the License. ${maven.compile.sourceLevel} false + + + + org.apache.commons + commons-lang3 + 3.7 + +