[thredds] 10/26: WIP: Test

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch ichec/master
in repository thredds.

commit cc7d1fa4d9c33054c2969a9fd5f3b49813c2f744
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Tue Jul 19 16:44:11 2016 +0100

    WIP: Test
---
 debian/control           |  2 +-
 debian/maven.ignoreRules |  2 +-
 debian/rules             | 17 +++--------------
 3 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/debian/control b/debian/control
index 0615e03..19597a5 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends-Indep: libmaven-shade-plugin-java, libmaven-war-plugin-java, libco
  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
+ libquartz-java, libjbzip2-java, libspock-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/maven.ignoreRules b/debian/maven.ignoreRules
index f958231..76b8b1c 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -6,7 +6,7 @@ junit junit * * * *
 net.sourceforge.cobertura cobertura * * * *
 org.apache.maven.wagon wagon-http-lightweight * * * *
 org.grails grails-docs * * * *
-org.spockframework spock-core * * * *
+#org.spockframework spock-core * * * *
 org.xhtmlrenderer core-renderer * * * *
 org.yaml snakeyaml * * * *
 radeox radeox * * * *
diff --git a/debian/rules b/debian/rules
index 5eeace0..c126d56 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,18 +3,7 @@
 export JAVA_HOME=/usr/lib/jvm/default-java
 
 %:
-	dh $@ --buildsystem=gradle --with maven_repo_helper
+	dh $@ --with maven_repo_helper
 
-override_dh_auto_build:
-	dh_auto_build -- --project-prop finalRelease=true  -x zipDoc -x zipSrc \
-		assemble documentation
-#-Pgpars_groovyVersion=2.x
-
-get-orig-source:
-		cd $(dir $(firstword $(MAKEFILE_LIST)))../ && \
-		uscan \
-			--verbose \
-			--no-symlink \
-			--destdir $(CURDIR)      \
-			--watchfile debian/watch \
-			--force-download
+override_jh_build:
+	jh_build --javacopts='-source 7 -target 7'

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/thredds.git