Merge branch 'master' into development

DICE-UNC · Nov 13, 2019 · d962cdb · d962cdb
2 parents 2134be7 + 244e9ad
commit d962cdb
Show file tree

Hide file tree

Showing 23 changed files with 876 additions and 2,336 deletions.
diff --git a/emc-metalnx-core/pom.xml b/emc-metalnx-core/pom.xml
@@ -25,8 +25,6 @@
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-core</artifactId>
-			<!-- <exclusions> <exclusion> <groupId>dom4j</groupId> <artifactId>dom4j</artifactId> 
-				</exclusion> </exclusions> -->
 		</dependency>
 		<dependency>
 			<groupId>org.hibernate</groupId>
@@ -37,8 +35,6 @@
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-envers</artifactId>
 			<version>${hibernate.version}</version>
-			<!-- <exclusions> <exclusion> <groupId>dom4j</groupId> <artifactId>dom4j</artifactId> 
-				</exclusion> </exclusions> -->
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -90,7 +86,6 @@
 			<artifactId>dom4j</artifactId>
 		</dependency>
 	</dependencies>
-
 	<build>
 		<plugins>
 			<!-- Plugin required to build java classes from XSD using XJC -->
@@ -281,8 +276,6 @@
 					</execution>
 				</executions>
 			</plugin>
-
-
 		</plugins>
 	</build>
 </project>
diff --git a/emc-metalnx-core/src/main/java/com/emc/metalnx/core/domain/dao/GroupBookmarkDao.java b/emc-metalnx-core/src/main/java/com/emc/metalnx/core/domain/dao/GroupBookmarkDao.java
diff --git a/emc-metalnx-core/src/main/java/com/emc/metalnx/core/domain/dao/GroupDao.java b/emc-metalnx-core/src/main/java/com/emc/metalnx/core/domain/dao/GroupDao.java
diff --git a/emc-metalnx-core/src/main/java/com/emc/metalnx/core/domain/dao/UserProfileDao.java b/emc-metalnx-core/src/main/java/com/emc/metalnx/core/domain/dao/UserProfileDao.java