Repository: activemq-openwire Updated Branches: refs/heads/master 19ae3969f -> 682c03ac5
https://issues.apache.org/jira/browse/OPENWIRE-6 Upgrading dependencies and scala maven plugin to be compatible with JDK 8. Project: http://git-wip-us.apache.org/repos/asf/activemq-openwire/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-openwire/commit/682c03ac Tree: http://git-wip-us.apache.org/repos/asf/activemq-openwire/tree/682c03ac Diff: http://git-wip-us.apache.org/repos/asf/activemq-openwire/diff/682c03ac Branch: refs/heads/master Commit: 682c03ac5b8a53868dfabc19fa13435ff6ff16e3 Parents: 19ae396 Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com> Authored: Thu Oct 22 19:44:34 2015 +0000 Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com> Committed: Thu Oct 22 19:44:34 2015 +0000 ---------------------------------------------------------------------- openwire-website/pom.xml | 24 ++++++++++++------------ pom.xml | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-openwire/blob/682c03ac/openwire-website/pom.xml ---------------------------------------------------------------------- diff --git a/openwire-website/pom.xml b/openwire-website/pom.xml index e414dea..3032a35 100644 --- a/openwire-website/pom.xml +++ b/openwire-website/pom.xml @@ -37,10 +37,10 @@ <!-- lets use the latest greatest! :) --> <hawtio-release-version>${project.version}</hawtio-release-version> - <scala-version>2.10.0</scala-version> - <scala-plugin-version>3.1.0</scala-plugin-version> - <scalate-version>1.6.1</scalate-version> - <scalamd-version>1.6</scalamd-version> + <scala-version>2.10.4</scala-version> + <scala-plugin-version>3.2.2</scala-plugin-version> + <scalate-version>1.7.1</scalate-version> + <scalamd-version>1.6.1</scalamd-version> <jetty-plugin-version>7.0.1.v20091125</jetty-plugin-version> <netbeans.hint.deploy.server>Tomcat60</netbeans.hint.deploy.server> @@ -48,17 +48,17 @@ <dependencies> <dependency> - <groupId>org.fusesource.scalate</groupId> + <groupId>org.scalatra.scalate</groupId> <artifactId>scalate-wikitext_2.10</artifactId> <version>${scalate-version}</version> </dependency> <dependency> - <groupId>org.fusesource.scalate</groupId> + <groupId>org.scalatra.scalate</groupId> <artifactId>scalate-page_2.10</artifactId> <version>${scalate-version}</version> </dependency> <dependency> - <groupId>org.fusesource.scalamd</groupId> + <groupId>org.scalatra.scalate</groupId> <artifactId>scalamd_2.10</artifactId> <version>${scalamd-version}</version> </dependency> @@ -69,7 +69,7 @@ <!-- testing --> <dependency> - <groupId>org.fusesource.scalate</groupId> + <groupId>org.scalatra.scalate</groupId> <artifactId>scalate-test_2.10</artifactId> <version>${scalate-version}</version> <scope>test</scope> @@ -111,7 +111,7 @@ <jvmArg>-Xss8m</jvmArg> </jvmArgs> <scalaVersion>${scala-version}</scalaVersion> - <target>jvm-1.6</target> + <target>jvm-1.7</target> </configuration> </plugin> @@ -132,7 +132,7 @@ </plugin> <plugin> - <groupId>org.fusesource.scalate</groupId> + <groupId>org.scalatra.scalate</groupId> <artifactId>maven-scalate-plugin_2.10</artifactId> <version>${scalate-version}</version> @@ -301,8 +301,8 @@ <build> <plugins> <plugin> - <groupId>org.fusesource.scalate</groupId> - <artifactId>maven-scalate-plugin_2.10</artifactId> + <groupId>org.scalatra.scalate</groupId> + <artifactId>maven-scalate-plugin_2.11</artifactId> <version>${scalate-version}</version> <executions> http://git-wip-us.apache.org/repos/asf/activemq-openwire/blob/682c03ac/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 6981508..8ab829b 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>org.apache</groupId> <artifactId>apache</artifactId> - <version>14</version> + <version>17</version> </parent> <modelVersion>4.0.0</modelVersion>