[jabref] 03/07: freshen patches
Tony Mancill
tmancill at moszumanska.debian.org
Thu Dec 15 07:25:40 UTC 2016
This is an automated email from the git hooks/post-receive script.
tmancill pushed a commit to branch dev
in repository jabref.
commit b40b322908a4009db0ed2417d935f78cbe4f5c10
Author: tony mancill <tmancill at debian.org>
Date: Wed Dec 14 23:10:43 2016 -0800
freshen patches
---
debian/patches/010_gradle_build.patch | 32 +++++++++++++++-----------------
1 file changed, 15 insertions(+), 17 deletions(-)
diff --git a/debian/patches/010_gradle_build.patch b/debian/patches/010_gradle_build.patch
index 8745159..fa6d05a 100644
--- a/debian/patches/010_gradle_build.patch
+++ b/debian/patches/010_gradle_build.patch
@@ -2,11 +2,9 @@ Description: patch upstream build system for building on Debian
Author: tony mancill <tmancill at debian.org>
Forwarded: not-needed
-Index: jabref-3.8~pre1+ds/build.gradle
-===================================================================
---- jabref-3.8~pre1+ds.orig/build.gradle
-+++ jabref-3.8~pre1+ds/build.gradle
-@@ -2,6 +2,7 @@ import org.gradle.internal.os.OperatingS
+--- a/build.gradle
++++ b/build.gradle
+@@ -2,6 +2,7 @@
// to update the gradle wrapper, execute ./gradlew wrapper --gradle-version 3.0
@@ -14,7 +12,7 @@ Index: jabref-3.8~pre1+ds/build.gradle
buildscript {
repositories {
maven {
-@@ -27,9 +28,11 @@ buildScan {
+@@ -28,9 +29,11 @@
licenseAgreementUrl = 'https://gradle.com/terms-of-service'
licenseAgree = 'yes'
}
@@ -26,7 +24,7 @@ Index: jabref-3.8~pre1+ds/build.gradle
apply plugin: "project-report"
apply plugin: 'jacoco'
apply plugin: 'install4j'
-@@ -38,17 +41,20 @@ apply plugin: 'me.champeau.gradle.jmh'
+@@ -39,17 +42,20 @@
apply plugin: 'checkstyle'
apply from: 'eclipse.gradle'
@@ -49,7 +47,7 @@ Index: jabref-3.8~pre1+ds/build.gradle
install4j {
installDir = file(project.ext.install4jDir)
}
-@@ -60,6 +66,7 @@ repositories {
+@@ -61,6 +67,7 @@
url 'https://oss.sonatype.org/content/groups/public'
}
}
@@ -57,7 +55,7 @@ Index: jabref-3.8~pre1+ds/build.gradle
configurations {
antlr3
-@@ -67,6 +74,8 @@ configurations {
+@@ -68,6 +75,8 @@
}
dependencies {
@@ -66,7 +64,7 @@ Index: jabref-3.8~pre1+ds/build.gradle
compile 'com.jgoodies:jgoodies-common:1.8.1'
compile 'com.jgoodies:jgoodies-forms:1.9.0'
compile 'com.jgoodies:jgoodies-looks:2.7.0'
-@@ -117,8 +126,8 @@ dependencies {
+@@ -118,8 +127,8 @@
compile 'org.apache.logging.log4j:log4j-jcl:2.7'
compile 'org.apache.logging.log4j:log4j-api:2.7'
compile 'org.apache.logging.log4j:log4j-core:2.7'
@@ -76,8 +74,8 @@ Index: jabref-3.8~pre1+ds/build.gradle
+ //compile 'org.xmlunit:xmlunit-matchers:2.3.0'
testCompile 'junit:junit:4.12'
- testCompile 'org.mockito:mockito-core:2.2.28'
-@@ -255,11 +264,12 @@ processTestResources.dependsOn copyTestR
+ testCompile 'org.mockito:mockito-core:2.3.0'
+@@ -256,11 +265,12 @@
tasks.withType(Test) {
reports.html.destination = file("${reporting.baseDir}/${name}")
@@ -93,7 +91,7 @@ Index: jabref-3.8~pre1+ds/build.gradle
jacocoTestReport {
reports {
xml.enabled = true // coveralls plugin depends on xml format report
-@@ -297,6 +307,7 @@ shadowJar {
+@@ -298,6 +308,7 @@
}
})
}
@@ -101,7 +99,7 @@ Index: jabref-3.8~pre1+ds/build.gradle
/*
* Changes project.version to VERSION--snapshot--DATE--GIT_HASH
-@@ -331,6 +342,7 @@ if (hasProperty('dev')) {
+@@ -332,6 +343,7 @@
project.version += "--snapshot--" + infoString
}
@@ -109,8 +107,8 @@ Index: jabref-3.8~pre1+ds/build.gradle
// has to be defined AFTER 'dev' things to have the correct project.version
task media(type: com.install4j.gradle.Install4jTask, dependsOn: "releaseJar") {
projectFile = file('jabref.install4j')
-@@ -383,3 +395,4 @@ jmh {
- iterations = 10
- fork = 2
+@@ -390,3 +402,4 @@
+ // See https://github.com/andrewgaul/modernizer-maven-plugin for more information on modernizer
+ failOnViolations = false
}
+*/
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jabref.git
More information about the pkg-java-commits
mailing list