Update build scripts

graceframework · Jun 11, 2024 · 888d366 · 888d366
1 parent e545cb6
commit 888d366
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 26 deletions.
diff --git a/grace-datastore-gorm-hibernate/build.gradle b/grace-datastore-gorm-hibernate/build.gradle
@@ -5,20 +5,16 @@ dependencies {
     api "org.graceframework:grace-datastore-gorm:$gormVersion"
     api "org.springframework:spring-orm:$springVersion"
     api("org.hibernate:hibernate-core-jakarta:$hibernate5Version") {
-        exclude group:'commons-logging', module:'commons-logging'
-        exclude group:'com.h2database', module:'h2'
-        exclude group:'commons-collections', module:'commons-collections'
-        exclude group:'org.slf4j', module:'jcl-over-slf4j'
-        exclude group:'org.slf4j', module:'slf4j-api'
-        exclude group:'org.slf4j', module:'slf4j-log4j12'
-        exclude group:'xml-apis', module:'xml-apis'
+        exclude group:'org.dom4j', module:'dom4j'
+        exclude group:'jakarta.activation', module:'jakarta.activation-api'
+        exclude group:'jakarta.annotation', module:'jakarta.annotation-api'
+        exclude group:'jakarta.persistence', module:'jakarta.persistence-api'
     }
     api("org.hibernate.validator:hibernate-validator:$hibernateValidatorVersion") {
         exclude group:'commons-logging', module:'commons-logging'
         exclude group:'commons-collections', module:'commons-collections'
         exclude group:'org.slf4j', module:'slf4j-api'
     }
-    api "jakarta.persistence:jakarta.persistence-api:$jpaVersion"
     api("jakarta.annotation:jakarta.annotation-api:$jakartaAnnotationVersion")
     api("jakarta.validation:jakarta.validation-api:$jakartaValidationVersion")
     api("jakarta.persistence:jakarta.persistence-api:$jpaVersion")
@@ -27,16 +23,8 @@ dependencies {
 
     compileOnly ("net.sf.ehcache:ehcache:2.10.6")
     compileOnly ("org.hibernate:hibernate-ehcache:$hibernate5Version") {
-        exclude group:'commons-collections', module:'commons-collections'
-        exclude group:'commons-logging', module:'commons-logging'
-        exclude group:'com.h2database', module:'h2'
         exclude group:'net.sf.ehcache', module:'ehcache'
-        exclude group:'net.sf.ehcache', module:'ehcache-core'
         exclude group:'org.hibernate', module:'hibernate-core'
-        exclude group:'org.slf4j', module:'jcl-over-slf4j'
-        exclude group:'org.slf4j', module:'slf4j-api'
-        exclude group:'org.slf4j', module:'slf4j-log4j12'
-        exclude group:'xml-apis', module:'xml-apis'
     }
 
     testImplementation "org.apache.groovy:groovy-test-junit5:$groovyVersion"

diff --git a/grace-plugin/build.gradle b/grace-plugin/build.gradle
@@ -21,16 +21,7 @@ dependencies {
         exclude group: 'org.graceframework', module: 'grace-datastore-gorm-validation'
     }
     api "org.graceframework:grace-datastore-gorm-support:$gormVersion"
-    api project(":grace-datastore-gorm-hibernate"), {
-        exclude group:'org.springframework', module:'spring-context'
-        exclude group:'org.springframework', module:'spring-core'
-        exclude group:'org.springframework', module:'spring-beans'
-        exclude group:'org.springframework', module:'spring-tx'
-        exclude group:'org.graceframework', module:'grace-bootstrap'
-        exclude group:'org.codehaus.groovy', module:'groovy-all'
-        exclude group:'org.graceframework', module:'grace-core'
-        exclude group:'javax.transaction', module:'jta'
-    }
+    api project(":grace-datastore-gorm-hibernate")
 
     testImplementation "jakarta.servlet:jakarta.servlet-api:$jakartaServletVersion"
     testImplementation "jakarta.persistence:jakarta.persistence-api:$jpaVersion"