From b7f4daac1fbfc45cd282399c652158769b5d0dba Mon Sep 17 00:00:00 2001
From: Dave Johnson <snoopdave@gmail.com>
Date: Sun, 2 Sep 2018 15:47:54 -0400
Subject: [PATCH 01/12] Beginning of a CDI based weblogger provider.

---
 app/pom.xml                                   | 33 +++++++++++++----
 .../business/CdiWebloggerProvider.java        | 36 +++++++++++++++++++
 pom.xml                                       |  6 ++--
 3 files changed, 66 insertions(+), 9 deletions(-)
 create mode 100644 app/src/main/java/org/apache/roller/weblogger/business/CdiWebloggerProvider.java

diff --git a/app/pom.xml b/app/pom.xml
index 44b7882134..843da76b3f 100644
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -33,6 +33,13 @@ limitations under the License.
     <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>
@@ -40,10 +47,7 @@ limitations under the License.
         <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>
+        <guice.version>4.2.0</guice.version>
         <log4j.version>1.2.17</log4j.version>
         <log4j2.version>2.8.2</log4j2.version>
         <lucene.version>4.10.4</lucene.version>
@@ -52,7 +56,6 @@ limitations under the License.
         <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 +65,11 @@ limitations under the License.
         <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>
@@ -102,6 +105,24 @@ limitations under the License.
             </exclusions>
         </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.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.enterprise</groupId>
+            <artifactId>cdi-api</artifactId>
+            <version>2.0</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.
diff --git a/app/src/main/java/org/apache/roller/weblogger/business/CdiWebloggerProvider.java b/app/src/main/java/org/apache/roller/weblogger/business/CdiWebloggerProvider.java
new file mode 100644
index 0000000000..e879ff5158
--- /dev/null
+++ b/app/src/main/java/org/apache/roller/weblogger/business/CdiWebloggerProvider.java
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  The ASF licenses this file to You
+ * under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.  For additional information regarding
+ * copyright in this work, please see the NOTICE file in the top level
+ * directory of this distribution.
+ */
+
+package org.apache.roller.weblogger.business;
+
+import org.apache.roller.weblogger.business.BootstrapException;
+import org.apache.roller.weblogger.business.Weblogger;
+import org.apache.roller.weblogger.business.WebloggerProvider;
+
+
+public class CdiWebloggerProvider implements WebloggerProvider {
+    @Override
+    public void bootstrap() throws BootstrapException {
+
+    }
+
+    @Override
+    public Weblogger getWeblogger() {
+        return null;
+    }
+}
diff --git a/pom.xml b/pom.xml
index 4e3d92f1a9..d2eb5d5ec6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,10 +61,10 @@ limitations under the License.
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.1</version>
+                    <version>3.8.0</version>
                     <configuration>
-                        <source>1.7</source>
-                        <target>1.7</target>
+                        <source>10</source>
+                        <target>10</target>
                         <fork>true</fork>
                         <encoding>${project.build.sourceEncoding}</encoding>
                     </configuration>

From 8192321fde942c4d802a4697d3ba9d3119a244ea Mon Sep 17 00:00:00 2001
From: Dave Johnson <snoopdave@gmail.com>
Date: Sat, 20 Oct 2018 14:47:57 -0400
Subject: [PATCH 02/12] So far unsuccessful experiments with
 CdiWebloggerProvider

---
 app/pom.xml                                   |  6 ++++
 .../business/CdiWebloggerProvider.java        | 15 ++++++----
 .../weblogger/business/WebloggerImpl.java     |  2 ++
 .../business/jpa/JPAWebloggerImpl.java        |  3 ++
 app/src/main/resources/META-INF/beans.xml     | 23 ++++++++++++++
 app/src/main/resources/logback.xml            | 13 ++++++++
 .../roller/weblogger/business/SimpleTest.java | 30 +++++++++++++++++++
 .../test/resources/roller-custom.properties   |  3 ++
 8 files changed, 90 insertions(+), 5 deletions(-)
 create mode 100644 app/src/main/resources/META-INF/beans.xml
 create mode 100644 app/src/main/resources/logback.xml
 create mode 100644 app/src/test/java/org/apache/roller/weblogger/business/SimpleTest.java

