pool/maven-archiver
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1109287 from Java:packages

Browse Source 
3.6.1

OBS-URL: https://build.opensuse.org/request/show/1109287
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/maven-archiver?expand=0&rev=4
This commit is contained in:
Ana Guerrero 2023-09-06 17:00:08 +00:00 committed by Git OBS Bridge
commit 1d190bcf17
6 changed files with 92 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
0001-Port-tests-to-Eclipse-Aether.patch
View File

@ -1,15 +0,0 @@
diff --git a/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java b/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
index 2f5965d..0b1d111 100644
--- a/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
+++ b/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
@@ -41,8 +41,8 @@ import org.codehaus.plexus.archiver.jar.JarArchiver;
import org.codehaus.plexus.archiver.jar.ManifestException;
import org.junit.Ignore;
import org.junit.Test;
-import org.sonatype.aether.RepositorySystemSession;
-import org.sonatype.aether.util.DefaultRepositorySystemSession;
+import org.eclipse.aether.RepositorySystemSession;
+import org.eclipse.aether.DefaultRepositorySystemSession;
import java.io.File;
import java.io.IOException;

3
maven-archiver-3.5.0-source-release.zip
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7cd12342dfe51332257ed916bb83f5cb2d0a68cd97693fe6cd2b1521f1ec0488
size 138877

BIN
maven-archiver-3.6.1-source-release.zip (Stored with Git LFS) Normal file
View File

Binary file not shown.

110
maven-archiver-build.xml
View File

@ -10,11 +10,11 @@
<property name="project.groupId" value="org.apache.maven"/>
<property name="project.artifactId" value="maven-archiver"/>
<property name="project.version" value="3.5.0"/>
<property name="project.version" value="3.6.1"/>
<property name="project.name" value="Apache Maven Archiver"/>
<property name="project.organization.name" value="The Apache Software Foundation"/>
<property name="spec.version" value="3.5"/>
<property name="spec.version" value="3.6"/>
<property name="compiler.source" value="1.8"/>
<property name="compiler.target" value="${compiler.source}"/>
@ -24,10 +24,7 @@
<property name="build.outputDir" value="${build.dir}/classes"/>
<property name="build.srcDir" value="src/main/java"/>
<property name="build.resourceDir" value="src/main/resources"/>
<property name="build.testOutputDir" value="${build.dir}/test-classes"/>
<property name="build.testDir" value="src/test/java"/>
<property name="build.testResourceDir" value="src/test/resources"/>
<property name="test.reports" value="${build.dir}/test-reports"/>
<property name="reporting.outputDirectory" value="${build.dir}/site"/>
<!-- ====================================================================== -->
@ -39,11 +36,6 @@
<include name="**/*.jar"/>
</fileset>
</path>
<path id="build.test.classpath">
<fileset dir="lib">
<include name="**/*.jar"/>
</fileset>
</path>
<!-- ====================================================================== -->
<!-- Cleaning up target -->
@ -75,100 +67,6 @@
</javac>
</target>
<!-- ====================================================================== -->
<!-- Test-compilation target -->
<!-- ====================================================================== -->
<target name="compile-tests"
depends="compile"
description="Compile the test code"
unless="test.skip">
<mkdir dir="${build.testOutputDir}"/>
<javac destdir="${build.testOutputDir}"
nowarn="false"
debug="true"
optimize="false"
deprecation="true"
target="${compiler.target}"
verbose="false"
fork="false"
source="${compiler.source}">
<src>
<pathelement location="${build.testDir}"/>
</src>
<classpath>
<path refid="build.test.classpath"/>
<pathelement location="${build.outputDir}"/>
</classpath>
</javac>
<copy todir="${build.testOutputDir}">
<fileset dir="${build.testResourceDir}"/>
</copy>
</target>
<!-- ====================================================================== -->
<!-- Run all tests -->
<!-- ====================================================================== -->
<target name="test"
depends="compile-tests, junit-missing"
unless="junit.skipped"
description="Run the test cases">
<mkdir dir="${test.reports}"/>
<junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
<sysproperty key="basedir" value="."/>
<formatter type="xml"/>
<formatter type="plain" usefile="false"/>
<classpath>
<path refid="build.test.classpath"/>
<pathelement location="${build.outputDir}"/>
<pathelement location="${build.testOutputDir}"/>
</classpath>
<batchtest todir="${test.reports}" unless="test">
<fileset dir="${build.testDir}">
<include name="**/Test*.java"/>
<include name="**/*Test.java"/>
<include name="**/*TestCase.java"/>
<exclude name="**/*Abstract*Test.java"/>
</fileset>
</batchtest>
<batchtest todir="${test.reports}" if="test">
<fileset dir="${build.testDir}">
<include name="**/${test}.java"/>
<exclude name="**/*Abstract*Test.java"/>
</fileset>
</batchtest>
</junit>
</target>
<target name="test-junit-present">
<available classname="junit.framework.Test" property="junit.present" classpathref="build.test.classpath"/>
</target>
<target name="test-junit-status"
depends="test-junit-present">
<condition property="junit.missing">
<and>
<isfalse value="${junit.present}"/>
<isfalse value="${test.skip}"/>
</and>
</condition>
<condition property="junit.skipped">
<or>
<isfalse value="${junit.present}"/>
<istrue value="${test.skip}"/>
</or>
</condition>
</target>
<target name="junit-missing"
depends="test-junit-status"
if="junit.missing">
<echo>=================================== WARNING ===================================</echo>
<echo> JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed.</echo>
<echo>===============================================================================</echo>
</target>
<!-- ====================================================================== -->
<!-- Javadoc target -->
<!-- ====================================================================== -->
@ -202,7 +100,7 @@
<!-- Package target -->
<!-- ====================================================================== -->
<target name="package" depends="compile,test" description="Package the application">
<target name="package" depends="compile" description="Package the application">
<jar jarfile="${build.dir}/${build.finalName}.jar"
compress="true"
index="false"

