From 544a78f395b4e62f9450d15ade584dc691aca7ca Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Mon, 21 Dec 2020 17:42:55 +0100
Subject: [PATCH] Fixed test failures due to missing dependencies

Former-commit-id: 17d8b484372e2e8d1d57bad51449cb737af571d8
---
 ccm-cms/pom.xml                                  |  4 ++--
 ccm-core/pom.xml                                 |  4 ++--
 .../main/java/org/libreccm/core/CcmObject.java   | 16 +++++++++++++++-
 .../org/libreccm/core/CcmObjectRepositoryIT.java | 14 +++++++++-----
 .../org/libreccm/security/UserRepositoryIT.java  |  3 +--
 ccm-shortcuts/pom.xml                            |  4 ++--
 pom.xml                                          |  6 +++---
 7 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/ccm-cms/pom.xml b/ccm-cms/pom.xml
index 9c339d900..e613814b0 100644
--- a/ccm-cms/pom.xml
+++ b/ccm-cms/pom.xml
@@ -79,12 +79,12 @@
         <dependency>
             <groupId>org.eclipse.krazo</groupId>
             <artifactId>krazo-core</artifactId>
-            <scope>provided</scope>
+            <!--<scope>provided</scope>-->
         </dependency>
         <dependency>
             <groupId>org.eclipse.krazo.ext</groupId>
             <artifactId>krazo-freemarker</artifactId>
-            <scope>provided</scope>
+            <!--<scope>provided</scope>-->
         </dependency>
         
         <dependency>
diff --git a/ccm-core/pom.xml b/ccm-core/pom.xml
index 49f1dedf2..b40f55faf 100644
--- a/ccm-core/pom.xml
+++ b/ccm-core/pom.xml
@@ -110,12 +110,12 @@
         <dependency>
             <groupId>org.eclipse.krazo</groupId>
             <artifactId>krazo-core</artifactId>
-            <scope>provided</scope>
+            <!--<scope>provided</scope>-->
         </dependency>
         <dependency>
             <groupId>org.eclipse.krazo.ext</groupId>
             <artifactId>krazo-freemarker</artifactId>
-            <scope>provided</scope>
+            <!--<scope>provided</scope>-->
         </dependency>
 
         <!--
diff --git a/ccm-core/src/main/java/org/libreccm/core/CcmObject.java b/ccm-core/src/main/java/org/libreccm/core/CcmObject.java
index fdd50c7ea..76c81e540 100644
--- a/ccm-core/src/main/java/org/libreccm/core/CcmObject.java
+++ b/ccm-core/src/main/java/org/libreccm/core/CcmObject.java
@@ -29,11 +29,11 @@ import org.libreccm.categorization.Category;
 import org.libreccm.categorization.CategoryManager;
 import org.libreccm.security.Permission;
 
-import javax.persistence.*;
 import javax.validation.constraints.NotNull;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElementWrapper;
 import javax.xml.bind.annotation.XmlRootElement;
+
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -43,6 +43,20 @@ import java.util.Objects;
 import static org.libreccm.core.CoreConstants.CORE_XML_NS;
 import static org.libreccm.core.CoreConstants.DB_SCHEMA;
 
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.NamedQueries;
+import javax.persistence.NamedQuery;
+import javax.persistence.OneToMany;
+import javax.persistence.OrderBy;
+import javax.persistence.Table;
+
 /**
  * Root class of all entities in LibreCCM which need categorisation and
  * permission services.
diff --git a/ccm-core/src/test/java/org/libreccm/core/CcmObjectRepositoryIT.java b/ccm-core/src/test/java/org/libreccm/core/CcmObjectRepositoryIT.java
index ae6682fd3..8ff80dfa9 100644
--- a/ccm-core/src/test/java/org/libreccm/core/CcmObjectRepositoryIT.java
+++ b/ccm-core/src/test/java/org/libreccm/core/CcmObjectRepositoryIT.java
@@ -18,7 +18,8 @@
  */
 package org.libreccm.core;
 
-import static org.hamcrest.CoreMatchers.*;
+
+import static org.libreccm.testutils.DependenciesHelpers.getModuleDependencies;
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.container.test.api.ShouldThrowException;
@@ -46,16 +47,18 @@ import javax.inject.Inject;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 
-import static org.junit.Assert.*;
-
-import static org.libreccm.testutils.DependenciesHelpers.*;
-
 import org.jboss.arquillian.persistence.CleanupUsingScript;
 
 import java.util.Optional;
 
 import org.jboss.arquillian.persistence.TestExecutionPhase;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.nullValue;
+
 /**
  * Tests for the {@link CcmObjectRepository} which is the foundation for many
  * other repositories in LibreCCM.
@@ -111,6 +114,7 @@ public class CcmObjectRepositoryIT {
             )
             .addAsResource("configs/shiro.ini", "shiro.ini")
             .addAsWebInfResource("test-web.xml", "web.xml")
+            .addAsResource(EmptyAsset.INSTANCE, "META-INF/beans.xml")
             .addAsWebInfResource(EmptyAsset.INSTANCE, "WEB-INF/beans.xml");
     }
 
diff --git a/ccm-core/src/test/java/org/libreccm/security/UserRepositoryIT.java b/ccm-core/src/test/java/org/libreccm/security/UserRepositoryIT.java
index 25d6665ed..2d0dedbd8 100644
--- a/ccm-core/src/test/java/org/libreccm/security/UserRepositoryIT.java
+++ b/ccm-core/src/test/java/org/libreccm/security/UserRepositoryIT.java
@@ -35,8 +35,6 @@ import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.After;
 import org.junit.AfterClass;
 
-import static org.junit.Assert.*;
-
 import static org.libreccm.testutils.DependenciesHelpers.*;
 
 import org.jboss.arquillian.persistence.CleanupUsingScript;
@@ -54,6 +52,7 @@ import javax.persistence.PersistenceContext;
 
 import org.jboss.arquillian.persistence.TestExecutionPhase;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.not;
diff --git a/ccm-shortcuts/pom.xml b/ccm-shortcuts/pom.xml
index fc21ab4ff..2c93938f3 100644
--- a/ccm-shortcuts/pom.xml
+++ b/ccm-shortcuts/pom.xml
@@ -81,12 +81,12 @@
         <dependency>
             <groupId>org.eclipse.krazo</groupId>
             <artifactId>krazo-core</artifactId>
-            <scope>provided</scope>
+            <!--<scope>provided</scope>-->
         </dependency>
         <dependency>
             <groupId>org.eclipse.krazo.ext</groupId>
             <artifactId>krazo-freemarker</artifactId>
-            <scope>provided</scope>
+            <!--<scope>provided</scope>-->
         </dependency>
         
         <dependency>
diff --git a/pom.xml b/pom.xml
index abe3fa346..89091cab6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -839,13 +839,13 @@
             <dependency>
                 <groupId>org.wildfly.arquillian</groupId>
                 <artifactId>wildfly-arquillian-container-managed</artifactId>
-                <version>2.2.0.Final</version>
+                <version>3.0.1.Final</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.wildfly.arquillian</groupId>
                 <artifactId>wildfly-arquillian-container-remote</artifactId>
-                <version>2.2.0.Final</version>
+                <version>3.0.1.Final</version>
                 <scope>test</scope>
             </dependency>
 
@@ -864,7 +864,7 @@
             <dependency>
                 <groupId>org.jboss.logmanager</groupId>
                 <artifactId>jboss-logmanager</artifactId>
-                <version>2.1.16.Final</version>
+                <version>2.1.17.Final</version>
                 <scope>test</scope>
             </dependency>