Skip to content

Commit

Permalink
Dependency and plugin versions are updated, build under java9 is fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
solomax committed Oct 11, 2017
1 parent 4c49518 commit a2c1e2c
Show file tree
Hide file tree
Showing 16 changed files with 108 additions and 133 deletions.
3 changes: 1 addition & 2 deletions async-tasks-parent/async-tasks-impl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
<description>The implementation of the asynchronous task micro-framework.</description>

<properties>
<version.guava>14.0.1</version.guava>
<version.glassfish>3.0</version.glassfish>
</properties>

Expand All @@ -27,7 +26,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${version.guava}</version>
<version>${guava.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
Expand Down
2 changes: 1 addition & 1 deletion dashboard-parent/dashboard-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<name>Wicketstuff Dashboard Core</name>

<properties>
<xstream.version>1.4.9</xstream.version>
<xstream.version>1.4.10</xstream.version>
</properties>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion datastores-parent/datastore-hazelcast/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<dependency>
<groupId>com.hazelcast</groupId>
<artifactId>hazelcast</artifactId>
<version>3.8.5</version>
<version>3.8.6</version>
</dependency>

</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion datastores-parent/datastore-ignite/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-core</artifactId>
<version>2.1.0</version>
<version>2.2.0</version>
</dependency>

</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions datastores-parent/datastore-memcached/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

<dependencies>

<dependency>
<dependency>
<groupId>org.wicketstuff</groupId>
<artifactId>wicketstuff-datastore-common</artifactId>
<version>${project.version}</version>
Expand All @@ -58,7 +58,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>23.0</version>
<version>${guava.version}</version>
<optional>true</optional>
</dependency>

Expand Down
2 changes: 1 addition & 1 deletion datatables-parent/datatables/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<dependency>
<groupId>org.webjars.bower</groupId>
<artifactId>datatables</artifactId>
<version>1.10.15</version>
<version>1.10.16</version>
</dependency>
<dependency>
<groupId>org.webjars</groupId>
Expand Down
2 changes: 1 addition & 1 deletion gae-initializer-parent/gae-initializer-example/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
by ${gae.home} property (Typically, one used by your Eclipse plug-in)
-->
<gae.home>/home/martin/appengine/appengine-java-sdk-1.9.7</gae.home>
<gae.version>1.9.7</gae.version>
<gae.version>1.9.57</gae.version>

<!-- Upload to http://test.latest.<applicationName>.appspot.com by default -->
<gae.application.version>test</gae.application.version>
Expand Down
15 changes: 7 additions & 8 deletions jee-web-parent/jee-web/pom.xml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.wicketstuff</groupId>
<artifactId>jee-web-parent</artifactId>
<version>8.0.0-SNAPSHOT</version>
</parent>
<parent>
<groupId>org.wicketstuff</groupId>
<artifactId>jee-web-parent</artifactId>
<version>8.0.0-SNAPSHOT</version>
</parent>
<artifactId>wicketstuff-jee-web</artifactId>
<packaging>jar</packaging>
<name>JEE Web Integration</name>
Expand All @@ -19,7 +19,6 @@

<properties>
<servlet.jsp.api.version>2.2</servlet.jsp.api.version>
<faces.api.version>2.2.8-01</faces.api.version>
</properties>

<dependencies>
Expand All @@ -46,7 +45,7 @@
<dependency>
<groupId>com.sun.faces</groupId>
<artifactId>jsf-api</artifactId>
<version>${faces.api.version}</version>
<version>${jsf.version}</version>
<scope>provided</scope>
</dependency>

Expand All @@ -69,4 +68,4 @@
<scope>test</scope>
</dependency>
</dependencies>
</project>
</project>
13 changes: 8 additions & 5 deletions jee-web-parent/pom.xml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.wicketstuff</groupId>
<artifactId>wicketstuff-core</artifactId>
<version>8.0.0-SNAPSHOT</version>
</parent>
<parent>
<groupId>org.wicketstuff</groupId>
<artifactId>wicketstuff-core</artifactId>
<version>8.0.0-SNAPSHOT</version>
</parent>
<artifactId>jee-web-parent</artifactId>
<packaging>pom</packaging>
<name>JEE Web Integration - Parent</name>
Expand All @@ -22,6 +22,9 @@
<module>jee-web</module>
<module>jee-web-examples</module>
</modules>
<properties>
<jsf.version>2.1.13</jsf.version>
</properties>
<build>
<pluginManagement>
<plugins>
Expand Down
Loading

0 comments on commit a2c1e2c

Please sign in to comment.