Sync from SUSE:SLFO:1.1 plexus-classworlds revision 8415ff28a7735f187dc689f2e2653b35

plexus-classworlds-build.xml

@@ -10,13 +10,12 @@
   
   <property name="project.groupId" value="org.codehaus.plexus"/>
   <property name="project.artifactId" value="plexus-classworlds"/>
-  <property name="project.version" value="2.8.0"/>
+  <property name="project.version" value="2.6.0"/>
   <property name="project.name" value="Plexus Classworlds"/>
   <property name="project.description" value="A class loader framework"/>
   <property name="project.organization.name" value="Codehaus Plexus"/>
   
-  <property name="compiler.release" value="8"/>
+  <property name="compiler.source" value="1.8"/>
-  <property name="compiler.source" value="1.${compiler.release}"/>
   <property name="compiler.target" value="${compiler.source}"/>
 
   <property name="build.finalName" value="${project.artifactId}-${project.version}"/>
@@ -24,7 +23,10 @@
   <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"/>
 
   <!-- ====================================================================== -->
@@ -47,7 +49,6 @@
            debug="true" 
            optimize="false" 
            deprecation="true" 
-           release="${compiler.release}" 
            target="${compiler.target}" 
            verbose="false" 
            fork="false" 
@@ -58,6 +59,100 @@
     </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}" 
+           excludes="org/codehaus/plexus/classworlds/event/*" 
+           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>
+        <pathelement location="${build.outputDir}"/>
+      </classpath>
+    </javac>
+  </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>
+        <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"/>
+          <exclude name="**/Constructor.java"/>
+          <exclude name="**/TestUtil.java"/>
+        </fileset>
+      </batchtest>
+      <batchtest todir="${test.reports}" if="test">
+        <fileset dir="${build.testDir}">
+          <include name="**/${test}.java"/>
+          <exclude name="**/*Abstract*Test*.java"/>
+          <exclude name="**/Constructor.java"/>
+          <exclude name="**/TestUtil.java"/>
+        </fileset>
+      </batchtest>
+    </junit>
+  </target>
+
+  <target name="test-junit-present">
+    <available classname="junit.framework.Test" property="junit.present"/>
+  </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                                                         -->
   <!-- ====================================================================== -->
@@ -90,7 +185,7 @@
   <!-- Package target                                                         -->
   <!-- ====================================================================== -->
 
-  <target name="package" depends="compile" description="Package the application">
+  <target name="package" depends="compile,test" description="Package the application">
     <jar jarfile="${build.dir}/${build.finalName}.jar" 
          compress="true" 
          index="false" 

plexus-classworlds.changes

@@ -1,13 +1,3 @@
--------------------------------------------------------------------
-Tue Oct  8 06:33:15 UTC 2024 - Fridrich Strba <fstrba@suse.com>
-
-- Upgrade to version 2.8.0
-  * Changes:
-    + Adding support for PPC64LE
-    + Allows to register a filtered class realm
-    + Implement Closeable for ClassWorld
-    + pom.xml and site.xml cleanup
-
 -------------------------------------------------------------------
 Wed Feb 21 22:18:39 UTC 2024 - Fridrich Strba <fstrba@suse.com>
 

plexus-classworlds.spec

@@ -17,8 +17,9 @@
 
 
 %global short_name classworlds
+%bcond_with tests
 Name:           plexus-%{short_name}
-Version:        2.8.0
+Version:        2.6.0
 Release:        0
 Summary:        Plexus Classworlds Classloader Framework
 License:        Apache-2.0 AND Plexus
@@ -32,6 +33,11 @@ BuildRequires:  javapackages-local >= 6
 Obsoletes:      %{short_name} < %{version}-%{release}
 Provides:       %{short_name} = %{version}-%{release}
 BuildArch:      noarch
+%if %{with tests}
+BuildRequires:  ant-junit
+BuildRequires:  commons-logging
+BuildRequires:  xml-apis
+%endif
 
 %description
 Classworlds is a framework for container developers
@@ -53,9 +59,20 @@ API documentation for %{name}.
 %prep
 %setup -q -n %{name}-%{name}-%{version}
 cp %{SOURCE1} build.xml
+%if %{with tests}
+mkdir -p target/test-lib
+rm -f target/test-lib/{ant-1.9.0,commons-logging-1.0.3,xml-apis-1.3.02}.jar
+ln -s $(build-classpath ant/ant) target/test-lib/ant-1.9.0.jar
+ln -s $(build-classpath commons-logging) target/test-lib/commons-logging-1.0.3.jar
+ln -s $(build-classpath xml-apis) target/test-lib/xml-apis-1.3.02.jar
+%endif
 
 %build
-ant jar javadoc
+%{ant} \
+%if %{without tests}
+    -Dtest.skip=true \
+%endif
+    jar javadoc
 
 %install
 # jar
@@ -73,12 +90,12 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
 %fdupes -s %{buildroot}%{_javadocdir}
 
 %files -f .mfiles
-%license LICENSE.txt LICENSE-Codehaus.txt
+%license LICENSE.txt LICENSE-2.0.txt
 %{_javadir}/plexus
 %{_javadir}/%{short_name}.jar
 
 %files javadoc
-%license LICENSE.txt LICENSE-Codehaus.txt
+%license LICENSE.txt LICENSE-2.0.txt
 %{_javadocdir}/%{name}
 
 %changelog