[arch-commits] Commit in maven/trunk (PKGBUILD)

[Levente Polyak]

    Date: Tuesday, November 6, 2018 @ 02:15:47
  Author: anthraxx
Revision: 401685

upgpkg: maven 3.6.0-1

Modified:
  maven/trunk/PKGBUILD

----------+
 PKGBUILD |   18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-11-06 01:58:52 UTC (rev 401684)
+++ PKGBUILD	2018-11-06 02:15:47 UTC (rev 401685)
@@ -3,19 +3,23 @@
 # Contributor: William Rea <sillywilly at gmail.com>
 
 pkgname=maven
-pkgver=3.5.4
+pkgver=3.6.0
 pkgrel=1
 pkgdesc='Java project management and project comprehension tool'
 url='https://maven.apache.org'
 arch=('any')
 license=('APACHE')
-depends=('java-environment=8' 'bash' 'procps-ng')
+depends=('java-environment>=7' 'bash' 'procps-ng')
 makedepends=('maven' 'java-environment=8')
 backup=('opt/maven/conf/settings.xml')
 source=(https://www-eu.apache.org/dist/maven/maven-3/${pkgver}/source/apache-maven-${pkgver}-src.tar.gz{,.asc}
         maven.sh)
-validpgpkeys=('042B29E928995B9DB963C636C7CA19B7B620D787') # StephenConnolly<stephenc at apache.org>
-sha256sums=('f3ba1f1b24bbd4c345174ac616d40e26e72dad6022d56317d3ff6f7dd003e2f5'
+# https://www.apache.org/dist/maven/KEYS
+validpgpkeys=(
+  '042B29E928995B9DB963C636C7CA19B7B620D787' # StephenConnolly<stephenc at apache.org>
+  'AE9E53FC28FF2AB1012273D0BF1518E0160788A2' # Karl Heinz Marbaise (ASF Key) <khmarbaise at apache.org>
+)
+sha256sums=('b31c0a4d5b76151a0cbef657e332585a6b7604c39754b4ed93c914cbb1c3599e'
             'SKIP'
             '24dc65607ff9e25c74ff2f75711911471910eaf415bce1856789c9d047209b8b')
 
@@ -22,8 +26,7 @@
 build() {
   cd apache-maven-${pkgver}
 
-  . /etc/profile.d/jre.sh
-
+  export PATH="/usr/lib/jvm/java-8-openjdk/bin:${PATH}"
   mvn package \
     -Dmaven.repo.local="${srcdir}/repo" \
     -Dproject.build.sourceEncoding=UTF-8 -e
@@ -32,12 +35,11 @@
 package() {
   cd apache-maven-${pkgver}
 
-  . /etc/profile.d/jre.sh
-
   install -Dm 755 ../maven.sh -t "${pkgdir}/etc/profile.d"
   install -d "${pkgdir}/opt/maven"
 
   # skip tests as they were already executed
+  export PATH="/usr/lib/jvm/java-8-openjdk/bin:${PATH}"
   mvn install \
     -Dmaven.repo.local="${srcdir}/repo" \
     -Dproject.build.sourceEncoding=UTF-8 -e \