Date: Tuesday, July 7, 2020 @ 12:39:24 Author: diabonas Revision: 658172
archrelease: copy trunk to community-any Added: junit-system-rules/repos/community-any/PKGBUILD (from rev 658171, junit-system-rules/trunk/PKGBUILD) junit-system-rules/repos/community-any/junit-system-rules-1.19.0_update-maven-jar-plugin.patch (from rev 658171, junit-system-rules/trunk/junit-system-rules-1.19.0_update-maven-jar-plugin.patch) Deleted: junit-system-rules/repos/community-any/PKGBUILD ---------------------------------------------------------+ PKGBUILD | 92 +++++++------- junit-system-rules-1.19.0_update-maven-jar-plugin.patch | 29 ++++ 2 files changed, 77 insertions(+), 44 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-07-07 12:39:17 UTC (rev 658171) +++ PKGBUILD 2020-07-07 12:39:24 UTC (rev 658172) @@ -1,44 +0,0 @@ -# Maintainer: Jonas Witschel <diabo...@archlinux.org> -pkgname=junit-system-rules -pkgver=1.19.0 -_commit=f4782ebfd72c08bd3f00aa04ad20fe499c5463b4 # signed commit corresponding to tag "system-rules-$pkgver" -pkgrel=6 -pkgdesc='A collection of JUnit rules for testing code that uses java.lang.System' -arch=('any') -url='https://stefanbirkner.github.io/system-rules/' -license=('CPL') -depends=('junit') -makedepends=('git' 'jdk8-openjdk' 'maven' 'strip-nondeterminism') -source=("$pkgname::git+https://github.com/stefanbirkner/system-rules.git?signed#commit=$_commit") -sha512sums=('SKIP') -validpgpkeys=('F4AF40991AECE57728B0034F9ECE1F68817F4996') # Stefan Birkner <m...@stefan-birkner.de> - -pkgver() { - cd "$pkgname" - git describe --tags | sed 's/^system-rules-//;s/\([^-]*-g\)/r\1/;s/-/./g' -} - -build() { - cd "$pkgname" - - # The package cannot be compiled with newer Java versions (but works fine at runtime) - # (https://github.com/stefanbirkner/system-rules/issues/65#issuecomment-402837535) - export PATH="/usr/lib/jvm/java-8-openjdk/bin:$PATH" - - mvn -DskipTests=true clean package - - # Timestamps in JAR files generated by Maven do not honour SOURCE_DATE_EPOCH - # (https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=74682318) - strip-nondeterminism --timestamp "$SOURCE_DATE_EPOCH" "target/system-rules-$pkgver.jar" -} - -check() { - cd "$pkgname" - mvn test -} - -package() { - cd "$pkgname" - install -Dm644 "target/system-rules-$pkgver.jar" -t "$pkgdir/usr/share/java/junit-system-rules" - ln -s "system-rules-$pkgver.jar" "$pkgdir/usr/share/java/junit-system-rules/system-rules.jar" -} Copied: junit-system-rules/repos/community-any/PKGBUILD (from rev 658171, junit-system-rules/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-07-07 12:39:24 UTC (rev 658172) @@ -0,0 +1,48 @@ +# Maintainer: Jonas Witschel <diabo...@archlinux.org> +pkgname=junit-system-rules +pkgver=1.19.0 +_commit=f4782ebfd72c08bd3f00aa04ad20fe499c5463b4 # signed commit corresponding to tag "system-rules-$pkgver" +pkgrel=7 +pkgdesc='A collection of JUnit rules for testing code that uses java.lang.System' +arch=('any') +url='https://stefanbirkner.github.io/system-rules/' +license=('CPL') +depends=('junit') +makedepends=('git' 'jdk8-openjdk' 'maven') +source=("$pkgname::git+https://github.com/stefanbirkner/system-rules.git?signed#commit=$_commit" + 'junit-system-rules-1.19.0_update-maven-jar-plugin.patch') +sha512sums=('SKIP' + 'ec9fb99770b406ac3e56c49820e33ff255958566724534f0d6afc340ebfb1fbbd7043fc188d39d553ca230058ff7d592ede8729feb8434c6090849bb26a7dea4') +validpgpkeys=('F4AF40991AECE57728B0034F9ECE1F68817F4996') # Stefan Birkner <m...@stefan-birkner.de> + +pkgver() { + cd "$pkgname" + git describe --tags | sed 's/^system-rules-//;s/\([^-]*-g\)/r\1/;s/-/./g' +} + +prepare() { + cd "$pkgname" + # Update the plugin generating the JAR file to a version supporting reproducible builds + patch --strip=1 --input="$srcdir/junit-system-rules-1.19.0_update-maven-jar-plugin.patch" +} + +build() { + cd "$pkgname" + + # The package cannot be compiled with newer Java versions (but works fine at runtime) + # (https://github.com/stefanbirkner/system-rules/issues/65#issuecomment-402837535) + export PATH="/usr/lib/jvm/java-8-openjdk/bin:$PATH" + + mvn -Dproject.build.outputTimestamp="$SOURCE_DATE_EPOCH" -DskipTests=true clean package +} + +check() { + cd "$pkgname" + mvn test +} + +package() { + cd "$pkgname" + install -Dm644 "target/system-rules-$pkgver.jar" -t "$pkgdir/usr/share/java/junit-system-rules" + ln -s "system-rules-$pkgver.jar" "$pkgdir/usr/share/java/junit-system-rules/system-rules.jar" +} Copied: junit-system-rules/repos/community-any/junit-system-rules-1.19.0_update-maven-jar-plugin.patch (from rev 658171, junit-system-rules/trunk/junit-system-rules-1.19.0_update-maven-jar-plugin.patch) =================================================================== --- junit-system-rules-1.19.0_update-maven-jar-plugin.patch (rev 0) +++ junit-system-rules-1.19.0_update-maven-jar-plugin.patch 2020-07-07 12:39:24 UTC (rev 658172) @@ -0,0 +1,29 @@ +From 13fd4bb331dae0ae99c97c5b7bdaa7eb7247a57b Mon Sep 17 00:00:00 2001 +From: Jonas Witschel <diabo...@archlinux.org> +Date: Tue, 7 Jul 2020 14:09:37 +0200 +Subject: [PATCH] Update maven-jar-plugin to version 3.2.0 + +This is the minimal plugin version to support reproducible builds using the +"project.build.outputTimestamp" property. +--- + pom.xml | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/pom.xml b/pom.xml +index e764bd9..596e3cc 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -121,6 +121,10 @@ + <forkMode>always</forkMode> + </configuration> + </plugin> ++ <plugin> ++ <artifactId>maven-jar-plugin</artifactId> ++ <version>3.2.0</version> ++ </plugin> + </plugins> + </build> + +-- +2.27.0 +