[osmosis] 01/03: Removed the build dependency on checkstyle

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository osmosis.

commit abf6da4fac4a3122f14db4d9898b76f6e79154aa
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Dec 14 22:42:49 2015 +0100

    Removed the build dependency on checkstyle
---
 debian/changelog                           | 4 ++++
 debian/control                             | 1 -
 debian/patches/03-local-dependencies.patch | 3 +--
 debian/rules                               | 4 +++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 61404b0..80e5d76 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
 osmosis (0.44.1-3) UNRELEASED; urgency=medium
 
+  [ Bas Couwenberg ]
   * Update Vcs-Browser and various openstreemap.org URLs to use HTTPS.
 
+  [ Emmanuel Bourg ]
+  * Removed the build dependency on checkstyle
+
  -- Bas Couwenberg <sebastic at debian.org>  Sun, 11 Oct 2015 15:48:12 +0200
 
 osmosis (0.44.1-2) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 77107fb..1918039 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,6 @@ Priority: optional
 Build-Depends: debhelper (>= 9),
                default-jdk,
                ant-optional,
-               checkstyle (>= 5.6),
                gradle,
                ivy,
                junit4 (>= 4.10),
diff --git a/debian/patches/03-local-dependencies.patch b/debian/patches/03-local-dependencies.patch
index 14150c7..3b78cd4 100644
--- a/debian/patches/03-local-dependencies.patch
+++ b/debian/patches/03-local-dependencies.patch
@@ -19,11 +19,10 @@ Forwarded: not-needed
  	}
  }
  
-@@ -57,6 +63,9 @@
+@@ -57,6 +63,8 @@
  	}
  
  	dependencies {
-+		checkstyle 'com.puppycrawl.tools:checkstyle:debian'
 +		jdepend 'org.apache.ant:ant-jdepend:debian'
 +
  		testCompile group: 'junit', name: 'junit', version: dependencyVersionJunit
diff --git a/debian/rules b/debian/rules
index 13d71b7..572bb36 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,7 +21,9 @@ override_dh_auto_test:
 	gradle --offline --no-daemon --stacktrace \
 	       --gradle-user-home debian/gradle-user-home \
 	       --project-prop osmosisBuildType=RELEASE \
-	       check -x test
+	       check -x test \
+	       -x checkstyleMain \
+	       -x checkstyleTest
 
 override_dh_clean:
 	gradle --offline --no-daemon --stacktrace \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmosis.git