[syncany] 05/20: Remove build.gradle.patch
Markus Koschany
apo-guest at moszumanska.debian.org
Sun Sep 25 14:49:18 UTC 2016
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a commit to branch master
in repository syncany.
commit a5c3bcf5c67cc03dacf95e14547159811c69335f
Author: Markus Koschany <apo at debian.org>
Date: Sun Sep 25 14:48:31 2016 +0200
Remove build.gradle.patch
---
debian/patches/build.gradle.patch | 169 --------------------------------------
debian/patches/series | 1 -
2 files changed, 170 deletions(-)
diff --git a/debian/patches/build.gradle.patch b/debian/patches/build.gradle.patch
deleted file mode 100644
index 8f06c02..0000000
--- a/debian/patches/build.gradle.patch
+++ /dev/null
@@ -1,169 +0,0 @@
-From: Markus Koschany <apo at debian.org>
-Date: Tue, 15 Sep 2015 22:18:14 +0200
-Subject: build.gradle
-
-Debianize the build scripts and prevent them from downloading remote jar files
-from untrusted repositories. Use Debian's system jars instead. Disable
-sonarRunner.
-
-Forwarded: not-needed
----
- build.gradle | 15 ++++-----------
- syncany-cli/build.gradle | 13 +++++++------
- syncany-lib/build.gradle | 35 ++++++++++++++++-------------------
- syncany-util/build.gradle | 13 +++++--------
- 4 files changed, 32 insertions(+), 44 deletions(-)
-
-diff --git a/build.gradle b/build.gradle
-index 3dbfb57..3e6921c 100644
---- a/build.gradle
-+++ b/build.gradle
-@@ -15,7 +15,7 @@ project.ext {
- applicationRevision = getRevision()
-
- applicationVersionSnapshot = (!applicationRelease) ? "+SNAPSHOT.${asUTC(applicationDate, 'yyMMddHHmm')}.git${applicationRevision}" : ""
-- applicationVersionFull = "${applicationVersion}${applicationVersionSnapshot}"
-+ applicationVersionFull = "${applicationVersion}"
- }
-
- // Gradle scripts and tasks ////////////////////////////////////////////////////
-@@ -23,22 +23,15 @@ project.ext {
- apply from: 'gradle/gradle/application.java.gradle'
- apply from: 'gradle/gradle/application.distribution.gradle'
-
--apply from: 'gradle/gradle/packaging.innosetup.gradle'
--apply from: 'gradle/gradle/packaging.debian.gradle'
--
--apply from: 'gradle/gradle/reports.coverage.gradle'
--apply from: 'gradle/gradle/reports.tests.gradle'
--apply from: 'gradle/gradle/reports.javadoc.gradle'
--apply from: 'gradle/gradle/reports.sonarqube.gradle'
--
--apply from: 'gradle/gradle/development.eclipse.gradle'
- apply from: 'gradle/gradle/development.fakeinstall.gradle'
- apply from: 'gradle/gradle/development.misc.gradle'
-
- // Projects settings //////////////////////////////////////////////////////////
-
- repositories {
-- mavenCentral()
-+ maven {
-+ url "file:///usr/share/maven-repo"
-+ }
- }
-
- dependencies {
-diff --git a/syncany-cli/build.gradle b/syncany-cli/build.gradle
-index 71a8ba4..552ebb1 100644
---- a/syncany-cli/build.gradle
-+++ b/syncany-cli/build.gradle
-@@ -1,10 +1,16 @@
- apply plugin: 'java'
- apply plugin: 'eclipse'
-
-+repositories {
-+ maven {
-+ url "file:///usr/share/maven-repo"
-+ }
-+}
-+
- dependencies {
- compile project(":syncany-lib")
- compile project(":syncany-util")
-- compile "net.sf.jopt-simple:jopt-simple:4.5"
-+ compile "net.sf.jopt-simple:jopt-simple:debian"
-
- testCompile "com.github.stefanbirkner:system-rules:1.5.0"
-
-@@ -13,8 +19,3 @@ dependencies {
- testCompile "junit:junit:4.9"
- }
-
--sonarRunner {
-- sonarProperties {
-- properties["sonar.tests"] += "src/test/integration/java"
-- }
--}
-diff --git a/syncany-lib/build.gradle b/syncany-lib/build.gradle
-index bfaa238..b37c3dc 100644
---- a/syncany-lib/build.gradle
-+++ b/syncany-lib/build.gradle
-@@ -6,25 +6,27 @@ configurations {
- }
-
- repositories {
-- mavenCentral()
-+ maven {
-+ url "file:///usr/share/maven-repo"
-+ }
- }
-
- dependencies {
- compile project(':syncany-util')
-
-- compile "commons-io:commons-io:2.4"
-- compile "org.bouncycastle:bcprov-jdk15on:1.51"
-- compile "org.bouncycastle:bcpkix-jdk15on:1.51"
-- compile "org.simpleframework:simple-xml:2.7.1"
-- compile "com.google.guava:guava:15.0"
-- compile "commons-codec:commons-codec:1.8"
-- compile "org.hsqldb:hsqldb:2.3.1"
-- compile "com.github.zafarkhaja:java-semver:0.7.2"
-- compile "org.apache.httpcomponents:httpclient:4.3.4"
-- compile "io.undertow:undertow-servlet:1.1.0.CR3"
-- compile "io.undertow:undertow-websockets-jsr:1.1.0.CR3"
-- compile "net.sf.jpathwatch:jpathwatch:0.95"
-- compile "com.google.code.gson:gson:2.2.4"
-+ compile "commons-io:commons-io:debian"
-+ compile "org.bouncycastle:bcprov:debian"
-+ compile "org.bouncycastle:bcpkix:debian"
-+ compile "org.simpleframework:simple-xml:debian"
-+ compile "com.google.guava:guava:debian"
-+ compile "commons-codec:commons-codec:debian"
-+ compile "org.hsqldb:hsqldb:debian"
-+ compile "com.github.zafarkhaja:java-semver:debian"
-+ compile "org.apache.httpcomponents:httpclient:debian"
-+ compile "io.undertow:undertow-servlet:debian"
-+ compile "io.undertow:undertow-websockets-jsr:debian"
-+ compile "net.sf.jpathwatch:jpathwatch:debian"
-+ compile "com.google.code.gson:gson:debian"
-
- testCompile project(path: ':syncany-util', configuration: 'tests')
- testCompile "org.mockito:mockito-all:1.10.19"
-@@ -32,8 +34,3 @@ dependencies {
- testCompile "net.sourceforge.htmlunit:htmlunit:2.15"
- }
-
--sonarRunner {
-- sonarProperties {
-- properties["sonar.tests"] += "src/test/integration/java"
-- }
--}
-diff --git a/syncany-util/build.gradle b/syncany-util/build.gradle
-index 267330c..016f876 100644
---- a/syncany-util/build.gradle
-+++ b/syncany-util/build.gradle
-@@ -5,18 +5,15 @@ configurations {
- }
-
- repositories {
-- mavenCentral()
-+ maven {
-+ url "file:///usr/share/maven-repo"
-+ }
- }
-
- dependencies {
-- compile "commons-io:commons-io:2.4"
-- compile "org.hsqldb:hsqldb:2.3.1"
-+ compile "commons-io:commons-io:debian"
-+ compile "org.hsqldb:hsqldb:debian"
-
- testCompile "junit:junit:4.9"
- }
-
--sonarRunner {
-- sonarProperties {
-- properties["sonar.tests"] += "src/test/integration/java"
-- }
--}
diff --git a/debian/patches/series b/debian/patches/series
index 6d2903b..ee80096 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
no-tests.patch
-build.gradle.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/syncany.git
More information about the pkg-java-commits
mailing list