Gage has submitted this change and it was merged. Change subject: Deb for logstash-gelf.jar: liblogstash-gelf-java ......................................................................
Deb for logstash-gelf.jar: liblogstash-gelf-java Provides logging to Logstash using GELF via JUL, Log4j, etc. * https://github.com/mp911de/logstash-gelf * Uses git-buildpackage, pristine-tar, maven-repo-helper, quilt * Satisfies dependencies using archiva.wikimedia.org * Passes Lintian and Piuparts * Resulting jar compares as expected to the version in Maven Central Change-Id: I8ca2776f6644993c06793d6c0d0009bae37e48d7 --- A debian/README.source A debian/changelog A debian/compat A debian/control A debian/copyright A debian/liblogstash-gelf-java-doc.doc-base.api A debian/liblogstash-gelf-java-doc.install A debian/liblogstash-gelf-java.docs A debian/liblogstash-gelf-java.poms A debian/patches/downgrade-publisher A debian/patches/downgrade-redis A debian/patches/no-clean-during-test A debian/patches/series A debian/patches/use-wmf-archiva A debian/rules A debian/source/format A debian/source/local-options A debian/watch 18 files changed, 303 insertions(+), 0 deletions(-) Approvals: Gage: Verified; Looks good to me, approved diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 0000000..df14428 --- /dev/null +++ b/debian/README.source @@ -0,0 +1,46 @@ +Information about logstash-gelf +------------------------------- + +Maven +----- +This Debian package was developed using the mh_make command +from the maven-debian-helper package. + +However it deviates from Debian policy in order to allow online access +exlusively to http://archive.wikimedia.org during the build. + +Unpackaged dependencies +----------------------- +This library requires the following dependencies which are not +packaged for Debian. All are licensed Apache 2.0 except jedis which +is MIT. + +com.google.code.tempus-fugit tempus-fugit +io.netty netty-all +org.apache.logging.log4j log4j-api +org.apache.logging.log4j log4j-core +org.apache.maven.doxia doxia-module-markdown +org.apache.maven.plugins maven-assembly-plugin +org.apache.maven.plugins maven-project-info-reports-plugin +org.apache.maven.plugins maven-release-plugin +redis.clients jedis + +Because these dependencies cannot be satisifed by Debs, they are +retrieved from Archiva. For simplicity, all other dependencies +are also retrieved from Archiva. + +Git-buildpackage +---------------- +This package uses a version control system as described in +http://wiki.debian.org/Java/JavaVcs and the pages linked from there. + +It contains the upstream source within the VCS upstream branch. +Upstream versions are tagged as upstream/<version> + +Quilt +----- +This package uses quilt to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +See /usr/share/doc/quilt/README.source for a detailed explanation. diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..ad1de85 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,12 @@ +logstash-gelf (1.5.1-1wmf1) precise; urgency=medium + + * Initial release + * Debian package for logstash-gelf.jar: liblogstash-gelf-java + * Provides logging to Logstash using GELF via JUL, Log4j, etc. + * https://github.com/mp911de/logstash-gelf + * Uses git-buildpackage, pristine-tar, maven-repo-helper, quilt + * Satisfies dependencies using archiva.wikimedia.org + * Passes Lintian and Piuparts + * Resulting jar compares as expected to the version in Maven Central + + -- Jeff Gage <jg...@wikimedia.org> Thu, 31 Jul 2014 13:08:24 -0400 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..b596b58 --- /dev/null +++ b/debian/control @@ -0,0 +1,43 @@ +Source: logstash-gelf +Section: java +Priority: optional +Maintainer: Jeff Gage <jg...@wikimedia.org> +Build-Depends: debhelper (>= 9), default-jdk, javahelper, maven-debian-helper (>= 1.5), maven-repo-helper (>= 1.6~), redis-server +Build-Depends-Indep: libmaven-dependency-plugin-java, libmaven-exec-plugin-java, libmaven-javadoc-plugin-java, + libmaven-project-info-reports-plugin-java, libmaven-scm-java, libjson-simple-java, + liblog4j1.2-java (>= 1.2.14), liblogback-java, libslf4j-java, junit4, default-jdk-doc, + libjson-simple-doc, liblog4j1.2-java-doc, liblogback-java-doc +Standards-Version: 3.9.3 +Vcs-Git: https://github.com/mp911de/logstash-gelf.git +Vcs-Browser: https://github.com/mp911de/logstash-gelf/ +Homepage: http://logging.paluch.biz/ + +Package: liblogstash-gelf-java +Architecture: all +Depends: ${misc:Depends}, ${maven:Depends} +Suggests: ${maven:OptionalDepends}, liblogstash-gelf-java-doc +Description: Logstash logging connectors + Provides logging to Logstash using the Graylog Extended Logging Format (GELF) + for using with: + * Java Util Logging + * log4j 1.2.x + * log4j 2.x + * JBoss AS7/Wildfly (JBoss AS8) (mix of Java Util Logging with log4j MDC) + * Logback + +Package: liblogstash-gelf-java-doc +Architecture: all +Section: doc +Depends: ${misc:Depends}, ${maven:DocDepends} +Recommends: ${maven:DocOptionalDepends} +Suggests: liblogstash-gelf-java +Description: Documentation for Logstash logging connectors + Provides logging to Logstash using the Graylog Extended Logging Format (GELF) + for using with: + * Java Util Logging + * log4j 1.2.x + * log4j 2.x + * JBoss AS7/Wildfly (JBoss AS8) (mix of Java Util Logging with log4j MDC) + * Logback + . + This package contains the API documentation of liblogstash-gelf-java. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..95105a8 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,16 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: logstash logging connectors +Source: https://github.com/mp911de/logstash-gelf/ + +Files: * +Copyright: 2013-2014, Mark Paluch <mpal...@paluch.biz> +License: MIT + +Files: debian/* +Copyright: 2014, Jeff Gage <jg...@wikimedia.org> +License: MIT + +License: MIT + TODO: include the full text of the license here + + diff --git a/debian/liblogstash-gelf-java-doc.doc-base.api b/debian/liblogstash-gelf-java-doc.doc-base.api new file mode 100644 index 0000000..14b5182 --- /dev/null +++ b/debian/liblogstash-gelf-java-doc.doc-base.api @@ -0,0 +1,10 @@ +Document: liblogstash-gelf-java +Title: API Javadoc for logstash logging connectors +Author: logstash logging connectors developers +Abstract: This is the API Javadoc provided for the + liblogstash-gelf-java library. +Section: Programming + +Format: HTML +Index: /usr/share/doc/liblogstash-gelf-java/api/index.html +Files: /usr/share/doc/liblogstash-gelf-java/api/* diff --git a/debian/liblogstash-gelf-java-doc.install b/debian/liblogstash-gelf-java-doc.install new file mode 100644 index 0000000..56779bb --- /dev/null +++ b/debian/liblogstash-gelf-java-doc.install @@ -0,0 +1,2 @@ +target/site/apidocs/* usr/share/doc/liblogstash-gelf-java/api + diff --git a/debian/liblogstash-gelf-java.docs b/debian/liblogstash-gelf-java.docs new file mode 100644 index 0000000..b43bf86 --- /dev/null +++ b/debian/liblogstash-gelf-java.docs @@ -0,0 +1 @@ +README.md diff --git a/debian/liblogstash-gelf-java.poms b/debian/liblogstash-gelf-java.poms new file mode 100644 index 0000000..87f2cc6 --- /dev/null +++ b/debian/liblogstash-gelf-java.poms @@ -0,0 +1 @@ +pom.xml --no-parent --has-package-version diff --git a/debian/patches/downgrade-publisher b/debian/patches/downgrade-publisher new file mode 100644 index 0000000..fb6a8f1 --- /dev/null +++ b/debian/patches/downgrade-publisher @@ -0,0 +1,20 @@ +Description: Downgrade maven-scm-publish-plugin to build with Maven 2 +Last-Update: 2014-07-29 +--- a/pom.xml ++++ b/pom.xml +@@ -72,7 +72,7 @@ + <coveralls-maven-plugin.version>2.2.0</coveralls-maven-plugin.version> + <maven-release-plugin.version>2.5</maven-release-plugin.version> + <netty-all.version>4.0.12.Final</netty-all.version> +- <maven-scm-publish-plugin.version>1.1</maven-scm-publish-plugin.version> ++ <maven-scm-publish-plugin.version>1.0-beta-2</maven-scm-publish-plugin.version> + <tempus-fugit.version>1.1</tempus-fugit.version> + <maven-dependency-plugin.version>2.8</maven-dependency-plugin.version> + <maven-assembly-plugin.version>2.2-beta-5</maven-assembly-plugin.version> +@@ -323,4 +323,4 @@ + </plugin> + </plugins> + </reporting> +-</project> +\ No newline at end of file ++</project> diff --git a/debian/patches/downgrade-redis b/debian/patches/downgrade-redis new file mode 100644 index 0000000..967cb47 --- /dev/null +++ b/debian/patches/downgrade-redis @@ -0,0 +1,14 @@ +Description: Make Redis config compatible with Redis 2.2 as shipped in Ubuntu 12.04 +Last-Update: 2014-07-31 +--- a/Makefile ++++ b/Makefile +@@ -5,9 +5,7 @@ daemonize yes + port 6479 + pidfile work/redis1-6479.pid + logfile work/redis1-6479.log +-save "" + appendonly no +-client-output-buffer-limit pubsub 256k 128k 5 + endef + + export REDIS1_CONF diff --git a/debian/patches/no-clean-during-test b/debian/patches/no-clean-during-test new file mode 100644 index 0000000..7eef571 --- /dev/null +++ b/debian/patches/no-clean-during-test @@ -0,0 +1,13 @@ +Description: Don't clean during testing because it removes the jar we just built +Last-Update: 2014-07-31 +--- a/Makefile ++++ b/Makefile +@@ -37,7 +37,7 @@ test-coveralls: + test: + make start + sleep 2 +- mvn -B -Dtest.withRedis=true clean compile test ++ mvn -B -Dtest.withRedis=true compile test + make stop + + travis-install: diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..c984a41 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,4 @@ +no-clean-during-test +downgrade-redis +downgrade-publisher +use-wmf-archiva diff --git a/debian/patches/use-wmf-archiva b/debian/patches/use-wmf-archiva new file mode 100644 index 0000000..64abbdf --- /dev/null +++ b/debian/patches/use-wmf-archiva @@ -0,0 +1,82 @@ +Description: Disable Maven Central, allow access only to archiva.wikimedia.org +Last-Update: 2014-07-29 +--- a/pom.xml ++++ b/pom.xml +@@ -323,4 +323,77 @@ + </plugin> + </plugins> + </reporting> ++ <repositories> ++ <!-- disable Maven central --> ++ <repository> ++ <id>central</id> ++ <url>http://repo1.maven.org/maven2</url> ++ <releases> ++ <enabled>false</enabled> ++ </releases> ++ <snapshots> ++ <enabled>false</enabled> ++ </snapshots> ++ </repository> ++ ++ <!-- Repository information for archiva.wikimedia.org. --> ++ <repository> ++ <id>wikimedia.mirrored</id> ++ <name>Wikimedia Mirrored Repository</name> ++ <url>http://archiva.wikimedia.org/repository/mirrored</url> ++ <releases> ++ <enabled>true</enabled> ++ <checksumPolicy>fail</checksumPolicy> ++ </releases> ++ <snapshots> ++ <enabled>false</enabled> ++ </snapshots> ++ </repository> ++ ++ <repository> ++ <id>wikimedia.releases</id> ++ <name>Wikimedia Release Repository</name> ++ <url>http://archiva.wikimedia.org/repository/releases</url> ++ <releases> ++ <enabled>true</enabled> ++ <checksumPolicy>fail</checksumPolicy> ++ </releases> ++ <snapshots> ++ <enabled>false</enabled> ++ </snapshots> ++ </repository> ++ ++ <repository> ++ <id>wikimedia.snaphots</id> ++ <name>Wikimedia Snapshot Repository</name> ++ <url>http://archiva.wikimedia.org/repository/snapshots</url> ++ <releases> ++ <enabled>false</enabled> ++ </releases> ++ <snapshots> ++ <enabled>true</enabled> ++ <checksumPolicy>fail</checksumPolicy> ++ </snapshots> ++ </repository> ++ </repositories> ++ ++ <pluginRepositories> ++ <!-- disable Maven central --> ++ <pluginRepository> ++ <id>central</id> ++ <url>http://repo1.maven.org/maven2</url> ++ <releases> ++ <enabled>false</enabled> ++ </releases> ++ <snapshots> ++ <enabled>false</enabled> ++ </snapshots> ++ </pluginRepository> ++ ++ <pluginRepository> ++ <id>wikimedia.mirrored</id> ++ <name>Wikimedia Mirrored Repository</name> ++ <url>http://archiva.wikimedia.org/repository/mirrored/</url> ++ </pluginRepository> ++ </pluginRepositories> + </project> diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..65f6d88 --- /dev/null +++ b/debian/rules @@ -0,0 +1,31 @@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +DEB_UPSTREAM_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ' | cut -d: -f2- | sed 's/-[^-]*$$//') +export JAVA_HOME=/usr/lib/jvm/default-java + +# Put depended upon jars in here +# export CLASSPATH= + +get-orig-source: + pristine-tar checkout ../logstash-gelf_$(DEB_UPSTREAM_VERSION).orig.tar.gz + +%: + dh $@ --with javahelper --with jh_maven_repo_helper + +override_dh_auto_build: + mvn package + mvn javadoc:javadoc + +override_dh_auto_install: + mh_installpoms -pliblogstash-gelf-java + mh_installjar -pliblogstash-gelf-java pom.xml target/logstash-gelf-$(DEB_UPSTREAM_VERSION).jar \ + --java-lib --usj-version=$(DEB_UPSTREAM_VERSION) + +override_dh_auto_clean: + #rm -rf target/ + mh_clean + jh_clean + dh_auto_clean diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/source/local-options b/debian/source/local-options new file mode 100644 index 0000000..4aceb10 --- /dev/null +++ b/debian/source/local-options @@ -0,0 +1 @@ +unapply-patches diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..c68c72a --- /dev/null +++ b/debian/watch @@ -0,0 +1,5 @@ +# watch control file: see uscan(1) +version=3 + +# https://wiki.debian.org/debian/watch/#GitHub +https://github.com/mp911de/logstash-gelf/tags (?:.*/)?logstash-gelf-(\d[\d\.]*)\.tar\.gz -- To view, visit https://gerrit.wikimedia.org/r/151615 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8ca2776f6644993c06793d6c0d0009bae37e48d7 Gerrit-PatchSet: 2 Gerrit-Project: operations/debs/logstash-gelf Gerrit-Branch: master Gerrit-Owner: Gage <jger...@wikimedia.org> Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org> Gerrit-Reviewer: Gage <jger...@wikimedia.org> Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org> Gerrit-Reviewer: Ottomata <o...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