67
maven-archiver.changes
View File

@ -1,3 +1,28 @@
-------------------------------------------------------------------
Wed Sep 6 14:03:52 UTC 2023 - Fridrich Strba <fstrba@suse.com>
- Upgrade to maven-archiver 3.6.1
- Changes of 3.6.1
* New Feature
+ MSHARED-1251: Deprecate the JAR Index feature (JDK-8302819)
* Task
+ MSHARED-1293: Refresh download page
+ MSHARED-1297: Prefer JDK features over plexus-utils, plexus-io
- Changes of 3.6.0
* Task
+ MSHARED-991: Require Java 8
+ MSHARED-1081: Drop m-shared-utils from deps
- Changes of 3.5.2
* Bug
+ MSHARED-849: archiver sorts META-INF/MANIFEST.MF before
META-INF/ in ZIP header
- Changes of 3.5.1
* Improvement
+ MSHARED-879: make build Reproducible
- Removed patch:
* 0001-Port-tests-to-Eclipse-Aether.patch
+ not needed with this version
-------------------------------------------------------------------
Sun Mar 20 19:54:42 UTC 2022 - Fridrich Strba <fstrba@suse.com>
@ -7,6 +32,48 @@ Sun Mar 20 19:54:42 UTC 2022 - Fridrich Strba <fstrba@suse.com>
Sun Nov 24 14:39:30 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Upgrade to version 3.5.0
- Changes of 3.5.0
* New Feature
+ MSHARED-837: add an API to configure Reproducible Builds
with outputTimestamp
* Improvement
* MSHARED-833: make pom.properties entries order reproducible
* MSHARED-834: add an API to override Created-By manifest entry
value
* MSHARED-835: add an API to not define Build-Jdk-Spec default
manifest entry
- Changes of 3.4.0
* Bug
+ MSHARED-588: User supplied Class-Path entry does not go first
+ MSHARED-782: Deprecated option classpathMavenRepositoryLayout
not marked as deprecated in the documentation
+ MSHARED-783: Archiver documentation issue tracker 404
* New Feature
+ MSHARED-787: Add optional buildEnvironment information to the
manifest
+ MSHARED-798: Add addDefaultEntries option (true by default)
* Improvement
+ MSHARED-362: Support removing default manifest entries with
Maven Archiver
+ MSHARED-777: Remove deprecated main attributes from generated
manifest
+ MSHARED-799: Change "Created-By" manifest entry value to be
reproducible
+ MSHARED-800: Remove Maven version from pom.properties
* Wish
+ MSHARED-661: Remove manifest entry "Built-By: <username>" for
reproducible builds
+ MSHARED-796] - use java.specification.version instead of
java.version in Build-Jdk manifest entry
* Task
+ MSHARED-797: Move current Build-Jdk manifest entry to
Build-Jdk-Spec
- Changes of 3.3.0
* Bug
+ MSHARED-448: testRecreation failure with OpenJDK 8 on Linux
* Improvement
+ MSHARED-773: Fail on invalid 'Automatic-Module-Name' in
MANIFEST
- Removed patch:
* 0002-MSHARED-448-Skip-failing-assertion.patch
+ not needed with this version

