shiro-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bdem...@apache.org
Subject [1/2] shiro git commit: Fixed spring-hibernate example issue where optional jars would not resolve correctly when packaging
Date Thu, 15 Dec 2016 03:17:17 GMT
Repository: shiro
Updated Branches:
  refs/heads/master 505b0d564 -> 71282d677


Fixed spring-hibernate example issue where optional jars would not resolve correctly when
packaging


Project: http://git-wip-us.apache.org/repos/asf/shiro/repo
Commit: http://git-wip-us.apache.org/repos/asf/shiro/commit/59ffa691
Tree: http://git-wip-us.apache.org/repos/asf/shiro/tree/59ffa691
Diff: http://git-wip-us.apache.org/repos/asf/shiro/diff/59ffa691

Branch: refs/heads/master
Commit: 59ffa691910c201c2e9c2edc9fe87a5621cb189a
Parents: 505b0d5
Author: Brian Demers <bdemers@apache.org>
Authored: Wed Dec 14 17:29:15 2016 -0800
Committer: Brian Demers <bdemers@apache.org>
Committed: Wed Dec 14 17:29:15 2016 -0800

----------------------------------------------------------------------
 samples/spring-hibernate/pom.xml                          | 10 ++++------
 .../java/org/apache/shiro/samples/sprhib/model/Role.java  |  1 -
 2 files changed, 4 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/shiro/blob/59ffa691/samples/spring-hibernate/pom.xml
----------------------------------------------------------------------
diff --git a/samples/spring-hibernate/pom.xml b/samples/spring-hibernate/pom.xml
index a93edda..21c2af4 100644
--- a/samples/spring-hibernate/pom.xml
+++ b/samples/spring-hibernate/pom.xml
@@ -71,12 +71,6 @@
             <scope>compile</scope>
             <optional>false</optional>
         </dependency>
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-annotations</artifactId>
-            <scope>compile</scope>
-            <optional>false</optional>
-        </dependency>
         <!-- needed by Hibernate at runtime: -->
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
@@ -107,6 +101,10 @@
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
+            <artifactId>spring-jdbc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
             <artifactId>spring-webmvc</artifactId>
         </dependency>
 

http://git-wip-us.apache.org/repos/asf/shiro/blob/59ffa691/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/model/Role.java
----------------------------------------------------------------------
diff --git a/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/model/Role.java
b/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/model/Role.java
index 4c40d31..7af8b8b 100644
--- a/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/model/Role.java
+++ b/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/model/Role.java
@@ -20,7 +20,6 @@ package org.apache.shiro.samples.sprhib.model;
 
 import org.hibernate.annotations.Cache;
 import org.hibernate.annotations.CacheConcurrencyStrategy;
-import org.hibernate.annotations.CollectionOfElements;
 import org.hibernate.annotations.Index;
 
 import javax.persistence.*;


Mime
View raw message