From 5992f65c68c3a71bacb6d64184558492a423ff0afc6c82ffbb675d22caad36e5 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Sun, 29 Sep 2024 13:06:46 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/plexus-velocity?expand=0&rev=19

---
 plexus-velocity-build.xml | 43 +++++++++++----------------------------
 plexus-velocity.spec      | 11 +++++-----
 2 files changed, 18 insertions(+), 36 deletions(-)

diff --git a/plexus-velocity-build.xml b/plexus-velocity-build.xml
index aed406c..3a06f44 100644
--- a/plexus-velocity-build.xml
+++ b/plexus-velocity-build.xml
@@ -10,10 +10,9 @@
   
   <property name="project.groupId" value="org.codehaus.plexus"/>
   <property name="project.artifactId" value="plexus-velocity"/>
-  <property name="project.version" value="2.1.0"/>
+  <property name="project.version" value="1.2"/>
   
-  <property name="compiler.release" value="8"/>
-  <property name="compiler.source" value="1.${compiler.release}"/>
+  <property name="compiler.source" value="1.8"/>
   <property name="compiler.target" value="${compiler.source}"/>
 
   <property name="build.finalName" value="${project.artifactId}-${project.version}"/>
@@ -30,12 +29,18 @@
 
   <path id="build.classpath">
     <fileset dir="lib">
+      <!-- plexus-container-default-1.0-alpha-9-stable-1
+           commons-collections-3.1 velocity-1.7 -->
       <include name="**/*.jar">
       </include>
     </fileset>
   </path>
   <path id="build.test.classpath">
     <fileset dir="lib">
+      <!-- plexus-container-default-1.0-alpha-9-stable-1
+           commons-collections-3.1 velocity-1.7
+           plexus-utils-3.0.22 classworlds-1.1-alpha-2
+		   guava-20.0 xbean-reflect-4.5 commons-lang-2.4 -->
       <include name="**/*.jar">
       </include>
     </fileset>
@@ -60,7 +65,6 @@
            debug="true"
            optimize="false"
            deprecation="true"
-           release="${compiler.release}"
            target="${compiler.target}"
            verbose="false"
            fork="false"
@@ -70,34 +74,11 @@
       </src>
       <classpath refid="build.classpath"/>
     </javac>
+    <copy todir="${build.outputDir}">
+      <fileset dir="${build.resourceDir}"/>
+    </copy>
   </target>
 
-  <!-- ====================================================================== -->
-  <!-- Sisu javax.inject.Named generation target                              -->
-  <!-- ====================================================================== -->
-
-  <target name="sisu"
-          depends="compile"
-          description="Generate javax.inject.Name index">
-    <sequential>
-	  <java classname="org.eclipse.sisu.space.SisuIndex"
-	        failonerror="true"
-			fork="true">
-        <classpath>
-          <path refid="build.classpath"/>
-        </classpath>
-        <arg value="${build.outputDir}"/>
-      </java>
-      <move todir="${build.outputDir}/META-INF">
-        <fileset dir="META-INF"/>
-      </move>
-	</sequential>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Javadoc target                                                         -->
-  <!-- ====================================================================== -->
-
   <target name="javadoc" description="Generates the Javadoc of the application">
     <javadoc sourcepath="${build.srcDir}"
              packagenames="*"
@@ -125,7 +106,7 @@
   <!-- Package target                                                         -->
   <!-- ====================================================================== -->
 
-  <target name="package" depends="sisu" description="Package the application">
+  <target name="package" depends="compile" description="Package the application">
     <jar jarfile="${build.dir}/${build.finalName}.jar"
          compress="true"
          index="false"
diff --git a/plexus-velocity.spec b/plexus-velocity.spec
index de3b8c2..5955e69 100644
--- a/plexus-velocity.spec
+++ b/plexus-velocity.spec
@@ -17,7 +17,7 @@
 
 
 Name:           plexus-velocity
-Version:        2.1.0
+Version:        1.2
 Release:        0
 Summary:        Plexus Velocity Component
 License:        Apache-2.0
@@ -28,12 +28,11 @@ Source1:        %{name}-build.xml
 Source2:        http://www.apache.org/licenses/LICENSE-2.0.txt
 BuildRequires:  ant
 BuildRequires:  apache-commons-collections
-BuildRequires:  atinject
 BuildRequires:  fdupes
 BuildRequires:  java-devel >= 1.8
 BuildRequires:  javapackages-local >= 6
-BuildRequires:  sisu-inject
-BuildRequires:  velocity-engine-core
+BuildRequires:  sisu-plexus
+BuildRequires:  velocity
 BuildArch:      noarch
 
 %description
@@ -56,8 +55,10 @@ find -name '*.jar' -delete
 cp -p %{SOURCE1} build.xml
 cp -p %{SOURCE2} LICENSE
 
+%pom_change_dep :plexus-container-default org.eclipse.sisu:org.eclipse.sisu.plexus:0.9.0.M2
+
 mkdir -p lib
-build-jar-repository -s lib atinject commons-collections org.eclipse.sisu.inject velocity-engine/velocity-engine-core
+build-jar-repository -s lib commons-collections org.eclipse.sisu.plexus velocity
 
 %build
 ant jar javadoc