Merge branch 'master' into java11
# Conflicts:
# app/pom.xml
# pom.xml
diff --git a/app/pom.xml b/app/pom.xml
index 8bba67e..d6fad7d 100644
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -33,26 +33,33 @@
<packaging>war</packaging>
<properties>
+
+ <servlet.version>3.0.1</servlet.version>
+ <jsp-api.version>2.2</jsp-api.version>
+ <java-activation.version>1.2.0</java-activation.version>
+ <java-mail.version>1.4.7</java-mail.version>
+ <jstl.version>1.2</jstl.version>
+
<angular.version>1.2.29</angular.version>
<ant.version>1.10.1</ant.version>
<commons-validator.version>1.6</commons-validator.version>
<commons-beanutils.version>1.9.3</commons-beanutils.version>
<commons-httpclient.version>3.1</commons-httpclient.version>
<commons-codec.version>1.10</commons-codec.version>
- <eclipse-link.version>2.5.2</eclipse-link.version>
- <guice.version>4.1.0</guice.version>
- <java-mail.version>1.4.7</java-mail.version>
- <jsp-api.version>2.2</jsp-api.version>
- <jstl.version>1.2</jstl.version>
+ <eclipse-link.version>2.7.3</eclipse-link.version>
+ <guice.version>4.2.1</guice.version>
<log4j.version>1.2.17</log4j.version>
+<<<<<<< HEAD
+ <log4j2.version>2.9.1</log4j2.version>
+=======
<log4j2.version>2.10.0</log4j2.version>
+>>>>>>> master
<lucene.version>4.10.4</lucene.version>
<oauth-core.version>20100527</oauth-core.version>
<maven-war.version>3.1.0</maven-war.version>
<maven-surefire.version>2.17</maven-surefire.version>
<maven-antrun.version>1.0b3</maven-antrun.version>
<rome.version>1.7.4</rome.version>
- <servlet.version>3.0.1</servlet.version>
<slf4j.version>1.7.25</slf4j.version>
<spring.version>4.1.4.RELEASE</spring.version>
<spring.security.version>3.2.5.RELEASE</spring.security.version>
@@ -62,11 +69,11 @@
<ws-commons-util.version>1.0.2</ws-commons-util.version>
<xml-security.version>1.3.0</xml-security.version>
<xmlrpc-version>3.1.3</xmlrpc-version>
+
</properties>
<dependencies>
-
<!-- Java EE deps -->
<dependency>
@@ -96,18 +103,41 @@
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>javax.activation</artifactId>
+ <version>${java-activation.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.3.1</version>
+ </dependency>
+
<!-- Eclipselink JPA is the default JPA implementation used by
Roller, comment out this dependency and uncomment Hibernate's
to use that stack instead.
Logging, other special configuration during JUnit tests can be
- placed in the src/test/resources/roller-custom.properties
- file.
+ placed in the src/test/resources/roller-custom.properties file.
-->
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>eclipselink</artifactId>
<version>${eclipse-link.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>javax.persistence</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>javax.persistence</artifactId>
+ <version>2.1.1</version>
</dependency>
<!-- Alternative testing with Hibernate (used by default with JBoss)
diff --git a/app/src/main/java/org/apache/roller/weblogger/business/WebloggerImpl.java b/app/src/main/java/org/apache/roller/weblogger/business/WebloggerImpl.java
index 476ad89..be6be1a 100644
--- a/app/src/main/java/org/apache/roller/weblogger/business/WebloggerImpl.java
+++ b/app/src/main/java/org/apache/roller/weblogger/business/WebloggerImpl.java
@@ -18,9 +18,6 @@
package org.apache.roller.weblogger.business;
-import org.apache.roller.weblogger.business.plugins.PluginManager;
-import java.io.IOException;
-import java.util.Properties;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.planet.business.PlanetManager;
@@ -29,8 +26,9 @@
import org.apache.roller.weblogger.business.pings.AutoPingManager;
import org.apache.roller.weblogger.business.pings.PingQueueManager;
import org.apache.roller.weblogger.business.pings.PingTargetManager;
-import org.apache.roller.weblogger.business.search.IndexManager;
+import org.apache.roller.weblogger.business.plugins.PluginManager;
import org.apache.roller.weblogger.business.runnable.ThreadManager;
+import org.apache.roller.weblogger.business.search.IndexManager;
import org.apache.roller.weblogger.business.themes.ThemeManager;
import org.apache.roller.weblogger.config.PingConfig;
import org.apache.roller.weblogger.config.WebloggerConfig;
@@ -43,6 +41,9 @@
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParserFactory;
+import java.io.IOException;
+import java.util.Properties;
+
/**
* The abstract version of the Weblogger implementation.
diff --git a/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWebloggerImpl.java b/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWebloggerImpl.java
index a06c4da..0cc005d 100644
--- a/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWebloggerImpl.java
+++ b/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWebloggerImpl.java
@@ -21,21 +21,12 @@
import org.apache.roller.planet.business.PlanetURLStrategy;
import org.apache.roller.planet.business.fetcher.FeedFetcher;
import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.weblogger.business.BookmarkManager;
-import org.apache.roller.weblogger.business.FileContentManager;
-import org.apache.roller.weblogger.business.OAuthManager;
-import org.apache.roller.weblogger.business.MediaFileManager;
-import org.apache.roller.weblogger.business.PropertiesManager;
-import org.apache.roller.weblogger.business.URLStrategy;
-import org.apache.roller.weblogger.business.WebloggerImpl;
-import org.apache.roller.weblogger.business.UserManager;
-import org.apache.roller.weblogger.business.WeblogEntryManager;
-import org.apache.roller.weblogger.business.WeblogManager;
-import org.apache.roller.weblogger.business.runnable.ThreadManager;
+import org.apache.roller.weblogger.business.*;
import org.apache.roller.weblogger.business.pings.AutoPingManager;
import org.apache.roller.weblogger.business.pings.PingQueueManager;
import org.apache.roller.weblogger.business.pings.PingTargetManager;
import org.apache.roller.weblogger.business.plugins.PluginManager;
+import org.apache.roller.weblogger.business.runnable.ThreadManager;
import org.apache.roller.weblogger.business.search.IndexManager;
import org.apache.roller.weblogger.business.themes.ThemeManager;
diff --git a/app/src/main/resources/logback.xml b/app/src/main/resources/logback.xml
new file mode 100644
index 0000000..7d900d8
--- /dev/null
+++ b/app/src/main/resources/logback.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+ </pattern>
+ </encoder>
+ </appender>
+
+ <root level="INFO">
+ <appender-ref ref="STDOUT" />
+ </root>
+</configuration>
\ No newline at end of file
diff --git a/app/src/test/resources/roller-custom.properties b/app/src/test/resources/roller-custom.properties
index af72133..dd6a580 100644
--- a/app/src/test/resources/roller-custom.properties
+++ b/app/src/test/resources/roller-custom.properties
@@ -1,3 +1,4 @@
+
database.configurationType=jdbc
database.jdbc.driverClass=org.apache.derby.jdbc.ClientDriver
database.jdbc.connectionURL=jdbc:derby://localhost:4224/memory:rollerdb
diff --git a/pom.xml b/pom.xml
index 6af923f..99461fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,10 +61,15 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
+ <version>3.8.0</version>
<configuration>
+<<<<<<< HEAD
+ <source>10</source>
+ <target>10</target>
+=======
<source>1.8</source>
<target>1.8</target>
+>>>>>>> master
<fork>true</fork>
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
