[jayway-jsonpath] 03/07: Build with Gradle instead of Maven

[Emmanuel Bourg]

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

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

commit a2fa28f6014d3a867db9dc0032d4674b856527ad
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Aug 3 09:32:58 2016 +0200

    Build with Gradle instead of Maven
---
 debian/changelog                                       |  4 +++-
 debian/control                                         |  2 +-
 debian/libjsonpath-java.poms                           |  4 +---
 debian/maven.ignoreRules                               |  4 ++++
 debian/maven.properties                                |  5 -----
 debian/maven.rules                                     |  1 +
 .../01-disable-binary-compatibility-report.patch       | 11 +++++++++++
 debian/patches/02-disable-shadow-plugin.patch          | 18 ++++++++++++++++++
 debian/patches/series                                  |  2 ++
 debian/rules                                           |  7 ++++---
 10 files changed, 45 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1b53f0d..f4fc9c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
-jayway-jsonpath (0.9.1-2) UNRELEASED; urgency=medium
+jayway-jsonpath (2.0.0-1) UNRELEASED; urgency=medium
 
+  * New upstream release
+    - Build with Gradle instead of Maven
   * Fixed the Vcs-* fields
   * Standards-Version updated to 3.9.8
   * Remove the Gradle wrapper from the upstream tarball
diff --git a/debian/control b/debian/control
index e6f1777..3fd5ec3 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Emmanuel Bourg <ebourg at apache.org>
-Build-Depends: debhelper (>= 9), default-jdk, maven-debian-helper (>= 1.5)
+Build-Depends: debhelper (>= 9), default-jdk, gradle-debian-helper (>= 1.3), maven-repo-helper
 Build-Depends-Indep: junit4,
                      libcommons-io-java,
                      libhamcrest-java,
diff --git a/debian/libjsonpath-java.poms b/debian/libjsonpath-java.poms
index 6436a4b..327955a 100644
--- a/debian/libjsonpath-java.poms
+++ b/debian/libjsonpath-java.poms
@@ -25,6 +25,4 @@
 #   --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
 #     Empty by default. [mh_install]
 #
-pom.xml --no-parent --has-package-version
-json-path/pom.xml --has-package-version
-json-path-assert/pom.xml --ignore
+json-path/build/poms/pom-default.xml        --has-package-version --java-lib -e2.0.0 --artifact=json-path/build/libs/json-path-*-SNAPSHOT.jar
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 8b13789..28a8d26 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -1 +1,5 @@
 
+com.github.jengelman.gradle.plugins shadow * * * *
+me.champeau.gradle gradle-javadoc-hotfix-plugin * * * *
+me.champeau.gradle japicmp-gradle-plugin * * * *
+org.apache.tapestry tapestry-json * * * *
diff --git a/debian/maven.properties b/debian/maven.properties
deleted file mode 100644
index e593715..0000000
--- a/debian/maven.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-# Include here properties to pass to Maven during the build.
-# For example:
-# maven.test.skip=true
-
-maven.test.skip=true
diff --git a/debian/maven.rules b/debian/maven.rules
index e85291e..73111ba 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,2 +1,3 @@
 
 junit junit jar s/4\..*/4.x/ * *
+javax.servlet s/servlet-api/javax.servlet-api/ * s/.*/3.1/ * *
diff --git a/debian/patches/01-disable-binary-compatibility-report.patch b/debian/patches/01-disable-binary-compatibility-report.patch
new file mode 100644
index 0000000..259ecaf
--- /dev/null
+++ b/debian/patches/01-disable-binary-compatibility-report.patch
@@ -0,0 +1,11 @@
+Description: Disables the binary compatibility report
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/build.gradle
++++ b/build.gradle
+@@ -75,4 +75,3 @@
+ 
+ //Task used by Heroku for staging
+ task stage(dependsOn: [':json-path-web-test:clean', 'json-path-web-test:shadowJar']) {}
+-apply from: "$rootDir/gradle/binaryCompatibility.gradle"
+\ No newline at end of file
diff --git a/debian/patches/02-disable-shadow-plugin.patch b/debian/patches/02-disable-shadow-plugin.patch
new file mode 100644
index 0000000..85cd58b
--- /dev/null
+++ b/debian/patches/02-disable-shadow-plugin.patch
@@ -0,0 +1,18 @@
+Description: Ignore the shadow plugin
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/build.gradle
++++ b/build.gradle
+@@ -73,5 +73,3 @@
+     gradleVersion = '2.3'
+ }
+ 
+-//Task used by Heroku for staging
+-task stage(dependsOn: [':json-path-web-test:clean', 'json-path-web-test:shadowJar']) {}
+--- a/json-path-web-test/build.gradle
++++ b/json-path-web-test/build.gradle
+@@ -1,4 +1,3 @@
+-apply plugin: 'com.github.johnrengelman.shadow'
+ apply plugin: 'application'
+ 
+ displayName = "JsonPath Test Bench"
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..c12ca3f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+01-disable-binary-compatibility-report.patch
+02-disable-shadow-plugin.patch
diff --git a/debian/rules b/debian/rules
index 9867785..5e43ffb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,10 @@
 #!/usr/bin/make -f
 
-export JAVA_HOME = /usr/lib/jvm/default-java
-
 %:
-	dh $@ --buildsystem=maven
+	dh $@ --buildsystem=gradle --with maven-repo-helper
+
+override_dh_auto_build:
+	dh_auto_build -- jar install -x :json-path-web-test:jar -x :json-path:javadoc
 
 get-orig-source:
 	uscan --download-current-version --force-download --no-symlink

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jayway-jsonpath.git