Sync from SUSE:SLFO:1.1 plexus-sec-dispatcher revision 0fe851a21c2b1d377ffdf22d1c34504e

plexus-sec-dispatcher-build.xml

@@ -24,7 +24,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"/>
 
   <property name="build.mdoDir" value="src/main/mdo"/>
@@ -36,11 +39,15 @@
 
   <path id="build.classpath">
     <fileset dir="lib">
+      <!-- plexus-utils-3.1.1 plexus-cipher-1.4 classworlds-1.1-alpha-2
+           plexus-container-default-1.0-alpha-9-stable-1.jar -->
       <include name="**/*.jar"/>
     </fileset>
   </path>
   <path id="build.test.classpath">
     <fileset dir="lib">
+     <!-- plexus-utils-3.1.1 plexus-cipher-1.4 classworlds-1.1-alpha-2
+          plexus-container-default-1.0-alpha-9-stable-1.jar junit-3.8.2 -->
       <include name="**/*.jar"/>
     </fileset>
   </path>
@@ -112,25 +119,118 @@
   </target>
 
   <!-- ====================================================================== -->
-  <!-- Sisu javax.inject.Named generation target                              -->
+  <!-- Plexus component.xml generation target                                 -->
   <!-- ====================================================================== -->
 
-  <target name="sisu"
+  <target name="gen-meta"
           depends="compile"
-          description="Generate javax.inject.Name index">
+          description="Generate Plexus component.xml">
-    <sequential>
+    <mkdir dir="${build.outputDir}/META-INF/plexus"/>
-      <java classname="org.eclipse.sisu.space.SisuIndex"
+    <exec executable="plexus-metadata-generator" failonerror="true">
-            failonerror="true"
+      <env key="CLASSPATH" value="${build.outputDir}"/>
-            fork="true">
+      <arg value="-s"/>
-        <classpath>
+      <arg value="${build.srcDir}"/>
-          <path refid="build.classpath"/>
+      <arg value="-c"/>
-        </classpath>
+      <arg value="${build.outputDir}"/>
-        <arg value="${build.outputDir}"/>
+      <arg value="-m"/>
-      </java>
+      <arg value="${build.outputDir}/META-INF/plexus"/>
-      <move todir="${build.outputDir}/META-INF">
+      <arg value="-o"/>
-        <fileset dir="META-INF"/>
+      <arg value="${build.outputDir}/META-INF/plexus/components.xml"/>
-      </move>
+    </exec>
-    </sequential>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Test-compilation target                                                -->
+  <!-- ====================================================================== -->
+
+  <target name="compile-tests"
+          depends="gen-meta"
+          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>
 
   <!-- ====================================================================== -->
@@ -172,7 +272,7 @@
   <!-- Package target                                                         -->
   <!-- ====================================================================== -->
 
-  <target name="package" depends="sisu" description="Package the application">
+  <target name="package" depends="gen-meta,test" description="Package the application">
     <jar jarfile="${build.dir}/${build.finalName}.jar"
          compress="true"
          index="false"

plexus-sec-dispatcher.changes

@@ -1,9 +1,3 @@
--------------------------------------------------------------------
-Fri Mar  7 11:35:37 UTC 2025 - Fridrich Strba <fstrba@suse.com>
-
-- The injection is happening using javax.inject.Named index and 
-  not by plexus metadata
-
 -------------------------------------------------------------------
 Thu May 16 05:04:40 UTC 2024 - Fridrich Strba <fstrba@suse.com>
 

plexus-sec-dispatcher.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package plexus-sec-dispatcher
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,6 +16,7 @@
 #
 
 
+%bcond_with tests
 Name:           plexus-sec-dispatcher
 Version:        2.0
 Release:        0
@@ -33,10 +34,13 @@ BuildRequires:  java-devel >= 1.8
 BuildRequires:  javapackages-local >= 6
 BuildRequires:  modello >= 2.0.0
 BuildRequires:  plexus-cipher
+BuildRequires:  plexus-metadata-generator
 BuildRequires:  plexus-utils
 BuildRequires:  plexus-xml
-BuildRequires:  sisu-inject
 BuildArch:      noarch
+%if %{with tests}
+BuildRequires:  ant-junit
+%endif
 
 %description
 Plexus Security Dispatcher Component
@@ -62,9 +66,11 @@ build-jar-repository -s lib \
     plexus/utils \
     plexus/xml \
     plexus/plexus-cipher \
-    org.eclipse.sisu.inject \
     javax.inject
 %{ant} \
+%if %{without tests}
+  -Dtest.skip=true \
+%endif
   jar javadoc
 
 %install