diff --git a/app/pom.xml b/app/pom.xml
index 843da76b3f..4d6910a0fe 100644
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -370,6 +370,12 @@ limitations under the License.
             <version>${guice.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.jboss.weld.se</groupId>
+            <artifactId>weld-se-core</artifactId>
+            <version>3.0.5.Final</version>
+        </dependency>
+
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
diff --git a/app/src/main/java/org/apache/roller/weblogger/business/CdiWebloggerProvider.java b/app/src/main/java/org/apache/roller/weblogger/business/CdiWebloggerProvider.java
index e879ff5158..eaf8c095a3 100644
--- a/app/src/main/java/org/apache/roller/weblogger/business/CdiWebloggerProvider.java
+++ b/app/src/main/java/org/apache/roller/weblogger/business/CdiWebloggerProvider.java
@@ -18,19 +18,24 @@
 
 package org.apache.roller.weblogger.business;
 
-import org.apache.roller.weblogger.business.BootstrapException;
-import org.apache.roller.weblogger.business.Weblogger;
-import org.apache.roller.weblogger.business.WebloggerProvider;
+import org.apache.roller.weblogger.business.jpa.JPAWebloggerImpl;
+import org.jboss.weld.environment.se.Weld;
+import org.jboss.weld.environment.se.WeldContainer;
 
 
 public class CdiWebloggerProvider implements WebloggerProvider {
+
+    Weblogger weblogger;
+
     @Override
     public void bootstrap() throws BootstrapException {
-
+        Weld weld = new Weld();
+        WeldContainer container = weld.initialize();
+        weblogger = container.select(JPAWebloggerImpl.class).get();
     }
 
     @Override
     public Weblogger getWeblogger() {
-        return null;
+        return weblogger;
     }
 }
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 1cf635938a..53894fc9cf 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
@@ -34,6 +34,8 @@
 import org.apache.roller.weblogger.business.themes.ThemeManager;
 import org.apache.roller.weblogger.config.PingConfig;
 
+import javax.enterprise.inject.Alternative;
+
 
 /**
  * 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 a06c4dad58..b612f18dc2 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
@@ -39,10 +39,13 @@
 import org.apache.roller.weblogger.business.search.IndexManager;
 import org.apache.roller.weblogger.business.themes.ThemeManager;
 
+import javax.enterprise.inject.Default;
+
 /**
  * A JPA specific implementation of the Weblogger business layer.
  */
 @com.google.inject.Singleton
+@Default
 public class JPAWebloggerImpl extends WebloggerImpl {
 
     // a persistence utility class
diff --git a/app/src/main/resources/META-INF/beans.xml b/app/src/main/resources/META-INF/beans.xml
new file mode 100644
index 0000000000..402c56414b
--- /dev/null
+++ b/app/src/main/resources/META-INF/beans.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<beans xmlns="http://java.sun.com/xml/ns/javaee"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+  http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
+</beans>
diff --git a/app/src/main/resources/logback.xml b/app/src/main/resources/logback.xml
new file mode 100644
index 0000000000..7d900d8ea8
--- /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/java/org/apache/roller/weblogger/business/SimpleTest.java b/app/src/test/java/org/apache/roller/weblogger/business/SimpleTest.java
new file mode 100644
index 0000000000..0284a903c0
--- /dev/null
+++ b/app/src/test/java/org/apache/roller/weblogger/business/SimpleTest.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  The ASF licenses this file to You
+ * under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.  For additional information regarding
+ * copyright in this work, please see the NOTICE file in the top level
+ * directory of this distribution.
+ */
+
+package org.apache.roller.weblogger.business;
+
+import org.apache.roller.weblogger.TestUtils;
+import org.junit.Test;
+
+public class SimpleTest {
+
+    @Test
+    public void testSetupWeblogger() throws Exception {
+        TestUtils.setupWeblogger();
+    }
+}
diff --git a/app/src/test/resources/roller-custom.properties b/app/src/test/resources/roller-custom.properties
index af72133ad2..62da734881 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
@@ -14,6 +15,8 @@ hibernate.transaction.factory_class=org.hibernate.transaction.JDBCTransactionFac
 
 # turn off transaction manager during JUnit testing (TODO: find way to activate for JUnit tests)
 
+weblogger.provider.class=org.apache.roller.weblogger.business.CdiWebloggerProvider
+
 # use plain text passwords in testing
 passwds.encryption.enabled=false
 

From 922929b11e1b88ced8603745add1cdaaac654dfe Mon Sep 17 00:00:00 2001
From: Dave Johnson <snoopdave@gmail.com>
Date: Sat, 20 Oct 2018 16:19:09 -0400
Subject: [PATCH 03/12] Upgraded to Guice 4.2.1 and now Roller tests run
 successfully under Java 10, have not tried 11 yet.

---
 app/pom.xml                                   | 21 +++++++---
 .../business/CdiWebloggerProvider.java        | 41 -------------------
 .../test/resources/roller-custom.properties   |  2 -
 3 files changed, 16 insertions(+), 48 deletions(-)
 delete mode 100644 app/src/main/java/org/apache/roller/weblogger/business/CdiWebloggerProvider.java

diff --git a/app/pom.xml b/app/pom.xml
index 4d6910a0fe..aedffc3350 100644
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -46,8 +46,8 @@ limitations under the License.
         <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.2.0</guice.version>
+        <eclipse-link.version>2.7.3</eclipse-link.version>
+        <guice.version>4.2.1</guice.version>
         <log4j.version>1.2.17</log4j.version>
         <log4j2.version>2.8.2</log4j2.version>
         <lucene.version>4.10.4</lucene.version>
@@ -114,7 +114,7 @@ limitations under the License.
         <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
-            <version>2.3.0</version>
+            <version>2.3.1</version>
         </dependency>
 
         <dependency>
@@ -128,13 +128,24 @@ limitations under the License.
              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/CdiWebloggerProvider.java b/app/src/main/java/org/apache/roller/weblogger/business/CdiWebloggerProvider.java
deleted file mode 100644
index eaf8c095a3..0000000000
--- a/app/src/main/java/org/apache/roller/weblogger/business/CdiWebloggerProvider.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  The ASF licenses this file to You
- * under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.  For additional information regarding
- * copyright in this work, please see the NOTICE file in the top level
- * directory of this distribution.
- */
-
-package org.apache.roller.weblogger.business;
-
-import org.apache.roller.weblogger.business.jpa.JPAWebloggerImpl;
-import org.jboss.weld.environment.se.Weld;
-import org.jboss.weld.environment.se.WeldContainer;
-
-
-public class CdiWebloggerProvider implements WebloggerProvider {
-
-    Weblogger weblogger;
-
-    @Override
-    public void bootstrap() throws BootstrapException {
-        Weld weld = new Weld();
-        WeldContainer container = weld.initialize();
-        weblogger = container.select(JPAWebloggerImpl.class).get();
-    }
-
-    @Override
-    public Weblogger getWeblogger() {
-        return weblogger;
-    }
-}
diff --git a/app/src/test/resources/roller-custom.properties b/app/src/test/resources/roller-custom.properties
index 62da734881..dd6a580a10 100644
--- a/app/src/test/resources/roller-custom.properties
+++ b/app/src/test/resources/roller-custom.properties
@@ -15,8 +15,6 @@ hibernate.transaction.factory_class=org.hibernate.transaction.JDBCTransactionFac
 
 # turn off transaction manager during JUnit testing (TODO: find way to activate for JUnit tests)
 
-weblogger.provider.class=org.apache.roller.weblogger.business.CdiWebloggerProvider
-
 # use plain text passwords in testing
 passwds.encryption.enabled=false
 

From 09708c03a98716f23e69715ba26d20d7a6572b57 Mon Sep 17 00:00:00 2001
From: Dave Johnson <snoopdave@gmail.com>
Date: Sun, 21 Oct 2018 09:08:28 -0400
Subject: [PATCH 04/12] Needed this change to avoid ClassNotFoundException:
 org.apache.logging.log4j.util.ReflectionUtil when running on Tomcat 8.

---
 app/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/pom.xml b/app/pom.xml
index aedffc3350..17a338c871 100644
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -49,7 +49,7 @@ limitations under the License.
         <eclipse-link.version>2.7.3</eclipse-link.version>
         <guice.version>4.2.1</guice.version>
         <log4j.version>1.2.17</log4j.version>
-        <log4j2.version>2.8.2</log4j2.version>
+        <log4j2.version>2.9.1</log4j2.version>
         <lucene.version>4.10.4</lucene.version>
         <oauth-core.version>20100527</oauth-core.version>
         <maven-war.version>3.1.0</maven-war.version>

From e56f3123cfe19e18f4aa5acf1770a0a87174743b Mon Sep 17 00:00:00 2001
From: Dave Johnson <snoopdave@gmail.com>
Date: Sun, 21 Oct 2018 13:52:50 -0400
Subject: [PATCH 05/12] Cleanup abandoned CDI efforts.

---
 app/pom.xml                                   | 12 --------
 .../roller/weblogger/business/SimpleTest.java | 30 -------------------
 2 files changed, 42 deletions(-)
 delete mode 100644 app/src/test/java/org/apache/roller/weblogger/business/SimpleTest.java

diff --git a/app/pom.xml b/app/pom.xml
index 17a338c871..bdff10b768 100644
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -117,12 +117,6 @@ limitations under the License.
             <version>2.3.1</version>
         </dependency>
 
-        <dependency>
-            <groupId>javax.enterprise</groupId>
-            <artifactId>cdi-api</artifactId>
-            <version>2.0</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.
@@ -381,12 +375,6 @@ limitations under the License.
             <version>${guice.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.jboss.weld.se</groupId>
-            <artifactId>weld-se-core</artifactId>
-            <version>3.0.5.Final</version>
-        </dependency>
-
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
diff --git a/app/src/test/java/org/apache/roller/weblogger/business/SimpleTest.java b/app/src/test/java/org/apache/roller/weblogger/business/SimpleTest.java
deleted file mode 100644
index 0284a903c0..0000000000
--- a/app/src/test/java/org/apache/roller/weblogger/business/SimpleTest.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  The ASF licenses this file to You
- * under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.  For additional information regarding
- * copyright in this work, please see the NOTICE file in the top level
- * directory of this distribution.
- */
-
-package org.apache.roller.weblogger.business;
-
-import org.apache.roller.weblogger.TestUtils;
-import org.junit.Test;
-
-public class SimpleTest {
-
-    @Test
-    public void testSetupWeblogger() throws Exception {
-        TestUtils.setupWeblogger();
-    }
-}

From 3daa8a7fa1ac0173190197c8201b41590dafa009 Mon Sep 17 00:00:00 2001
From: Dave Johnson <snoopdave@gmail.com>
Date: Sun, 21 Oct 2018 13:58:19 -0400
Subject: [PATCH 06/12] Cleanup abandoned CDI efforts.

---
 .../weblogger/business/WebloggerImpl.java     |  9 ++++----
 .../business/jpa/JPAWebloggerImpl.java        | 16 ++-----------
 app/src/main/resources/META-INF/beans.xml     | 23 -------------------
 3 files changed, 6 insertions(+), 42 deletions(-)
 delete mode 100644 app/src/main/resources/META-INF/beans.xml

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 53894fc9cf..e7e7e14303 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,12 +26,14 @@
 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 javax.enterprise.inject.Alternative;
+import java.io.IOException;
+import java.util.Properties;
 
 
 /**
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 b612f18dc2..0cc005d7f6 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,31 +21,19 @@
 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;
 
-import javax.enterprise.inject.Default;
-
 /**
  * A JPA specific implementation of the Weblogger business layer.
  */
 @com.google.inject.Singleton
-@Default
 public class JPAWebloggerImpl extends WebloggerImpl {
 
     // a persistence utility class
diff --git a/app/src/main/resources/META-INF/beans.xml b/app/src/main/resources/META-INF/beans.xml
deleted file mode 100644
index 402c56414b..0000000000
--- a/app/src/main/resources/META-INF/beans.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements.  See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<beans xmlns="http://java.sun.com/xml/ns/javaee"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
-  http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
-</beans>

From 9e94f5f0036dc704f5a4e0988766c7feb1f79121 Mon Sep 17 00:00:00 2001
From: Dave Johnson <snoopdave@gmail.com>
Date: Sun, 21 Oct 2018 14:00:21 -0400
Subject: [PATCH 07/12] Oops, I meant 11.

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index d2eb5d5ec6..84a72af4c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,8 +63,8 @@ limitations under the License.
                     <artifactId>maven-compiler-plugin</artifactId>
                     <version>3.8.0</version>
                     <configuration>
-                        <source>10</source>
-                        <target>10</target>
+                        <source>11</source>
+                        <target>11</target>
                         <fork>true</fork>
                         <encoding>${project.build.sourceEncoding}</encoding>
                     </configuration>

From ed48b479acea0fbee79c5ac1fcc0380d150cd06d Mon Sep 17 00:00:00 2001
From: Dave Johnson <snoopdave@gmail.com>
Date: Sun, 21 Oct 2018 14:21:14 -0400
Subject: [PATCH 08/12] I was wrong, Java 10 works by Java 11 fails. More work
 to do.

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 84a72af4c6..d2eb5d5ec6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,8 +63,8 @@ limitations under the License.
                     <artifactId>maven-compiler-plugin</artifactId>
                     <version>3.8.0</version>
                     <configuration>
-                        <source>11</source>
-                        <target>11</target>
+                        <source>10</source>
+                        <target>10</target>
                         <fork>true</fork>
                         <encoding>${project.build.sourceEncoding}</encoding>
                     </configuration>

From 3633dcb17490310742fe99a6cb9297a56525ea85 Mon Sep 17 00:00:00 2001
From: Dave Johnson <snoopdave@gmail.com>
Date: Wed, 30 Jan 2019 19:18:53 -0500
Subject: [PATCH 09/12] Fix merge problems

---
 app/pom.xml | 7 ++-----
 pom.xml     | 5 -----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/app/pom.xml b/app/pom.xml
index d6fad7d024..e35d452e8b 100644
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -47,13 +47,10 @@ limitations under the License.
         <commons-httpclient.version>3.1</commons-httpclient.version>
         <commons-codec.version>1.10</commons-codec.version>
         <eclipse-link.version>2.7.3</eclipse-link.version>
-        <guice.version>4.2.1</guice.version>
+        <guice.version>4.2.2</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
+        <!-- <log4j2.version>2.10.0</log4j2.version> -->
         <lucene.version>4.10.4</lucene.version>
         <oauth-core.version>20100527</oauth-core.version>
         <maven-war.version>3.1.0</maven-war.version>
diff --git a/pom.xml b/pom.xml
index 99461fa4fa..b004224d96 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,13 +63,8 @@ limitations under the License.
                     <artifactId>maven-compiler-plugin</artifactId>
                     <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>

From 07b51df0b7e1abebd41c1af1816217ea7c123eb3 Mon Sep 17 00:00:00 2001
From: Michael Bien <mbien42@gmail.com>
Date: Fri, 26 Apr 2019 00:57:22 +0200
Subject: [PATCH 10/12] Updated most maven dependencies which didn't require
 code changes. Tests are now green on (AdoptOpen)JDK 11 and 12 using language
 level 11 and 12. Added an explicit dependency to ASM 7.1 to better control
 which version is used and improve compatibility with latest bytecodes.

---
 app/pom.xml | 44 ++++++++++++++++++++++++++++++--------------
 pom.xml     |  8 ++++----
 2 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/app/pom.xml b/app/pom.xml
index e35d452e8b..fe56545524 100644
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -34,33 +34,32 @@ limitations under the License.
 
     <properties>
 
-        <servlet.version>3.0.1</servlet.version>
+        <servlet.version>4.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>
+        <angular.version>1.7.8</angular.version>
+        <ant.version>1.10.5</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.7.3</eclipse-link.version>
+        <commons-codec.version>1.12</commons-codec.version>
+        <eclipse-link.version>2.7.4</eclipse-link.version>
         <guice.version>4.2.2</guice.version>
         <log4j.version>1.2.17</log4j.version>
-        <log4j2.version>2.9.1</log4j2.version>
-        <!-- <log4j2.version>2.10.0</log4j2.version> -->
+        <log4j2.version>2.10.0</log4j2.version>
         <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>
-        <slf4j.version>1.7.25</slf4j.version>
+        <rome.version>1.12.0</rome.version>
+        <slf4j.version>1.7.26</slf4j.version>
         <spring.version>4.1.4.RELEASE</spring.version>
         <spring.security.version>3.2.5.RELEASE</spring.security.version>
-        <struts.version>2.5.17</struts.version>
+        <struts.version>2.5.20</struts.version>
         <velocity.version>1.7</velocity.version>
         <webjars.version>1.5</webjars.version>
         <ws-commons-util.version>1.0.2</ws-commons-util.version>
@@ -126,7 +125,7 @@ limitations under the License.
             <exclusions>
                 <exclusion>
                     <groupId>org.eclipse.persistence</groupId>
-                    <artifactId>javax.persistence</artifactId>
+                    <artifactId>jakarta.persistence</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
@@ -186,13 +185,30 @@ limitations under the License.
                 </exclusion>
             </exclusions>
         </dependency>
-
+        
         <dependency>
             <groupId>commons-collections</groupId>
             <artifactId>commons-collections</artifactId>
             <version>3.2.2</version>
         </dependency>
-
+        
+        <!-- explicitly adding newest asm lib to improve compatibility with latest JDKs -->
+        <dependency>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm</artifactId>
+            <version>7.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm-commons</artifactId>
+            <version>7.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm-tree</artifactId>
+            <version>7.1</version>
+        </dependency>
+        
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-core</artifactId>
@@ -636,7 +652,7 @@ limitations under the License.
 
             <plugin>
                 <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.7</version>
+                <version>1.8</version>
                 <dependencies>
                     <dependency>
                         <groupId>ant-contrib</groupId>
diff --git a/pom.xml b/pom.xml
index b004224d96..5653b9c71a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,8 +63,8 @@ limitations under the License.
                     <artifactId>maven-compiler-plugin</artifactId>
                     <version>3.8.0</version>
                     <configuration>
-                        <source>10</source>
-                        <target>10</target>
+                        <source>11</source>
+                        <target>11</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.4.11.v20180605</version>
+                    <version>9.4.17.v20190418</version>
                 </plugin>
                 <plugin>
                     <groupId>com.btmatthews.maven.plugins.inmemdb</groupId>
@@ -93,7 +93,7 @@ limitations under the License.
                 </plugin>
             </plugins>
         </pluginManagement>
-     </build>
+    </build>
 
     <dependencyManagement>
         <dependencies>

From e2d78305b72f3401396fd1e5a34da2cad6122792 Mon Sep 17 00:00:00 2001
From: Michael Bien <mbien42@gmail.com>
Date: Fri, 26 Apr 2019 01:53:33 +0200
Subject: [PATCH 11/12] updated .gitignore for NetBeans.

---
 .gitignore | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 24a37b64a1..979f59a01a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,11 @@
 *.iml
 *.iws
 
+# NetBeans
+/nb-configuration.xml
+/app/nb-configuration.xml
+/app/nbactions.xml
+
 # Mac
 .DS_Store
 
@@ -21,4 +26,4 @@ velocity.log
 
 tomcat-base
 deployment/docker-compose/postgresql-data
-deployment/docker-compose/roller-data
+deployment/docker-compose/roller-data
\ No newline at end of file

From d284c76ef5c4a9bea190939d5a4bef06703dae48 Mon Sep 17 00:00:00 2001
From: Michael Bien <mbien42@gmail.com>
Date: Sat, 27 Apr 2019 05:09:22 +0200
Subject: [PATCH 12/12] Changed 'eclipselink' artifact to
 'org.eclipse.persistence.jpa' + removed old 'javax.persistence' dependency.
 Both jakarta.persistence-2.2.2.jar and org.eclipse.persistence.jpa-2.7.4.jars
 are now signed and don't cause a security exception during classloading.
 Workaround of using old JPA API jar is no longer needed.

---
 app/pom.xml | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/app/pom.xml b/app/pom.xml
index fe56545524..9a0afa94b9 100644
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -120,20 +120,8 @@ limitations under the License.
          -->
         <dependency>
             <groupId>org.eclipse.persistence</groupId>
-            <artifactId>eclipselink</artifactId>
+            <artifactId>org.eclipse.persistence.jpa</artifactId>
             <version>${eclipse-link.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.eclipse.persistence</groupId>
-                    <artifactId>jakarta.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)