OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-archiver?expand=0&rev=1

2019-03-25 06:53:16 +00:00
commit 2150ccc3a0
8 changed files with 432 additions and 0 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -0,0 +1,23 @@
+## Default LFS
+*.7z filter=lfs diff=lfs merge=lfs -text
+*.bsp filter=lfs diff=lfs merge=lfs -text
+*.bz2 filter=lfs diff=lfs merge=lfs -text
+*.gem filter=lfs diff=lfs merge=lfs -text
+*.gz filter=lfs diff=lfs merge=lfs -text
+*.jar filter=lfs diff=lfs merge=lfs -text
+*.lz filter=lfs diff=lfs merge=lfs -text
+*.lzma filter=lfs diff=lfs merge=lfs -text
+*.obscpio filter=lfs diff=lfs merge=lfs -text
+*.oxt filter=lfs diff=lfs merge=lfs -text
+*.pdf filter=lfs diff=lfs merge=lfs -text
+*.png filter=lfs diff=lfs merge=lfs -text
+*.rpm filter=lfs diff=lfs merge=lfs -text
+*.tbz filter=lfs diff=lfs merge=lfs -text
+*.tbz2 filter=lfs diff=lfs merge=lfs -text
+*.tgz filter=lfs diff=lfs merge=lfs -text
+*.ttf filter=lfs diff=lfs merge=lfs -text
+*.txz filter=lfs diff=lfs merge=lfs -text
+*.whl filter=lfs diff=lfs merge=lfs -text
+*.xz filter=lfs diff=lfs merge=lfs -text
+*.zip filter=lfs diff=lfs merge=lfs -text
+*.zst filter=lfs diff=lfs merge=lfs -text
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+.osc
--- a/0001-Port-tests-to-Eclipse-Aether.patch
+++ b/0001-Port-tests-to-Eclipse-Aether.patch
@@ -0,0 +1,27 @@
+From 160539b184376a4fc8ec29765f5278307a41d16e Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk@redhat.com>
+Date: Mon, 19 Oct 2015 14:09:26 +0200
+Subject: [PATCH 1/2] Port tests to Eclipse Aether
+
+---
+ src/test/java/org/apache/maven/archiver/MavenArchiverTest.java | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java b/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
+index e877492..24ba9b1 100644
+--- a/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
+++ b/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
+@@ -40,8 +40,8 @@ import org.codehaus.plexus.PlexusContainer;
+ import org.codehaus.plexus.archiver.jar.JarArchiver;
+ import org.codehaus.plexus.archiver.jar.ManifestException;
+ import org.junit.Test;
+-import org.sonatype.aether.RepositorySystemSession;
+-import org.sonatype.aether.util.DefaultRepositorySystemSession;
+import org.eclipse.aether.DefaultRepositorySystemSession;
+import org.eclipse.aether.RepositorySystemSession;
+ 
+ import java.io.File;
+ import java.io.IOException;
+-- 
+2.13.5
+
--- a/0002-MSHARED-448-Skip-failing-assertion.patch
+++ b/0002-MSHARED-448-Skip-failing-assertion.patch
@@ -0,0 +1,26 @@
+From 41e715cab5cfbd0373de2568ed9c6d022c3b403c Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk@redhat.com>
+Date: Mon, 19 Oct 2015 14:34:53 +0200
+Subject: [PATCH 2/2] MSHARED-448: Skip failing assertion
+
+---
+ src/test/java/org/apache/maven/archiver/MavenArchiverTest.java | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java b/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
+index 24ba9b1..cefd00a 100644
+--- a/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
+++ b/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
+@@ -245,7 +245,8 @@ public class MavenArchiverTest
+         }
+ 
+         archiver.createArchive( session, project, config );
+-        assertEquals( jarFile.lastModified(), time );
+	// Test fails (see MSHARED-448)
+        // assertEquals( jarFile.lastModified(), time );
+ 
+         config.setForced( true );
+         archiver.createArchive( session, project, config );
+-- 
+2.13.5
+
--- a/maven-archiver-3.2.0-source-release.zip
+++ b/maven-archiver-3.2.0-source-release.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7bfa7abaad1ac413fa42a6ade1a4b34253e217c0a0e51d05ffce497168e86434
+size 129822
--- a/maven-archiver-build.xml
+++ b/maven-archiver-build.xml
@@ -0,0 +1,233 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="maven-archiver" default="package" basedir=".">
+
+  <!-- ====================================================================== -->
+  <!-- Build environment properties                                           -->
+  <!-- ====================================================================== -->
+
+  <property file="build.properties"/>
+
+  <property name="project.groupId" value="org.apache.maven"/>
+  <property name="project.artifactId" value="maven-archiver"/>
+  <property name="project.version" value="3.2.0"/>
+  <property name="project.name" value="Apache Maven Archiver"/>
+  <property name="project.organization.name" value="The Apache Software Foundation"/>
+
+  <property name="spec.version" value="3.2"/>
+
+  <property name="compiler.source" value="1.6"/>
+  <property name="compiler.target" value="${compiler.source}"/>
+
+  <property name="build.finalName" value="${project.artifactId}-${project.version}"/>
+  <property name="build.dir" value="target"/>
+  <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"/>
+
+  <!-- ====================================================================== -->
+  <!-- Defining classpaths                                                    -->
+  <!-- ====================================================================== -->
+
+  <path id="build.classpath">
+    <fileset dir="lib">
+      <include name="**/*.jar"/>
+    </fileset>
+  </path>
+  <path id="build.test.classpath">
+    <fileset dir="lib">
+      <include name="**/*.jar"/>
+    </fileset>
+  </path>
+
+  <!-- ====================================================================== -->
+  <!-- Cleaning up target                                                     -->
+  <!-- ====================================================================== -->
+
+  <target name="clean" description="Clean the output directory">
+    <delete dir="${build.dir}"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Compilation target                                                     -->
+  <!-- ====================================================================== -->
+
+  <target name="compile" description="Compile the code">
+    <mkdir dir="${build.outputDir}"/>
+    <javac destdir="${build.outputDir}"
+           nowarn="false"
+           debug="true"
+           optimize="false"
+           deprecation="true"
+           target="${compiler.target}"
+           verbose="false"
+           fork="false"
+           source="${compiler.source}">
+      <src>
+        <pathelement location="${build.srcDir}"/>
+      </src>
+      <classpath refid="build.classpath"/>
+    </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                                                         -->
+  <!-- ====================================================================== -->
+
+  <target name="javadoc" description="Generates the Javadoc of the application">
+    <javadoc sourcepath="${build.srcDir}"
+             packagenames="*"
+             destdir="${reporting.outputDirectory}/apidocs"
+             access="protected"
+             source="${compiler.source}"
+             verbose="false"
+             version="true"
+             use="true"
+             author="true"
+             splitindex="false"
+             nodeprecated="false"
+             nodeprecatedlist="false"
+             notree="false"
+             noindex="false"
+             nohelp="false"
+             nonavbar="false"
+             serialwarn="false"
+             encoding="UTF-8"
+             linksource="false"
+             breakiterator="false">
+      <classpath refid="build.classpath"/>
+    </javadoc>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Package target                                                         -->
+  <!-- ====================================================================== -->
+
+  <target name="package" depends="compile,test" description="Package the application">
+    <jar jarfile="${build.dir}/${build.finalName}.jar"
+         compress="true"
+         index="false"
+         basedir="${build.outputDir}"
+         excludes="**/package.html">
+      <manifest>
+        <attribute name="Implementation-Title" value="${project.name}"/>
+        <attribute name="Implementation-URL" value="http://maven.apache.org/shared/${project.artifactId}/"/>
+        <attribute name="Implementation-Vendor" value="${project.organization.name}"/>
+        <attribute name="Implementation-Vendor-Id" value="${project.groupId}"/>
+        <attribute name="Implementation-Version" value="${project.version}"/>
+        <attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/>
+        <attribute name="JavaPackages-GroupId" value="${project.groupId}"/>
+        <attribute name="JavaPackages-Version" value="${project.version}"/>
+        <attribute name="Specification-Title" value="${project.name}"/>
+        <attribute name="Specification-Vendor" value="${project.organization.name}"/>
+        <attribute name="Specification-Version" value="${spec.version}"/>
+      </manifest>
+    </jar>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- A dummy target for the package named after the type it creates         -->
+  <!-- ====================================================================== -->
+
+  <target name="jar" depends="package" description="Builds the jar for the application"/>
+
+</project>
--- a/maven-archiver.changes
+++ b/maven-archiver.changes
@@ -0,0 +1,5 @@
+-------------------------------------------------------------------
+Mon Mar 25 06:52:33 UTC 2019 - Fridrich Strba <fstrba@suse.com>
+
+- Initial packaging of maven-archiver 3.2.0
+- Generate and customize the ant build.xml file
--- a/maven-archiver.spec
+++ b/maven-archiver.spec
@@ -0,0 +1,114 @@
+#
+# spec file for package maven-archiver
+#
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
+#
+
+
+%bcond_with tests
+Name:           maven-archiver
+Version:        3.2.0
+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
+Source1:        %{name}-build.xml
+Patch0:         0001-Port-tests-to-Eclipse-Aether.patch
+# Test fails with OpenJDK on Linux
+# Reported upstream: https://issues.apache.org/jira/browse/MSHARED-448
+Patch1:         0002-MSHARED-448-Skip-failing-assertion.patch
+BuildRequires:  ant
+BuildRequires:  fdupes
+BuildRequires:  javapackages-local
+BuildRequires:  maven-lib
+BuildRequires:  maven-shared-utils
+BuildRequires:  mvn(org.apache.maven.shared:maven-shared-components:pom:)
+BuildRequires:  plexus-archiver
+BuildRequires:  plexus-interpolation
+BuildRequires:  sisu-plexus
+BuildRequires:  unzip
+BuildRequires:  xmvn-install
+BuildRequires:  xmvn-resolve
+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
+to handle packaging
+
+%package javadoc
+Summary:        Javadoc for %{name}
+Group:          Documentation/HTML
+
+%description javadoc
+Javadoc for %{name}.
+
+%prep
+%setup -q
+cp %{SOURCE1} build.xml
+%patch0 -p1
+%patch1 -p1
+
+%build
+mkdir -p lib
+build-jar-repository -s lib \
+  org.eclipse.sisu.plexus \
+  maven-shared-utils/maven-shared-utils \
+  maven/maven-artifact maven/maven-core \
+  maven/maven-model \
+  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
+%fdupes -s %{buildroot}%{_javadocdir}
+
+%files -f .mfiles
+%license LICENSE
+%doc NOTICE
+
+%files javadoc -f .mfiles-javadoc
+%license LICENSE
+%doc NOTICE
+
+%changelog