54
maven-archiver.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package maven-archiver
#
# Copyright (c) 2022 SUSE LLC
# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -18,15 +18,14 @@
%bcond_with tests
Name: maven-archiver
Version: 3.5.0
Version: 3.6.1
Release: 0
Summary: Maven Archiver
License: Apache-2.0
Group: Development/Libraries/Java
URL: http://maven.apache.org/shared/maven-archiver/
Source0: http://repo1.maven.org/maven2/org/apache/maven/%{name}/%{version}/%{name}-%{version}-source-release.zip
URL: https://maven.apache.org/shared/maven-archiver/
Source0: https://repo1.maven.org/maven2/org/apache/maven/%{name}/%{version}/%{name}-%{version}-source-release.zip
Source1: %{name}-build.xml
Patch0: 0001-Port-tests-to-Eclipse-Aether.patch
BuildRequires: ant
BuildRequires: fdupes
BuildRequires: javapackages-local
@ -37,19 +36,7 @@ BuildRequires: plexus-interpolation >= 1.25
BuildRequires: plexus-utils >= 3.3.0
BuildRequires: sisu-plexus
BuildRequires: unzip
BuildRequires: xmvn-install
BuildRequires: xmvn-resolve
BuildRequires: mvn(org.apache.maven.shared:maven-shared-components:pom:)
BuildArch: noarch
%if %{with tests}
BuildRequires: ant-junit
BuildRequires: apache-commons-compress
BuildRequires: apache-commons-io
BuildRequires: assertj-core
BuildRequires: maven-resolver-api
BuildRequires: plexus-io
BuildRequires: plexus-utils
%endif
%description
The Maven Archiver is used by other Maven plugins
@ -65,7 +52,8 @@ Javadoc for %{name}.
%prep
%setup -q
cp %{SOURCE1} build.xml
%patch0 -p1
%pom_xpath_remove pom:project/pom:parent/pom:relativePath
%build
mkdir -p lib
@ -77,34 +65,28 @@ build-jar-repository -s lib \
plexus/interpolation \
plexus/archiver
%if %{with tests}
build-jar-repository -s lib \
assertj-core/assertj-core \
maven-resolver/maven-resolver-api \
maven/maven-settings \
plexus/io \
commons-compress \
commons-io \
plexus/utils
%endif
%{ant} \
%if %{without tests}
-Dtest.skip=true \
%endif
jar javadoc
%{mvn_artifact} pom.xml target/%{name}-%{version}.jar
%install
%mvn_install
# jar
install -dm 0755 %{buildroot}%{_javadir}/%{name}
install -pm 0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}.jar
# pom
install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name}
%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom
%add_maven_depmap %{name}/%{name}.pom %{name}/%{name}.jar
# javadoc
install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
%fdupes -s %{buildroot}%{_javadocdir}
%files -f .mfiles
%license LICENSE
%doc NOTICE
%files javadoc -f .mfiles-javadoc
%files javadoc
%{_javadocdir}/%{name}
%license LICENSE
%doc NOTICE