Fixing pom files publishing

dotCMS · Nov 22, 2022 · 11042a8 · 11042a8
1 parent b85c1e3
commit 11042a8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 15 deletions.
diff --git a/dotCMS/build.gradle b/dotCMS/build.gradle
@@ -199,10 +199,6 @@ else {
     targetCompatibility = JavaVersion.current()
 }
 
-
-
-def eeType = dotcmsReleaseVersion == "master" ? '-SNAPSHOT' : ''
-
 dependencies {
 
     //ajc "org.aspectj:aspectjtools:$aspectjVersion"
@@ -258,12 +254,6 @@ dependencies {
 
     //individualTestCompile sourceSets.test.output
     //integrationTestCompile sourceSets.test.output
-
-
-    if (!(project.gradle.startParameter.taskNames.contains('deployWarTomcatDev') || project.gradle.startParameter.taskNames.contains('testDev'))) {
-
-        implementation group: 'com.dotcms.enterprise', name: 'ee', version: dotcmsReleaseVersion + eeType, changing: true
-    }
 }
 
 import groovy.json.JsonSlurper

diff --git a/dotCMS/dependencies.gradle b/dotCMS/dependencies.gradle
@@ -1,6 +1,8 @@
 //noinspection GroovyAssignabilityCheck
 println( "loading dependencies")
-println( "loading dependencies")
+
+def eeType = dotcmsReleaseVersion == "master" ? '-SNAPSHOT' : ''
+
 dependencies {
 
     def immutablesVersion = "2.9.1"
@@ -48,6 +50,9 @@ dependencies {
     implementation group: 'com.dotcms.lib', name: 'dot.cos', version:'ukv_2'
     implementation group: 'com.dotcms.lib', name: 'dot.counter-ejb', version:'ukv_2'
     implementation group: 'com.dotcms.lib', name: 'dot.dwr', version:'3rc2modified_3'
+    if (!(project.gradle.startParameter.taskNames.contains('deployWarTomcatDev') || project.gradle.startParameter.taskNames.contains('testDev'))) {
+        implementation group: 'com.dotcms.enterprise', name: 'ee', version: dotcmsReleaseVersion + eeType, changing: true
+    }
 
     implementation group: 'com.lmax', name: 'disruptor', version: '3.3.4'
     implementation group: 'org.apache.commons', name: 'commons-math3', version: '3.6.1'

diff --git a/dotCMS/deploy.gradle b/dotCMS/deploy.gradle
@@ -244,10 +244,12 @@ uploadArchives {
                 pom(fileName).withXml {
                     def dependenciesNode = asNode().appendNode('dependencies')
                     configurations.implementation.allDependencies.each {
-                        def dependencyNode = dependenciesNode.appendNode('dependency')
-                        dependencyNode.appendNode('groupId', it.group)
-                        dependencyNode.appendNode('artifactId', it.name)
-                        dependencyNode.appendNode('version', it.version)
+                        if (it.group != null) {
+                            def dependencyNode = dependenciesNode.appendNode('dependency')
+                            dependencyNode.appendNode('groupId', it.group)
+                            dependencyNode.appendNode('artifactId', it.name)
+                            dependencyNode.appendNode('version', it.version)
+                        }
                     }
                 }