[packages/java-log4j-systemd-journal-appender] Disable use of external dependencies and repos

jajcus jajcus at pld-linux.org
Tue Oct 27 12:49:50 CET 2015


commit a0dbb3c22550c0463a30bd4250d24dce2a9151f9
Author: Jacek Konieczny <j.konieczny at eggsoft.pl>
Date:   Tue Oct 27 10:52:52 2015 +0100

    Disable use of external dependencies and repos
    
    - BR: java-jna. java-log4j
    - use JARs from /usr/share/java
    - drop dependency on the gradle nexus plugin
    - disable tests (they pull their dependencies)

 java-log4j-systemd-journal-appender.spec | 10 ++++-
 local_deps_only.patch                    | 14 ++++++
 no_nexus.patch                           | 76 ++++++++++++++++++++++++++++++++
 3 files changed, 98 insertions(+), 2 deletions(-)
---
diff --git a/java-log4j-systemd-journal-appender.spec b/java-log4j-systemd-journal-appender.spec
index 3c3f7eb..6a9b6da 100644
--- a/java-log4j-systemd-journal-appender.spec
+++ b/java-log4j-systemd-journal-appender.spec
@@ -1,7 +1,7 @@
 # Conditional build:
 %bcond_without	javadoc		# don't build javadoc
 %bcond_without	source		# don't build source jar
-%bcond_without	tests		# don't build and run tests
+%bcond_with	tests		# build and run tests
 
 %define		srcname		log4j-systemd-journal-appender
 %define		commit		60bc8eccbc031616504f812ec0d3c8902d3ce79f
@@ -15,8 +15,12 @@ License:	BSD
 Group:		Libraries/Java
 Source0:	https://github.com/bwaldvogel/log4j-systemd-journal-appender/archive/%{commit}/%{srcname}.tar.gz
 # Source0-md5:	d1cc409f362f86f2691f90e759dd0957
+Patch0:		local_deps_only.patch
+Patch1:		no_nexus.patch
 URL:		https://github.com/bwaldvogel/log4j-systemd-journal-appender
 BuildRequires:	gradle
+BuildRequires:	java-jna
+BuildRequires:	java-log4j
 BuildRequires:	jpackage-utils
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
@@ -82,11 +86,13 @@ Kod źródłowy %{srcname}.
 
 %prep
 %setup -q -n %{srcname}-%{commit}
+%patch0 -p1
+%patch1 -p1
 
 %build
 export JAVA_HOME="%{java_home}"
 
-gradle jar %{?with_javadoc:javadoc} %{?with_source:sourcesJar}
+gradle jar %{?with_javadoc:javadoc} %{?with_source:sourcesJar} %{?with_tests:test}
 
 %install
 rm -rf $RPM_BUILD_ROOT
diff --git a/local_deps_only.patch b/local_deps_only.patch
new file mode 100644
index 0000000..61f87f2
--- /dev/null
+++ b/local_deps_only.patch
@@ -0,0 +1,14 @@
+diff -dur log4j-systemd-journal-appender-60bc8eccbc031616504f812ec0d3c8902d3ce79f.orig/build.gradle log4j-systemd-journal-appender-60bc8eccbc031616504f812ec0d3c8902d3ce79f/build.gradle
+--- log4j-systemd-journal-appender-60bc8eccbc031616504f812ec0d3c8902d3ce79f.orig/build.gradle	2015-09-30 23:59:39.000000000 +0200
++++ log4j-systemd-journal-appender-60bc8eccbc031616504f812ec0d3c8902d3ce79f/build.gradle	2015-10-27 10:42:51.000000000 +0100
+@@ -78,7 +78,9 @@
+ }
+ 
+ repositories {
+-    mavenCentral()
++    flatDir {
++        dirs '/usr/share/java'
++    }
+ }
+ 
+ task wrapper(type: Wrapper) {
diff --git a/no_nexus.patch b/no_nexus.patch
new file mode 100644
index 0000000..92e8fef
--- /dev/null
+++ b/no_nexus.patch
@@ -0,0 +1,76 @@
+diff -dur log4j-systemd-journal-appender-60bc8eccbc031616504f812ec0d3c8902d3ce79f.orig/build.gradle log4j-systemd-journal-appender-60bc8eccbc031616504f812ec0d3c8902d3ce79f/build.gradle
+--- log4j-systemd-journal-appender-60bc8eccbc031616504f812ec0d3c8902d3ce79f.orig/build.gradle	2015-10-27 10:43:45.000000000 +0100
++++ log4j-systemd-journal-appender-60bc8eccbc031616504f812ec0d3c8902d3ce79f/build.gradle	2015-10-27 10:51:18.000000000 +0100
+@@ -1,6 +1,5 @@
+ apply plugin: 'java'
+ apply plugin: 'eclipse'
+-apply plugin: 'nexus'
+ 
+ version = '1.3.1'
+ 
+@@ -21,15 +20,9 @@
+     }
+ }
+ 
+-// https://github.com/bmuschko/gradle-nexus-plugin
+-buildscript {
+-    repositories {
+-        jcenter()
+-    }
+-
+-    dependencies {
+-        classpath 'org.gradle.api.plugins:gradle-nexus-plugin:0.7.1'
+-    }
++task sourcesJar(type: Jar) {
++    from sourceSets.main.allSource
++    classifier = 'sources'
+ }
+ 
+ ext {
+@@ -37,46 +30,6 @@
+     powermockVersion = '1.6.1'
+ }
+ 
+-modifyPom {
+-    project {
+-        groupId        'de.bwaldvogel'
+-        artifactId     'log4j-systemd-journal-appender'
+-        name           title
+-        description    description
+-        url            url
+-        inceptionYear '2014'
+-
+-        scm {
+-            url 'git at github.com:bwaldvogel/log4j-systemd-journal-appender.git'
+-            connection 'scm:git:git at github.com:bwaldvogel/log4j-systemd-journal-appender.git'
+-            developerConnection 'scm:git:git at github.com:bwaldvogel/log4j-systemd-journal-appender.git'
+-        }
+-
+-        licenses {
+-            license {
+-                name 'The BSD License'
+-                url 'http://www.opensource.org/licenses/bsd-license.php'
+-                distribution 'repo'
+-            }
+-        }
+-
+-        developers {
+-            developer {
+-                id 'bwaldvogel'
+-                name 'Benedikt Waldvogel'
+-                email 'mail at bwaldvogel.de'
+-            }
+-        }
+-    }
+-}
+-
+-nexus {
+-    attachSources = true
+-    attachTests = false
+-    attachJavadoc = true
+-    sign = true
+-}
+-
+ repositories {
+     flatDir {
+         dirs '/usr/share/java'
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/java-log4j-systemd-journal-appender.git/commitdiff/09050c2d67f424563bb71f89430d9fd3c337514e



More information about the pld-cvs-commit mailing list