Repository: incubator-tamaya-sandbox Updated Branches: refs/heads/master eeab5ce02 -> c3bf3f71e
TAMAYA-294: Update to latest Johnzon and spec Fix minor build issues, ensure JDK8 complicance via enforcer plugin. Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/commit/c3bf3f71 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/tree/c3bf3f71 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/diff/c3bf3f71 Branch: refs/heads/master Commit: c3bf3f71e33303165f1e8301f52942cfb4292821 Parents: eeab5ce Author: Phil Ottlinger <[email protected]> Authored: Sun Oct 22 20:05:06 2017 +0200 Committer: Phil Ottlinger <[email protected]> Committed: Sun Oct 22 20:05:06 2017 +0200 ---------------------------------------------------------------------- etcd/pom.xml | 2 +- pom.xml | 32 +++++++++++++++----------------- 2 files changed, 16 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/c3bf3f71/etcd/pom.xml ---------------------------------------------------------------------- diff --git a/etcd/pom.xml b/etcd/pom.xml index 329d760..ef818a1 100644 --- a/etcd/pom.xml +++ b/etcd/pom.xml @@ -62,7 +62,7 @@ under the License. </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-json_1.0_spec</artifactId> + <artifactId>geronimo-json_1.1_spec</artifactId> </dependency> <dependency> <groupId>org.apache.johnzon</groupId> http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/c3bf3f71/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index a41d4d5..ef0d1c3 100644 --- a/pom.xml +++ b/pom.xml @@ -52,13 +52,14 @@ under the License. <maven.javadoc.skip>false</maven.javadoc.skip> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <json.spec.version>1.0-alpha-1</json.spec.version> + <json.spec.version>1.0</json.spec.version> + <johnzon.version>1.1.4</johnzon.version> <johnzon.version>0.9-incubating</johnzon.version> <junit.version>4.12</junit.version> <!-- Dependency and plugin relate version properties go here --> <arquillian.version>1.1.7.Final</arquillian.version> - <arquillian.deamon.version>1.0.0.Alpha1</arquillian.deamon.version> + <arquillian.daemon.version>1.0.0.Alpha1</arquillian.daemon.version> <!-- Keep the JRuby version in sync with the one used by Asciidoctor --> <asciidoctor.version>1.5.2</asciidoctor.version> @@ -219,12 +220,6 @@ under the License. </exclusions> </dependency> - <!--<dependency>--> - <!--<groupId>com.google.code.findbugs</groupId>--> - <!--<artifactId>jsr305</artifactId>--> - <!--<version>${findbugs.version}</version>--> - <!--</dependency>--> - <dependency> <groupId>org.hamcrest</groupId> <artifactId>java-hamcrest</artifactId> @@ -244,42 +239,42 @@ under the License. <dependency> <groupId>org.jboss.arquillian.daemon</groupId> <artifactId>arquillian-daemon-container-managed</artifactId> - <version>${arquillian.deamon.version}</version> + <version>${arquillian.daemon.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.jboss.arquillian.daemon</groupId> <artifactId>arquillian-daemon-container-common</artifactId> - <version>${arquillian.deamon.version}</version> + <version>${arquillian.daemon.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.jboss.arquillian.daemon</groupId> <artifactId>arquillian-daemon-main</artifactId> - <version>${arquillian.deamon.version}</version> + <version>${arquillian.daemon.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.jboss.arquillian.daemon</groupId> <artifactId>arquillian-daemon-protocol-arquillian</artifactId> - <version>${arquillian.deamon.version}</version> + <version>${arquillian.daemon.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.jboss.arquillian.daemon</groupId> <artifactId>arquillian-daemon-protocol-wire</artifactId> - <version>${arquillian.deamon.version}</version> + <version>${arquillian.daemon.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.jboss.arquillian.daemon</groupId> <artifactId>arquillian-daemon-server</artifactId> - <version>${arquillian.deamon.version}</version> + <version>${arquillian.daemon.version}</version> <scope>test</scope> </dependency> @@ -292,7 +287,7 @@ under the License. <dependency> <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-json_1.0_spec</artifactId> + <artifactId>geronimo-json_1.1_spec</artifactId> <version>${json.spec.version}</version> </dependency> @@ -416,7 +411,7 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.5.1</version> + <version>3.7.0</version> <configuration> <debug>true</debug> <source>${maven.compile.sourceLevel}</source> @@ -636,6 +631,9 @@ under the License. <requireMavenVersion> <version>3.0.5</version> </requireMavenVersion> + <requireJavaVersion> + <version>1.8</version> + </requireJavaVersion> </rules> </configuration> </execution> @@ -723,7 +721,7 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>2.5</version> + <version>3.0.2</version> <configuration> <archive> <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
