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/10/20 20:19:13 UTC
roller git commit: Upgraded to Guice 4.2.1 and now Roller tests run
successfully under Java 10, have not tried 11 yet.
Repository: roller
Updated Branches:
refs/heads/java10 8192321fd -> 922929b11
Upgraded to Guice 4.2.1 and now Roller tests run successfully under Java 10, have not tried 11 yet.
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/922929b1
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/922929b1
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/922929b1
Branch: refs/heads/java10
Commit: 922929b11e1b88ced8603745add1cdaaac654dfe
Parents: 8192321
Author: Dave Johnson <sn...@gmail.com>
Authored: Sat Oct 20 16:19:09 2018 -0400
Committer: Dave Johnson <sn...@gmail.com>
Committed: Sat Oct 20 16:19:09 2018 -0400
----------------------------------------------------------------------
app/pom.xml | 21 +++++++---
.../business/CdiWebloggerProvider.java | 41 --------------------
app/src/test/resources/roller-custom.properties | 2 -
3 files changed, 16 insertions(+), 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/roller/blob/922929b1/app/pom.xml
----------------------------------------------------------------------
diff --git a/app/pom.xml b/app/pom.xml
index 4d6910a..aedffc3 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)
http://git-wip-us.apache.org/repos/asf/roller/blob/922929b1/app/src/main/java/org/apache/roller/weblogger/business/CdiWebloggerProvider.java
----------------------------------------------------------------------
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 eaf8c09..0000000
--- 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;
- }
-}
http://git-wip-us.apache.org/repos/asf/roller/blob/922929b1/app/src/test/resources/roller-custom.properties
----------------------------------------------------------------------
diff --git a/app/src/test/resources/roller-custom.properties b/app/src/test/resources/roller-custom.properties
index 62da734..dd6a580 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