Accepting request 1109292 from Java:packages

3.4.1

OBS-URL: https://build.opensuse.org/request/show/1109292
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plexus-io?expand=0&rev=4
This commit is contained in:
Ana Guerrero 2023-09-06 17:00:10 +00:00 committed by Git OBS Bridge
commit 96ba5858e7
5 changed files with 56 additions and 137 deletions

View File

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

BIN
plexus-io-3.4.1.tar.gz (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -10,20 +10,16 @@
<property name="project.artifactId" value="plexus-io"/> <property name="project.artifactId" value="plexus-io"/>
<property name="project.groupId" value="org.codehaus.plexus"/> <property name="project.groupId" value="org.codehaus.plexus"/>
<property name="project.version" value="3.2.0"/> <property name="project.version" value="3.4.1"/>
<property name="compiler.source" value="1.7"/> <property name="compiler.source" value="1.8"/>
<property name="compiler.target" value="${compiler.source}"/> <property name="compiler.target" value="${compiler.source}"/>
<property name="build.finalName" value="${project.artifactId}-${project.version}"/> <property name="build.finalName" value="${project.artifactId}-${project.version}"/>
<property name="build.dir" value="target"/> <property name="build.dir" value="target"/>
<property name="build.outputDir" value="${build.dir}/classes"/> <property name="build.outputDir" value="${build.dir}/classes"/>
<property name="build.srcDir" value="src/main/java"/> <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"/> <property name="reporting.outputDirectory" value="${build.dir}/site"/>
<!-- ====================================================================== --> <!-- ====================================================================== -->
@ -36,14 +32,6 @@
<include name="**/*"/> <include name="**/*"/>
</fileset> </fileset>
</path> </path>
<path id="build.test.classpath">
<fileset dir="lib">
<!-- plexus-utils-3.0.24 plexus-container-default-1.0-alpha-30
plexus-classworlds-1.2-alpha-9.jar jsr305-3.0.2.jar
commons-io-2.5.jar -->
<include name="**/*"/>
</fileset>
</path>
<!-- ====================================================================== --> <!-- ====================================================================== -->
<!-- Cleaning up target --> <!-- Cleaning up target -->
@ -73,103 +61,28 @@
</src> </src>
<classpath refid="build.classpath"/> <classpath refid="build.classpath"/>
</javac> </javac>
<copy todir="${build.outputDir}">
<fileset dir="${build.resourceDir}"/>
</copy>
</target> </target>
<!-- ====================================================================== --> <!-- ====================================================================== -->
<!-- Test-compilation target --> <!-- Sisu javax.inject.Named generation target -->
<!-- ====================================================================== --> <!-- ====================================================================== -->
<target name="compile-tests" <target name="sisu"
depends="compile" depends="compile"
description="Compile the test code" description="Generate javax.inject.Name index">
unless="test.skip"> <sequential>
<mkdir dir="${build.testOutputDir}"/> <java classname="org.eclipse.sisu.space.SisuIndex"
<javac destdir="${build.testOutputDir}" failonerror="true"
nowarn="false" fork="true">
debug="true"
optimize="false"
deprecation="true"
target="${compiler.target}"
verbose="false"
fork="false"
source="${compiler.source}">
<src>
<pathelement location="${build.testDir}"/>
</src>
<classpath> <classpath>
<path refid="build.test.classpath"/> <path refid="build.classpath"/>
<pathelement location="${build.outputDir}"/>
</classpath> </classpath>
</javac> <arg value="${build.outputDir}"/>
<copy todir="${build.testOutputDir}"> </java>
<fileset dir="${build.testResourceDir}"/> <move todir="${build.outputDir}/META-INF">
</copy> <fileset dir="META-INF"/>
</target> </move>
</sequential>
<!-- ====================================================================== -->
<!-- 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> </target>
<!-- ====================================================================== --> <!-- ====================================================================== -->
@ -205,7 +118,7 @@
<!-- Package target --> <!-- Package target -->
<!-- ====================================================================== --> <!-- ====================================================================== -->
<target name="package" depends="compile,test" description="Package the application"> <target name="package" depends="sisu" description="Package the application">
<jar jarfile="${build.dir}/${build.finalName}.jar" <jar jarfile="${build.dir}/${build.finalName}.jar"
compress="true" compress="true"
index="false" index="false"

View File

@ -1,3 +1,28 @@
-------------------------------------------------------------------
Wed Sep 6 13:18:05 UTC 2023 - Fridrich Strba <fstrba@suse.com>
- Upgrade to version 3.4.1
- Changes of 3.4.1
* Bug Fixes
+ Fix symbolic link are being resolved into absolute path
- Changes of 3.4.0
* New features and improvements
+ Drop legacy and make components pure JSR330
+ Restore speed improvements
* Maintenance
+ Fix code style
- Changes of 3.3.1
* Bug Fixes
+ Fix symbolic links to directories are not recognized as
directories
- Changes of 3.3.0
* Plexus IO 3.3.0 requires Java 8.
* New features and improvements
+ Plexus IO build is now reproducible
+ Various speed improvements
* Bug Fixes
+ Fix issue related to symbolic link tests issue
------------------------------------------------------------------- -------------------------------------------------------------------
Tue May 11 20:09:08 UTC 2021 - Fridrich Strba <fstrba@suse.com> Tue May 11 20:09:08 UTC 2021 - Fridrich Strba <fstrba@suse.com>

View File

@ -1,7 +1,7 @@
# #
# spec file for package plexus-io # spec file for package plexus-io
# #
# Copyright (c) 2021 SUSE LLC # Copyright (c) 2023 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -16,9 +16,8 @@
# #
%bcond_with tests
Name: plexus-io Name: plexus-io
Version: 3.2.0 Version: 3.4.1
Release: 0 Release: 0
Summary: Plexus IO Components Summary: Plexus IO Components
License: Apache-2.0 License: Apache-2.0
@ -29,20 +28,13 @@ Source1: %{name}-build.xml
Source2: http://www.apache.org/licenses/LICENSE-2.0.txt Source2: http://www.apache.org/licenses/LICENSE-2.0.txt
BuildRequires: ant BuildRequires: ant
BuildRequires: apache-commons-io BuildRequires: apache-commons-io
BuildRequires: atinject
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: javapackages-local BuildRequires: javapackages-local >= 6
BuildRequires: jsr-305 BuildRequires: jsr-305
BuildRequires: plexus-utils >= 3.3.0 BuildRequires: plexus-utils >= 3.3.0
Requires: mvn(commons-io:commons-io) BuildRequires: sisu-inject
Requires: mvn(org.codehaus.plexus:plexus-utils)
BuildArch: noarch BuildArch: noarch
%if %{with tests}
BuildRequires: ant-junit
BuildRequires: guava
BuildRequires: plexus-classworlds
BuildRequires: plexus-containers-container-default
BuildRequires: xbean
%endif
%description %description
Plexus IO is a set of plexus components, which are designed for use Plexus IO is a set of plexus components, which are designed for use
@ -63,22 +55,11 @@ cp %{SOURCE2} .
%pom_remove_plugin :animal-sniffer-maven-plugin %pom_remove_plugin :animal-sniffer-maven-plugin
%pom_remove_plugin :maven-enforcer-plugin %pom_remove_plugin :maven-enforcer-plugin
%pom_remove_parent
%pom_xpath_inject "pom:project" "<groupId>org.codehaus.plexus</groupId>"
%build %build
mkdir -p lib mkdir -p lib
build-jar-repository -s lib plexus/utils commons-io jsr-305 build-jar-repository -s lib atinject org.eclipse.sisu.inject plexus/utils commons-io jsr-305
%if %{with tests}
build-jar-repository -s lib plexus-containers/plexus-container-default plexus/classworlds
build-jar-repository -s lib guava/guava xbean/xbean-reflect
%endif
%{ant} \ %{ant} \
%if %{without tests}
-Dtest.skip=true \
%endif
jar javadoc jar javadoc
%install %install
@ -87,7 +68,7 @@ install -dm 0755 %{buildroot}%{_javadir}/plexus
install -pm 0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/plexus/io.jar install -pm 0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/plexus/io.jar
# pom # pom
install -dm 0755 %{buildroot}%{_mavenpomdir}/plexus install -dm 0755 %{buildroot}%{_mavenpomdir}/plexus
install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/plexus/io.pom %{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/plexus/io.pom
%add_maven_depmap plexus/io.pom plexus/io.jar %add_maven_depmap plexus/io.pom plexus/io.jar
# javadoc # javadoc
install -dm 0755 %{buildroot}%{_javadocdir}/%{name} install -dm 0755 %{buildroot}%{_javadocdir}/%{name}