Page MenuHomeSolus

D13385.id32757.diff
No OneTemporary

D13385.id32757.diff

diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,8 +1,8 @@
name : apache-maven
-version : 3.8.4
-release : 16
+version : 3.8.6
+release : 17
source :
- - https://github.com/apache/maven/archive/maven-3.8.4.tar.gz : 41031e3dfcb0d75d99a5615c988bab3d2d2819c98482eb5d17a877c758925c02
+ - https://github.com/apache/maven/archive/maven-3.8.6.tar.gz : 489adeeb8ae3197e6a819c43bd6d611705521d12f31820f2f43d1c68ef6a32de
license : Apache-2.0
component : programming.java
summary : A software project management and comprehension tool
@@ -11,12 +11,16 @@
networking : yes
builddeps :
- apache-maven
+ - openjdk-17
rundeps :
- openjdk-11
+environment: |
+ export JAVA_HOME=/usr/lib64/openjdk-17
+ export PATH=$JAVA_HOME/bin:$PATH
setup : |
%patch -p1 < $pkgfiles/0001-Default-to-openjdk-11.patch
build : |
- mvn -DdistributionTargetDir=$installdir/usr/share/apache-maven -Dmaven.repo.local=../local-repo clean install
+ mvn clean install -DdistributionTargetDir=$installdir/usr/share/apache-maven -Dmaven.repo.local=../local-repo -DskipTests
install : |
install -dm00755 $installdir/usr/bin
ln -s /usr/share/apache-maven/bin/mvn $installdir/usr/bin/mvn
@@ -26,3 +30,6 @@
find $installdir/usr/share/apache-maven \( -name 'README*' -o -iname '*license' -o -name NOTICE -o -name '*.cmd' \) -delete
find $installdir/usr/share/apache-maven/lib/jansi-native -mindepth 1 -maxdepth 1 -type d -not -name linux64 -exec rm -rfv {} +
rmdir $installdir/usr/share/apache-maven/lib/ext
+check : |
+ cd maven-*
+ mvn test -Dmaven.repo.local=../../local-repo
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -2,8 +2,8 @@
<Source>
<Name>apache-maven</Name>
<Packager>
- <Name>F. von Gellhorn</Name>
- <Email>flinux@vongellhorn.ch</Email>
+ <Name>Reilly Brogan</Name>
+ <Email>solus@reillybrogan.com</Email>
</Packager>
<License>Apache-2.0</License>
<PartOf>programming.java</PartOf>
@@ -38,47 +38,47 @@
<Path fileType="data">/usr/share/apache-maven/lib/jansi-native</Path>
<Path fileType="data">/usr/share/apache-maven/lib/javax.annotation-api-1.2.jar</Path>
<Path fileType="data">/usr/share/apache-maven/lib/javax.inject-1.jar</Path>
- <Path fileType="data">/usr/share/apache-maven/lib/jcl-over-slf4j-1.7.32.jar</Path>
- <Path fileType="data">/usr/share/apache-maven/lib/maven-artifact-3.8.4.jar</Path>
- <Path fileType="data">/usr/share/apache-maven/lib/maven-builder-support-3.8.4.jar</Path>
- <Path fileType="data">/usr/share/apache-maven/lib/maven-compat-3.8.4.jar</Path>
- <Path fileType="data">/usr/share/apache-maven/lib/maven-core-3.8.4.jar</Path>
- <Path fileType="data">/usr/share/apache-maven/lib/maven-embedder-3.8.4.jar</Path>
- <Path fileType="data">/usr/share/apache-maven/lib/maven-model-3.8.4.jar</Path>
- <Path fileType="data">/usr/share/apache-maven/lib/maven-model-builder-3.8.4.jar</Path>
- <Path fileType="data">/usr/share/apache-maven/lib/maven-plugin-api-3.8.4.jar</Path>
- <Path fileType="data">/usr/share/apache-maven/lib/maven-repository-metadata-3.8.4.jar</Path>
+ <Path fileType="data">/usr/share/apache-maven/lib/jcl-over-slf4j-1.7.36.jar</Path>
+ <Path fileType="data">/usr/share/apache-maven/lib/maven-artifact-3.8.6.jar</Path>
+ <Path fileType="data">/usr/share/apache-maven/lib/maven-builder-support-3.8.6.jar</Path>
+ <Path fileType="data">/usr/share/apache-maven/lib/maven-compat-3.8.6.jar</Path>
+ <Path fileType="data">/usr/share/apache-maven/lib/maven-core-3.8.6.jar</Path>
+ <Path fileType="data">/usr/share/apache-maven/lib/maven-embedder-3.8.6.jar</Path>
+ <Path fileType="data">/usr/share/apache-maven/lib/maven-model-3.8.6.jar</Path>
+ <Path fileType="data">/usr/share/apache-maven/lib/maven-model-builder-3.8.6.jar</Path>
+ <Path fileType="data">/usr/share/apache-maven/lib/maven-plugin-api-3.8.6.jar</Path>
+ <Path fileType="data">/usr/share/apache-maven/lib/maven-repository-metadata-3.8.6.jar</Path>
<Path fileType="data">/usr/share/apache-maven/lib/maven-resolver-api-1.6.3.jar</Path>
<Path fileType="data">/usr/share/apache-maven/lib/maven-resolver-connector-basic-1.6.3.jar</Path>
<Path fileType="data">/usr/share/apache-maven/lib/maven-resolver-impl-1.6.3.jar</Path>
- <Path fileType="data">/usr/share/apache-maven/lib/maven-resolver-provider-3.8.4.jar</Path>
+ <Path fileType="data">/usr/share/apache-maven/lib/maven-resolver-provider-3.8.6.jar</Path>
<Path fileType="data">/usr/share/apache-maven/lib/maven-resolver-spi-1.6.3.jar</Path>
<Path fileType="data">/usr/share/apache-maven/lib/maven-resolver-transport-wagon-1.6.3.jar</Path>
<Path fileType="data">/usr/share/apache-maven/lib/maven-resolver-util-1.6.3.jar</Path>
- <Path fileType="data">/usr/share/apache-maven/lib/maven-settings-3.8.4.jar</Path>
- <Path fileType="data">/usr/share/apache-maven/lib/maven-settings-builder-3.8.4.jar</Path>
+ <Path fileType="data">/usr/share/apache-maven/lib/maven-settings-3.8.6.jar</Path>
+ <Path fileType="data">/usr/share/apache-maven/lib/maven-settings-builder-3.8.6.jar</Path>
<Path fileType="data">/usr/share/apache-maven/lib/maven-shared-utils-3.3.4.jar</Path>
- <Path fileType="data">/usr/share/apache-maven/lib/maven-slf4j-provider-3.8.4.jar</Path>
+ <Path fileType="data">/usr/share/apache-maven/lib/maven-slf4j-provider-3.8.6.jar</Path>
<Path fileType="data">/usr/share/apache-maven/lib/org.eclipse.sisu.inject-0.3.5.jar</Path>
<Path fileType="data">/usr/share/apache-maven/lib/org.eclipse.sisu.plexus-0.3.5.jar</Path>
<Path fileType="data">/usr/share/apache-maven/lib/plexus-cipher-2.0.jar</Path>
<Path fileType="data">/usr/share/apache-maven/lib/plexus-component-annotations-2.1.0.jar</Path>
<Path fileType="data">/usr/share/apache-maven/lib/plexus-interpolation-1.26.jar</Path>
<Path fileType="data">/usr/share/apache-maven/lib/plexus-sec-dispatcher-2.0.jar</Path>
- <Path fileType="data">/usr/share/apache-maven/lib/plexus-utils-3.3.0.jar</Path>
- <Path fileType="data">/usr/share/apache-maven/lib/slf4j-api-1.7.32.jar</Path>
- <Path fileType="data">/usr/share/apache-maven/lib/wagon-file-3.4.3.jar</Path>
- <Path fileType="data">/usr/share/apache-maven/lib/wagon-http-3.4.3-shaded.jar</Path>
- <Path fileType="data">/usr/share/apache-maven/lib/wagon-provider-api-3.4.3.jar</Path>
+ <Path fileType="data">/usr/share/apache-maven/lib/plexus-utils-3.3.1.jar</Path>
+ <Path fileType="data">/usr/share/apache-maven/lib/slf4j-api-1.7.36.jar</Path>
+ <Path fileType="data">/usr/share/apache-maven/lib/wagon-file-3.5.1.jar</Path>
+ <Path fileType="data">/usr/share/apache-maven/lib/wagon-http-3.5.1-shaded.jar</Path>
+ <Path fileType="data">/usr/share/apache-maven/lib/wagon-provider-api-3.5.1.jar</Path>
</Files>
</Package>
<History>
- <Update release="16">
- <Date>2022-03-26</Date>
- <Version>3.8.4</Version>
+ <Update release="17">
+ <Date>2022-07-26</Date>
+ <Version>3.8.6</Version>
<Comment>Packaging update</Comment>
- <Name>F. von Gellhorn</Name>
- <Email>flinux@vongellhorn.ch</Email>
+ <Name>Reilly Brogan</Name>
+ <Email>solus@reillybrogan.com</Email>
</Update>
</History>
</PISI>
\ No newline at end of file

File Metadata

Mime Type
text/plain
Expires
Jun 16 2023, 5:32 PM (8 w, 6 h ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5793601
Default Alt Text
D13385.id32757.diff (7 KB)

Event Timeline