[arch-commits] Commit in maven/repos/community-any (5 files)
Levente Polyak
anthraxx at archlinux.org
Tue Sep 10 21:03:55 UTC 2019
Date: Tuesday, September 10, 2019 @ 21:03:54
Author: anthraxx
Revision: 509229
archrelease: copy trunk to community-any
Added:
maven/repos/community-any/PKGBUILD
(from rev 509228, maven/trunk/PKGBUILD)
maven/repos/community-any/maven.sh
(from rev 509228, maven/trunk/maven.sh)
Deleted:
maven/repos/community-any/0001-MNG-6642.patch
maven/repos/community-any/PKGBUILD
maven/repos/community-any/maven.sh
---------------------+
0001-MNG-6642.patch | 46 -------------------
PKGBUILD | 117 +++++++++++++++++++++++---------------------------
maven.sh | 10 ++--
3 files changed, 60 insertions(+), 113 deletions(-)
Deleted: 0001-MNG-6642.patch
===================================================================
--- 0001-MNG-6642.patch 2019-09-10 21:03:49 UTC (rev 509228)
+++ 0001-MNG-6642.patch 2019-09-10 21:03:54 UTC (rev 509229)
@@ -1,46 +0,0 @@
-commit 763f76cf833cddd6630add035c541ac54bbe381d
-Author: Sylwester Lachiewicz <slachiewicz at apache.org>
-Date: Sat Oct 13 04:16:44 2018 +0200
-
- [MNG-6642] Revert "[MNG-5995] Remove dependency to maven-compat (#185)"
-
- This partially reverts commit bb3ec5da71d26d105972392f0a20bc61bc5d8c53 to restore working with Tycho P2 repository.
-
-diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java
-index 0bd94a86a..3159fac6b 100644
---- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java
-+++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java
-@@ -33,7 +33,6 @@
- import org.apache.maven.artifact.Artifact;
- import org.apache.maven.artifact.InvalidRepositoryException;
- import org.apache.maven.artifact.repository.ArtifactRepository;
--import org.apache.maven.bridge.MavenRepositorySystem;
- import org.apache.maven.classrealm.ClassRealmManager;
- import org.apache.maven.model.Build;
- import org.apache.maven.model.Extension;
-@@ -45,6 +44,7 @@
- import org.apache.maven.plugin.PluginManagerException;
- import org.apache.maven.plugin.PluginResolutionException;
- import org.apache.maven.plugin.version.PluginVersionResolutionException;
-+import org.apache.maven.repository.RepositorySystem;
- import org.codehaus.plexus.PlexusContainer;
- import org.codehaus.plexus.classworlds.realm.ClassRealm;
- import org.codehaus.plexus.component.annotations.Component;
-@@ -78,7 +78,7 @@
- private ProjectRealmCache projectRealmCache;
-
- @Requirement
-- private MavenRepositorySystem repositorySystem;
-+ private RepositorySystem repositorySystem;
-
- @Requirement
- private MavenPluginManager pluginManager;
-@@ -92,7 +92,7 @@
-
- for ( Repository repository : pomRepositories )
- {
-- internalRepositories.add( MavenRepositorySystem.buildArtifactRepository( repository ) );
-+ internalRepositories.add( repositorySystem.buildArtifactRepository( repository ) );
- }
-
- repositorySystem.injectMirror( request.getRepositorySession(), internalRepositories );
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-09-10 21:03:49 UTC (rev 509228)
+++ PKGBUILD 2019-09-10 21:03:54 UTC (rev 509229)
@@ -1,62 +0,0 @@
-# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
-# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: William Rea <sillywilly at gmail.com>
-
-pkgname=maven
-pkgver=3.6.1
-pkgrel=2
-pkgdesc='Java project management and project comprehension tool'
-url='https://maven.apache.org'
-arch=('any')
-license=('APACHE')
-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}
- 0001-MNG-6642.patch
- maven.sh)
-# 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=('025921fff6ba827a25413ffc08fb1933565eb1f07ee2d3f228911913ee4f3c3f'
- 'SKIP'
- '70858a5052fdcc93823f34fd6716200c433eec3990cef2058c186ef52fb9882d'
- '17d9b8efa6a922907110026273443bcc8d83e061e14ac82cb5052b483acc9b76')
-
-prepare() {
- cd apache-maven-${pkgver}
-
- patch -Np1 -i ../0001-MNG-6642.patch
-}
-
-build() {
- cd apache-maven-${pkgver}
-
- export PATH="/usr/lib/jvm/java-8-openjdk/bin:${PATH}"
- mvn package \
- -Dmaven.repo.local="${srcdir}/repo" \
- -Dproject.build.sourceEncoding=UTF-8 -e
-}
-
-package() {
- cd apache-maven-${pkgver}
-
- 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 \
- -DdistributionTargetDir="${pkgdir}/opt/maven" \
- -DskipTests -Dmaven.test.skip=true
-
- install -d "${pkgdir}/usr/bin"
- ln -s /opt/maven/bin/mvn "${pkgdir}/usr/bin/mvn"
- ln -s /opt/maven/bin/mvnDebug "${pkgdir}/usr/bin/mvnDebug"
-}
-
-# vim: ts=2 sw=2 et:
Copied: maven/repos/community-any/PKGBUILD (from rev 509228, maven/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-09-10 21:03:54 UTC (rev 509229)
@@ -0,0 +1,55 @@
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: William Rea <sillywilly at gmail.com>
+
+pkgname=maven
+pkgver=3.6.2
+pkgrel=1
+pkgdesc='Java project management and project comprehension tool'
+url='https://maven.apache.org'
+arch=('any')
+license=('APACHE')
+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)
+# https://www.apache.org/dist/maven/KEYS
+validpgpkeys=(
+ '042B29E928995B9DB963C636C7CA19B7B620D787' # StephenConnolly<stephenc at apache.org>
+ 'AE9E53FC28FF2AB1012273D0BF1518E0160788A2' # Karl Heinz Marbaise (ASF Key) <khmarbaise at apache.org>
+ 'BBE7232D7991050B54C8EA0ADC08637CA615D22C' # Enrico Olivelli <eolivelli at apache.org>
+)
+sha256sums=('7ed94655b4098729de292a13c96765bb90a407bb6feb64f201a9444aebde69d1'
+ 'SKIP'
+ '17d9b8efa6a922907110026273443bcc8d83e061e14ac82cb5052b483acc9b76')
+
+build() {
+ cd apache-maven-${pkgver}
+
+ export PATH="/usr/lib/jvm/java-8-openjdk/bin:${PATH}"
+ mvn package \
+ -Dmaven.repo.local="${srcdir}/repo" \
+ -Dproject.build.sourceEncoding=UTF-8 -e
+}
+
+package() {
+ cd apache-maven-${pkgver}
+
+ 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 \
+ -DdistributionTargetDir="${pkgdir}/opt/maven" \
+ -DskipTests -Dmaven.test.skip=true
+
+ install -d "${pkgdir}/usr/bin"
+ ln -s /opt/maven/bin/mvn "${pkgdir}/usr/bin/mvn"
+ ln -s /opt/maven/bin/mvnDebug "${pkgdir}/usr/bin/mvnDebug"
+}
+
+# vim: ts=2 sw=2 et:
Deleted: maven.sh
===================================================================
--- maven.sh 2019-09-10 21:03:49 UTC (rev 509228)
+++ maven.sh 2019-09-10 21:03:54 UTC (rev 509229)
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-#export MAVEN_OPTS=-Xmx1g
-#export M2_HOME=/opt/maven
-#export PATH=$PATH:$M2_HOME/bin
Copied: maven/repos/community-any/maven.sh (from rev 509228, maven/trunk/maven.sh)
===================================================================
--- maven.sh (rev 0)
+++ maven.sh 2019-09-10 21:03:54 UTC (rev 509229)
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+#export MAVEN_OPTS=-Xmx1g
+#export M2_HOME=/opt/maven
+#export PATH=$PATH:$M2_HOME/bin
More information about the arch-commits
mailing list