1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140
|
Description: patch upstream build system for building on Debian
Forwarded: not-needed
Author: tony mancill <tmancill@debian.org>
Reviewed-by: gregor herrmann <gregoa@debian.org>
Last-Update: 2020-07-17
--- a/build.gradle
+++ b/build.gradle
@@ -2,6 +2,7 @@
// to update the gradle wrapper, execute ./gradlew wrapper --gradle-version 3.0
+/*
buildscript {
repositories {
maven {
@@ -28,9 +29,11 @@
licenseAgreementUrl = 'https://gradle.com/terms-of-service'
licenseAgree = 'yes'
}
+*/
apply plugin: "java"
apply plugin: "application"
+/*
apply plugin: "project-report"
apply plugin: 'jacoco'
apply plugin: 'install4j'
@@ -39,17 +42,20 @@
apply plugin: 'checkstyle'
apply from: 'eclipse.gradle'
-apply from: 'localization.gradle'
+*/
+// disable because we don't have jython-standalone
+//apply from: 'localization.gradle'
apply from: 'xjc.gradle'
group = "net.sf.jabref"
version = "3.8.2"
project.ext.threeDotVersion = "3.8.2.0"
-project.ext.install4jDir = hasProperty("install4jDir") ? getProperty("install4jDir") : (OperatingSystem.current().isWindows() ? 'C:/Program Files/install4j6' : 'install4j6')
+//project.ext.install4jDir = hasProperty("install4jDir") ? getProperty("install4jDir") : (OperatingSystem.current().isWindows() ? 'C:/Program Files/install4j6' : 'install4j6')
sourceCompatibility = 1.8
targetCompatibility = 1.8
mainClassName = "net.sf.jabref.JabRefMain"
+/*
install4j {
installDir = file(project.ext.install4jDir)
}
@@ -61,6 +67,7 @@
url 'https://oss.sonatype.org/content/groups/public'
}
}
+*/
configurations {
antlr3
@@ -68,6 +75,8 @@
}
dependencies {
+ compile 'com.michaelbaranov.microba:microba:0.4.4'
+ compile 'spin:spin:1.5'
compile 'com.jgoodies:jgoodies-common:1.8.1'
compile 'com.jgoodies:jgoodies-forms:1.9.0'
compile 'com.jgoodies:jgoodies-looks:2.7.0'
@@ -86,10 +95,7 @@
compile 'commons-cli:commons-cli:1.3.1'
- compile 'org.openoffice:juh:4.1.2'
- compile 'org.openoffice:jurt:4.1.2'
- compile 'org.openoffice:ridl:4.1.2'
- compile 'org.openoffice:unoil:4.1.2'
+ compile 'org.libreoffice:libreoffice:7.0.0'
antlr3 'org.antlr:antlr:3.5.2'
compile 'org.antlr:antlr-runtime:3.5.2'
@@ -97,9 +103,8 @@
antlr4 'org.antlr:antlr4:4.6'
compile 'org.antlr:antlr4-runtime:4.6'
- // VersionEye states that 6.0.5 is the most recent version, but http://dev.mysql.com/downloads/connector/j/ shows that as "Development Release"
- compile 'mysql:mysql-connector-java:5.1.40'
-
+ // debian would like to drop mysql-connector-java
+ compile 'org.mariadb.jdbc:mariadb-java-client:2.3.0'
compile 'org.postgresql:postgresql:9.4.1210'
compile 'net.java.dev.glazedlists:glazedlists_java15:1.9.1'
@@ -118,8 +123,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'
- compile 'org.xmlunit:xmlunit-core:2.3.0'
- compile 'org.xmlunit:xmlunit-matchers:2.3.0'
+ //compile 'org.xmlunit:xmlunit-core:2.3.0'
+ //compile 'org.xmlunit:xmlunit-matchers:2.3.0'
testCompile 'junit:junit:4.12'
testCompile 'org.mockito:mockito-core:2.6.2'
@@ -257,11 +262,12 @@
tasks.withType(Test) {
reports.html.destination = file("${reporting.baseDir}/${name}")
- jacoco {
- append = true
- }
+ //jacoco {
+ // append = true
+ //}
}
+/*
jacocoTestReport {
reports {
xml.enabled = true // coveralls plugin depends on xml format report
@@ -299,6 +305,7 @@
}
})
}
+*/
/*
* Changes project.version to VERSION--snapshot--DATE--GIT_HASH
@@ -333,6 +340,7 @@
project.version += "--snapshot--" + infoString
}
+/*
// 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')
@@ -391,3 +399,4 @@
// See https://github.com/andrewgaul/modernizer-maven-plugin for more information on modernizer
failOnViolations = false
}
+*/
|