[bintray-client-java] 01/01: Build with gradle-debian-helper
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Fri Oct 16 14:36:03 UTC 2015
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository bintray-client-java.
commit e97e276f3449572f554b453bfc4cfafec019fd99
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Fri Oct 16 16:31:21 2015 +0200
Build with gradle-debian-helper
---
debian/changelog | 7 +++++
debian/control | 3 +--
debian/maven.ignoreRules | 1 +
debian/maven.rules | 1 +
debian/patches/01_use_local_artifacts.patch | 41 -----------------------------
debian/patches/02_disable_publishing.patch | 12 +++------
debian/patches/03_disable_tests.patch | 6 ++---
debian/patches/04_use_jackson2.patch | 10 +++----
debian/patches/series | 1 -
debian/rules | 16 ++---------
10 files changed, 24 insertions(+), 74 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index dfb9f1e..996706d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+bintray-client-java (0.8.1-2) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * Build with gradle-debian-helper
+
+ -- Emmanuel Bourg <ebourg at apache.org> Fri, 16 Oct 2015 16:17:30 +0200
+
bintray-client-java (0.8.1-1) unstable; urgency=low
* Initial release (Closes: #787707)
diff --git a/debian/control b/debian/control
index 7b27f91..3d48f73 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,7 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
Uploaders: Kai-Chung Yan <seamlikok at gmail.com>
Build-Depends: debhelper (>= 9),
default-jdk (>= 2:1.7),
- gradle,
- groovy (>= 1.8.0),
+ gradle-debian-helper,
javahelper,
libcommons-io-java (>= 2.1),
libcommons-lang-java (>= 2.6),
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
new file mode 100644
index 0000000..b3ef3ea
--- /dev/null
+++ b/debian/maven.ignoreRules
@@ -0,0 +1 @@
+org.jfrog.buildinfo build-info-extractor-gradle
diff --git a/debian/maven.rules b/debian/maven.rules
new file mode 100644
index 0000000..c9edd5c
--- /dev/null
+++ b/debian/maven.rules
@@ -0,0 +1 @@
+org.codehaus.groovy s/groovy/groovy-all/ * s/.*/2.x/ * *
diff --git a/debian/patches/01_use_local_artifacts.patch b/debian/patches/01_use_local_artifacts.patch
deleted file mode 100644
index 786ac37..0000000
--- a/debian/patches/01_use_local_artifacts.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Description: Use local artifacts
-Author: Kai-Chung Yan <seamlikok at gmail.com>
-Last-Update: 2015-06-01
---- a/build.gradle
-+++ b/build.gradle
-@@ -1,5 +1,6 @@
- import static java.lang.System.getenv
-
-+/*
- buildscript {
- repositories {
- jcenter()
-@@ -9,6 +10,7 @@
- classpath(group: 'org.jfrog.buildinfo', name: 'build-info-extractor-gradle', version: '3.0.3')
- }
- }
-+*/
-
- allprojects {
- apply plugin: 'idea'
-@@ -17,6 +19,11 @@
-
- group = 'com.jfrog.bintray.client'
-
-+ repositories {
-+ flatDir { dirs "/usr/share/java" }
-+ maven { url "file:///usr/share/maven-repo" }
-+ }
-+
- artifactory {
- contextUrl = 'https://oss.jfrog.org'
- resolve {
-@@ -54,7 +61,7 @@
- compile 'joda-time:joda-time:2.2'
- compile 'commons-io:commons-io:2.1'
- compile 'org.codehaus.jackson:jackson-mapper-asl:1.9.5'
-- compile("org.apache.httpcomponents:httpclient:4.3.5") {
-+ compile("org.apache.httpcomponents:httpclient:debian") {
- exclude group: 'commons-logging' //DO NOT REMOVE
- }
- }
diff --git a/debian/patches/02_disable_publishing.patch b/debian/patches/02_disable_publishing.patch
index e6b215d..bd30ea6 100644
--- a/debian/patches/02_disable_publishing.patch
+++ b/debian/patches/02_disable_publishing.patch
@@ -3,7 +3,7 @@ Author: Kai-Chung Yan <seamlikok at gmail.com>
Last-Update: 2015-06-01
--- a/build.gradle
+++ b/build.gradle
-@@ -14,8 +14,8 @@
+@@ -12,11 +12,12 @@
allprojects {
apply plugin: 'idea'
@@ -14,15 +14,11 @@ Last-Update: 2015-06-01
group = 'com.jfrog.bintray.client'
-@@ -24,6 +24,7 @@
- maven { url "file:///usr/share/maven-repo" }
- }
-
+ /*
artifactory {
contextUrl = 'https://oss.jfrog.org'
resolve {
-@@ -44,9 +45,10 @@
+@@ -37,9 +38,10 @@
}
}
}
@@ -34,7 +30,7 @@ Last-Update: 2015-06-01
subprojects() {
apply plugin: 'java'
-@@ -96,7 +98,7 @@
+@@ -89,7 +91,7 @@
finalizedBy(testResultsZip)
}
@@ -43,7 +39,7 @@ Last-Update: 2015-06-01
publishing {
publications {
main(MavenPublication) {
-@@ -153,6 +155,7 @@
+@@ -146,6 +148,7 @@
}
}
}
diff --git a/debian/patches/03_disable_tests.patch b/debian/patches/03_disable_tests.patch
index a1ed62d..a4c5d43 100644
--- a/debian/patches/03_disable_tests.patch
+++ b/debian/patches/03_disable_tests.patch
@@ -3,7 +3,7 @@ Author: Kai-Chung Yan <seamlikok at gmail.com>
Last-Update: 2015-06-01
--- a/build.gradle
+++ b/build.gradle
-@@ -78,6 +78,7 @@
+@@ -71,6 +71,7 @@
from javadoc.destinationDir
}
@@ -11,7 +11,7 @@ Last-Update: 2015-06-01
task testResultsZip(type: Zip) {
classifier = 'testreports'
from testReportDir
-@@ -97,6 +98,7 @@
+@@ -90,6 +91,7 @@
finalizedBy(testResultsZip)
}
@@ -19,7 +19,7 @@ Last-Update: 2015-06-01
/*
publishing {
-@@ -163,10 +165,12 @@
+@@ -156,10 +158,12 @@
compile project(':bintray-client-java-api')
compile 'org.codehaus.groovy:groovy:1.8.0'
compile 'commons-lang:commons-lang:2.6'
diff --git a/debian/patches/04_use_jackson2.patch b/debian/patches/04_use_jackson2.patch
index f07d302..e61ce4f 100644
--- a/debian/patches/04_use_jackson2.patch
+++ b/debian/patches/04_use_jackson2.patch
@@ -4,15 +4,15 @@ Author: Kai-Chung Yan <seamlikok at gmail.com>
Last-Update: 2015-06-01
--- a/build.gradle
+++ b/build.gradle
-@@ -62,7 +62,9 @@
+@@ -55,7 +55,9 @@
compile 'ch.qos.logback:logback-classic:1.0.10'
compile 'joda-time:joda-time:2.2'
compile 'commons-io:commons-io:2.1'
- compile 'org.codehaus.jackson:jackson-mapper-asl:1.9.5'
-+ compile "com.fasterxml.jackson.core:jackson-annotations"
-+ compile "com.fasterxml.jackson.core:jackson-core"
-+ compile "com.fasterxml.jackson.core:jackson-databind"
- compile("org.apache.httpcomponents:httpclient:debian") {
++ compile "com.fasterxml.jackson.core:jackson-annotations:2.x"
++ compile "com.fasterxml.jackson.core:jackson-core:2.x"
++ compile "com.fasterxml.jackson.core:jackson-databind:2.x"
+ compile("org.apache.httpcomponents:httpclient:4.3.5") {
exclude group: 'commons-logging' //DO NOT REMOVE
}
--- a/api/src/main/java/com/jfrog/bintray/client/api/details/Attribute.java
diff --git a/debian/patches/series b/debian/patches/series
index f1293d2..8355179 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-01_use_local_artifacts.patch
02_disable_publishing.patch
03_disable_tests.patch
04_use_jackson2.patch
diff --git a/debian/rules b/debian/rules
index ca1987f..f594bc3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,19 +1,7 @@
#!/usr/bin/make -f
-# Under fakeroot Gradle will show error while creating /root/.gradle, hence
-# specifies the Gradle home location
-GRADLE_FLAGS := --offline --stacktrace --refresh-dependencies --gradle-user-home .gradlehome/
-
%:
- dh $@ --with javahelper,quilt
+ dh $@ --buildsystem=gradle --with javahelper,quilt
override_dh_auto_build:
- gradle assemble javadoc $(GRADLE_FLAGS)
-
- rm -rf .gradle/ .gradlehome/
-
-override_dh_auto_clean:
- dh_auto_clean
- gradle clean $(GRADLE_FLAGS)
-
- rm -rf .gradle/ .gradlehome/
+ dh_auto_build -- assemble javadoc
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/bintray-client-java.git
More information about the pkg-java-commits
mailing list