[thredds] 18/26: test removing groovy, test, coverage deps
Alastair McKinstry
mckinstry at moszumanska.debian.org
Mon Oct 23 10:24:24 UTC 2017
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch ichec/master
in repository thredds.
commit 230240a6a1bf8dbbb96df4d855d960719c8f8dc7
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Mon May 15 14:48:36 2017 +0100
test removing groovy, test, coverage deps
---
debian/control | 9 ++-
debian/patches/fix-deps.patch | 154 ++++++++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 161 insertions(+), 3 deletions(-)
diff --git a/debian/control b/debian/control
index 19597a5..152757e 100644
--- a/debian/control
+++ b/debian/control
@@ -4,12 +4,15 @@ Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Alastair <mckinstry at debian.org>
Build-Depends: debhelper (>= 9), cdbs, default-jdk, gradle-debian-helper,
-Build-Depends-Indep: libmaven-shade-plugin-java, libmaven-war-plugin-java, libcommons-cli-java,
- libhttpclient-java, libhttpcore-java, libhttpmime-java, libjstl1.1-java,
+Build-Depends-Indep: libmaven-shade-plugin-java,
+ libmaven-war-plugin-java, libcommons-cli-java,
+ libhttpclient-java, libhttpcore-java, libhttpmime-java,
liblog4j2-java, libspring-web-servlet-java, libguava-java, libprotobuf-java,
libjoda-time-java, libjcip-annotations-java, libjdom2-java, libjsoup-java,
libspring-context-java, libspring-core-java, libspring-web-java,
- libquartz-java, libjbzip2-java, libspock-java
+ libquartz-java, libjbzip2-java, libspock-java,
+ libxmlunit-java,
+ libjtidy-java
Standards-Version: 3.9.8
Vcs-Git: git://anonscm.debian.org/pkg-java/thredds.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/thredds.git
diff --git a/debian/patches/fix-deps.patch b/debian/patches/fix-deps.patch
new file mode 100644
index 0000000..bf34e9a
--- /dev/null
+++ b/debian/patches/fix-deps.patch
@@ -0,0 +1,154 @@
+Index: thredds-4.6.10/gradle/dependencies.gradle
+===================================================================
+--- thredds-4.6.10.orig/gradle/dependencies.gradle
++++ thredds-4.6.10/gradle/dependencies.gradle
+@@ -114,18 +114,18 @@ libraries["com.eclipsesource.restfuse"]
+
+ libraries["httpunit"] = "httpunit:httpunit:1.7"
+
+-libraries["xmlunit-core"] = "org.xmlunit:xmlunit-core:2.3.0"
++// libraries["xmlunit-core"] = "org.xmlunit:xmlunit-core:2.3.0"
+
+ // These four are all for Spock.
+-libraries["spock-core"] = "org.spockframework:spock-core:1.0-groovy-2.4"
++// libraries["spock-core"] = "org.spockframework:spock-core:1.0-groovy-2.4"
+
+-libraries["groovy-all"] = "org.codehaus.groovy:groovy-all:2.4.7"
++// libraries["groovy-all"] = "org.codehaus.groovy:groovy-all:2.4.7"
+
+ // In Spock, allows mocking of classes (in addition to interfaces).
+-libraries["cglib-nodep"] = "cglib:cglib-nodep:3.2.4"
++// libraries["cglib-nodep"] = "cglib:cglib-nodep:3.2.4"
+
+ // In Spock, allows mocking of classes without default constructor (together with CGLIB).
+-libraries["objenesis"] = "org.objenesis:objenesis:2.4"
++// libraries["objenesis"] = "org.objenesis:objenesis:2.4"
+
+ ////////////////////////////////////////// Other //////////////////////////////////////////
+
+Index: thredds-4.6.10/buildSrc/build.gradle
+===================================================================
+--- thredds-4.6.10.orig/buildSrc/build.gradle
++++ thredds-4.6.10/buildSrc/build.gradle
+@@ -2,7 +2,7 @@ import javax.xml.parsers.DocumentBuilder
+ import javax.xml.parsers.SAXParserFactory
+ import javax.xml.transform.TransformerFactory
+
+-apply plugin: 'groovy'
++// apply plugin: 'groovy'
+ apply plugin: 'java-gradle-plugin' // Adds gradleApi() compile dep and gradleTestKit() testCompile dep.
+
+ // We'd normally apply the dependencies with something like:
+@@ -11,8 +11,8 @@ apply plugin: 'java-gradle-plugin' // A
+ // so "$rootDir" actually points to the directory that *this* file is in.
+ apply from: "../gradle/dependencies.gradle"
+
+-dependencies {
+- testCompile (libraries["spock-core"]) {
++//dependencies {
++ // testCompile (libraries["spock-core"]) {
+ // The Gradle API drags in the bundled version of Groovy that Gradle ships with (localGroovy()) –
+ // see https://discuss.gradle.org/t/unable-to-force-gradle-to-use-groovy-2-0-0-for-the-project/7021.
+ // Spock drags in another Groovy as a transitive dependency.
+@@ -29,11 +29,11 @@ dependencies {
+ //
+ // Our solution is to explicitly exclude any other Groovy dependencies whenever localGroovy() is already part
+ // of the configuration.
+- exclude group: 'org.codehaus.groovy', module: 'groovy-all'
+- }
++ // exclude group: 'org.codehaus.groovy', module: 'groovy-all'
++ // }
+
+- testCompile libraries["xmlunit-core"] // For comparing JNLP XML.
+-}
++ // testCompile libraries["xmlunit-core"] // For comparing JNLP XML.
++// }
+
+ /*
+ * The problem: certain XML-processing methods used in our tests – notably groovy.xml.XmlUtil.serialize() and
+Index: thredds-4.6.10/build.gradle
+===================================================================
+--- thredds-4.6.10.orig/build.gradle
++++ thredds-4.6.10/build.gradle
+@@ -69,11 +69,11 @@ buildscript {
+
+ apply from: "$rootDir/gradle/dependencies.gradle"
+
+-apply from: "$rootDir/gradle/testing.gradle"
++// apply from: "$rootDir/gradle/testing.gradle"
+ apply from: "$rootDir/gradle/java.gradle"
+-apply from: "$rootDir/gradle/coverage.gradle"
++// apply from: "$rootDir/gradle/coverage.gradle"
+ apply from: "$rootDir/gradle/archiving.gradle"
+
+ // Order dependency: publishing.gradle creates publications for artifacts created in fatJars.gradle.
+ apply from: "$rootDir/gradle/fatJars.gradle"
+-apply from: "$rootDir/gradle/publishing.gradle"
++// apply from: "$rootDir/gradle/publishing.gradle"
+Index: thredds-4.6.10/tds/build.gradle
+===================================================================
+--- thredds-4.6.10.orig/tds/build.gradle
++++ thredds-4.6.10/tds/build.gradle
+@@ -49,9 +49,9 @@ dependencies {
+ runtime libraries["hibernate-validator"]
+ runtime libraries["jaxen"]
+
+- testCompile libraries["spring-test"]
+- testCompile libraries["hamcrest-core"]
+- testCompile libraries["httpunit"]
++ // testCompile libraries["spring-test"]
++ // testCompile libraries["hamcrest-core"]
++ //testCompile libraries["httpunit"]
+
+ compile libraries["slf4j-api"]
+ runtime libraries["log4j-slf4j-impl"]
+Index: thredds-4.6.10/cdm/build.gradle
+===================================================================
+--- thredds-4.6.10.orig/cdm/build.gradle
++++ thredds-4.6.10/cdm/build.gradle
+@@ -2,7 +2,7 @@ description = "The NetCDF-Java Library i
+ "scientific data formats."
+ ext.title = "CDM core library"
+
+-apply plugin: 'groovy' // For Spock tests.
++// apply plugin: 'groovy' // For Spock tests.
+
+ dependencies {
+ compile project(':udunits')
+@@ -21,10 +21,10 @@ dependencies {
+ compile libraries["slf4j-api"]
+
+ // These 4 are all for Spock.
+- testCompile libraries["spock-core"]
+- testCompile libraries["groovy-all"]
+- testRuntime libraries["cglib-nodep"]
+- testRuntime libraries["objenesis"]
++ // testCompile libraries["spock-core"]
++ // testCompile libraries["groovy-all"]
++ // testRuntime libraries["cglib-nodep"]
++ // testRuntime libraries["objenesis"]
+ }
+
+ javadoc {
+Index: thredds-4.6.10/netcdf4/build.gradle
+===================================================================
+--- thredds-4.6.10.orig/netcdf4/build.gradle
++++ thredds-4.6.10/netcdf4/build.gradle
+@@ -2,7 +2,7 @@ description = "An IOSP for NetCDF-4 that
+ ext.title = "NetCDF-4 IOSP"
+ ext.url = "https://www.unidata.ucar.edu/software/netcdf/"
+
+-apply plugin: 'groovy' // For Spock tests.
++// apply plugin: 'groovy' // For Spock tests.
+
+ dependencies {
+ compile project(':cdm')
+@@ -10,6 +10,6 @@ dependencies {
+ compile libraries["slf4j-api"]
+
+ // These are for Spock.
+- testCompile libraries["groovy-all"]
+- testCompile libraries["spock-core"]
++ // testCompile libraries["groovy-all"]
++ // testCompile libraries["spock-core"]
+ }
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..a8828c4
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix-deps.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/thredds.git
More information about the debian-science-commits
mailing list