[gradle] 06/09: Drop generate_classpath.gradle: Gradle uses its own mechanism to load classes, if hardcode classpath into the JARS, 2 sets of classes will be loaded into JVM
Kai-Chung Yan
seamlik-guest at moszumanska.debian.org
Thu Sep 8 07:19:03 UTC 2016
This is an automated email from the git hooks/post-receive script.
seamlik-guest pushed a commit to branch master
in repository gradle.
commit 0f4572aee5907da2ebe695f76071783b1a6b5860
Author: Kai-Chung Yan (殷啟聰) <seamlikok at gmail.com>
Date: Wed Sep 7 23:00:01 2016 +0800
Drop generate_classpath.gradle: Gradle uses its own mechanism to load classes, if hardcode classpath into the JARS, 2 sets of classes will be loaded into JVM
---
debian/generate_classpath.gradle | 24 ------------------------
debian/patches/generate_classpath.diff | 18 ------------------
debian/patches/series | 1 -
3 files changed, 43 deletions(-)
diff --git a/debian/generate_classpath.gradle b/debian/generate_classpath.gradle
deleted file mode 100644
index b9a10b1..0000000
--- a/debian/generate_classpath.gradle
+++ /dev/null
@@ -1,24 +0,0 @@
-subprojects {
- apply plugin: 'java'
- jar {
- doFirst {
- if (archivesBaseName != 'gradle-launcher') {
- def propertiesFile = file("build/generated-resources/main/${archivesBaseName}-classpath.properties")
- def classpathContent = new StringBuilder()
- def classpaths = []
- propertiesFile.eachLine {
- if (it.startsWith('projects')) {
- it.substring(9).split(',').each { classpaths << "${it}.jar" }
- }
- if (it.startsWith('runtime')) {
- it.substring(8).split(',').each { classpaths << it }
- }
- }
- classpaths.toSorted().each { classpathContent << it << ' ' }
- manifest {
- attributes('Class-Path': classpathContent.toString())
- }
- }
- }
- }
-}
\ No newline at end of file
diff --git a/debian/patches/generate_classpath.diff b/debian/patches/generate_classpath.diff
deleted file mode 100644
index d35a0bc..0000000
--- a/debian/patches/generate_classpath.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-Description:
- generate_classpath.gradle makes every Java libraries auto generate Class-Path
- attributes in the manifest.
- Gradle uses its own mechanism to manage Jar dependencies through another
- file, but providing the Class-Path will help other Java libraries using Gradle
- libraries. Do so also clears the Lintian warning about mising classpath.
-Author: Kai-Chung Yan <seamlikok at gmail.com>
-Lasy-Update: 2015-10-03
---- a/build.gradle
-+++ b/build.gradle
-@@ -109,6 +109,7 @@
- }
-
- apply from: 'gradle/buildSplits.gradle'
-+apply from: 'debian/generate_classpath.gradle'
- ext {
- jvm = org.gradle.internal.jvm.Jvm.current()
- javaVersion = JavaVersion.current()
diff --git a/debian/patches/series b/debian/patches/series
index df44837..28e1c17 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,7 +11,6 @@ jcommander.diff
nekohtml.diff
relax_warnings.diff
eclipse-aether.diff
-generate_classpath.diff
generate_pom.diff
ivy-2.4.0.patch
maven-3.3-compatibility.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gradle.git
More information about the pkg-java-commits
mailing list