You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2018/09/03 12:16:17 UTC
[7/8] roller git commit: Bump JDK version up to 1.8 and upgrade to
latest Jetty for mvn jetty:run
Bump JDK version up to 1.8 and upgrade to latest Jetty for mvn jetty:run
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/ad62b85b
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/ad62b85b
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/ad62b85b
Branch: refs/heads/bootstrap-ui
Commit: ad62b85b36b43dbbff71a850900b4dc419eb9a6d
Parents: 40547d2
Author: Dave Johnson <sn...@gmail.com>
Authored: Sun Sep 2 18:41:06 2018 -0400
Committer: Dave Johnson <sn...@gmail.com>
Committed: Sun Sep 2 18:41:06 2018 -0400
----------------------------------------------------------------------
app/pom.xml | 6 ------
app/src/test/resources/jetty.xml | 2 +-
pom.xml | 6 +++---
3 files changed, 4 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/roller/blob/ad62b85b/app/pom.xml
----------------------------------------------------------------------
diff --git a/app/pom.xml b/app/pom.xml
index 44b7882..ad5ce98 100644
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -94,12 +94,6 @@ limitations under the License.
<artifactId>mail</artifactId>
<version>${java-mail.version}</version>
<scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<!-- Eclipselink JPA is the default JPA implementation used by
http://git-wip-us.apache.org/repos/asf/roller/blob/ad62b85b/app/src/test/resources/jetty.xml
----------------------------------------------------------------------
diff --git a/app/src/test/resources/jetty.xml b/app/src/test/resources/jetty.xml
index 0209086..995ea1d 100644
--- a/app/src/test/resources/jetty.xml
+++ b/app/src/test/resources/jetty.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
-<Configure id='Server' class="org.eclipse.jetty.webapp.WebAppContext">
+<Configure id="Server" class="org.eclipse.jetty.server.Server">
<!-- Dummy values used only when testing with Jetty via mvn jetty:run -->
http://git-wip-us.apache.org/repos/asf/roller/blob/ad62b85b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4e3d92f..6af923f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,8 +63,8 @@ limitations under the License.
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
- <source>1.7</source>
- <target>1.7</target>
+ <source>1.8</source>
+ <target>1.8</target>
<fork>true</fork>
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
@@ -80,7 +80,7 @@ limitations under the License.
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
- <version>9.2.6.v20141205</version>
+ <version>9.4.11.v20180605</version>
</plugin>
<plugin>
<groupId>com.btmatthews.maven.plugins.inmemdb</groupId>