From 30ab348a9bf88fa9b723dc4f36cfbb1ffa21222a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Spasic=CC=81?= Date: Tue, 11 Feb 2020 00:18:33 +0100 Subject: [PATCH] Removed jodd-all, sorry. --- jodd-all/build.gradle | 103 ------------------------------------------ settings.gradle | 3 +- 2 files changed, 1 insertion(+), 105 deletions(-) delete mode 100644 jodd-all/build.gradle diff --git a/jodd-all/build.gradle b/jodd-all/build.gradle deleted file mode 100644 index 172b35b37..000000000 --- a/jodd-all/build.gradle +++ /dev/null @@ -1,103 +0,0 @@ -ext.moduleName = 'Jodd Bundle' -ext.moduleDescription = 'Jodd bundle - all classes in one jar' - -apply plugin: 'java' -apply plugin: 'maven-publish' -apply plugin: 'signing' -apply from: "${gradleScriptDir}/provided.gradle" -apply from: "${gradleScriptDir}/publish-maven.gradle" - -group = 'org.jodd' - -dependencies { - implementation javaBundleModules() -} - -jar { - archiveBaseName = 'jodd-all' - javaBundleModules().each { subproject -> - from { subproject.sourceSets.main.output } - } -} - -task sourcesJar(type: Jar, dependsOn: classes) { - classifier = 'sources' - from javaBundleModules().sourceSets.main.allSource -} -task javadocJar(type: Jar, dependsOn: parent.javadocAll) { - classifier = 'javadoc' - //from javaBundleModules().javadoc.destinationDir - from "${parent.buildDir}/reports/javadoc" -} - -artifacts { - archives jar - archives sourcesJar - archives javadocJar -} - -publishing { - publications { - mavenJava(MavenPublication) { - rebuildAllDependencies(pom) - - // RE-sign the pom, as it has been modified - - pom.withXml { - def pomFile = file("${project.buildDir}/generated-pom.xml") - writeTo(pomFile) - def pomAscFile = signing.sign(pomFile).signatureFiles[0] - pomFile.delete() - } - - } - } -} - -def rebuildAllDependencies(pom) { - pom.withXml { - def root = asNode() - - root.remove(root.get("dependencies")) - - root.children().last() + { - delegate.dependencies { - } - } - - def node = root.children().last() - - def used = [] - - javaBundleModules().each { prj -> - prj.configurations.compile.allDependencies.each { dep -> - // ignore all Jodd dependencies - if (dep.group != "org.jodd") { - def fulldep = dep.name + ':' + dep.group + ':' + dep.version - - - if (!(fulldep in used)) { - used << fulldep - - def provided = false - prj.configurations.findByName("provided").allDependencies.each { depdep -> - if (depdep.name == dep.name && depdep.group == dep.group && depdep.version == dep.version) { - provided = true - } - } - - def depNode = new Node(node, "dependency") - - def groupNode = new Node(depNode, "groupId", dep.group) - def artifcatNode = new Node(depNode, "artifactId", dep.name) - def versionNode = new Node(depNode, "version", dep.version) - def optionalNode = new Node(depNode, "optional", true) - if (provided) { - def scopeNode = new Node(depNode, "scope", "provided") - } - } - } - } - } - } -} diff --git a/settings.gradle b/settings.gradle index fd298aa53..808cdb53e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,6 +1,5 @@ include 'distribution' -include 'jodd-all' include 'jodd-bean' include 'jodd-core' include 'jodd-db' @@ -20,4 +19,4 @@ include 'jodd-proxetta' include 'jodd-servlet' include 'jodd-vtor' -include 'jodd-bom' \ No newline at end of file +include 'jodd-bom'