diff --git a/grace-shell/build.gradle b/grace-shell/build.gradle index 3222ca32ca..2ed59f13a9 100644 --- a/grace-shell/build.gradle +++ b/grace-shell/build.gradle @@ -12,7 +12,34 @@ ext { } configurations { - dependenciesBom + dependenciesBom + runtimeClasspath { + exclude group: 'commons-codec', module: 'commons-codec' + exclude group: 'com.github.ben-manes.caffeine', module: 'caffeine' + exclude group: 'com.google.errorprone', module: 'error_prone_annotations' + exclude group: 'jakarta.annotation', module: 'jakarta.annotation-api' + exclude group: 'jakarta.inject', module: 'jakarta.inject-api' + exclude group: 'javax.annotation', module: 'javax.annotation-api' + exclude group: 'javax.inject', module: 'javax.inject' + exclude group: 'javax.persistence', module: 'javax.persistence-api' + exclude group: 'javax.transaction', module: 'javax.transaction-api' + exclude group: 'org.checkerframework', module: 'checker-qual' + exclude group: 'org.apache.ant', module: 'ant-antlr' + exclude group: 'org.apache.ant', module: 'ant-junit' + exclude group: 'org.apache.commons', module: 'commons-compress' + exclude group: 'org.codehaus.groovy', module: 'groovy-groovydoc' + exclude group: 'org.codehaus.groovy', module: 'groovy-jmx' + exclude group: 'org.codehaus.plexus', module: 'plexus-classworlds' + exclude group: 'org.codehaus.plexus', module: 'plexus-component-annotations' + exclude group: 'org.codehaus.plexus', module: 'plexus-sec-dispatcher' + exclude group: 'org.javassist', module: 'javassist' + exclude group: 'org.springframework', module: 'spring-aop' + exclude group: 'org.springframework', module: 'spring-expression' + exclude group: 'org.springframework', module: 'spring-jcl' + exclude group: 'org.springframework', module: 'spring-tx' + exclude group: 'org.springframework', module: 'spring-web' + exclude group: 'org.springframework.boot', module: 'spring-boot-autoconfigure' + } } dependencies { diff --git a/gradle/assemble.gradle b/gradle/assemble.gradle index a692e738c5..890f7f6f4c 100644 --- a/gradle/assemble.gradle +++ b/gradle/assemble.gradle @@ -6,7 +6,7 @@ def libsConfigurations = [] subprojects { subproject -> if(subproject.name == 'grace-dependencies') return if(subproject.name == 'grace-bom') return - if(subproject.name == 'grace-shell' || subproject.name == 'grace-core') { + if(subproject.name == 'grace-shell') { configurations { libsConfigurations << libs { @@ -84,26 +84,6 @@ task configurePopulateDependencies { if (!projectNames.contains(dependency.name)) { populateDependencies.into("$dependency.group/$dependency.name/jars") { from artifact.file // this will trigger the actual download if necessary - def sourceJar = sourceArtifacts[dependency] - if (sourceJar) { - from sourceJar.file - } - def javadocJar = javadocArtifacts[dependency] - if (javadocJar) { - from javadocJar.file - } - } - - populateDependencies.into("$dependency.group/$dependency.name/jars") { - from artifact.file // this will trigger the actual download if necessary - def sourceJar = sourceArtifacts[dependency] - if (sourceJar) { - from sourceJar.file - } - def javadocJar = javadocArtifacts[dependency] - if (javadocJar) { - from javadocJar.file - } } populateDependencies.into("$dependency.group/$dependency.name") {