diff --git a/plexus-velocity-1.2.tar.gz b/plexus-velocity-1.2.tar.gz
deleted file mode 100644
index c4a19ca..0000000
--- a/plexus-velocity-1.2.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4611542126bfdfbc5458fa0dce2edacadcfcc8ab3df81e32fbc40ce36d24a311
-size 5720
diff --git a/plexus-velocity-2.1.0.tar.gz b/plexus-velocity-2.1.0.tar.gz
new file mode 100644
index 0000000..92477fe
--- /dev/null
+++ b/plexus-velocity-2.1.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:12de601acf3bba9dcc2d0810005dccadff427e97b8ca474c948affd08bf2cbb0
+size 5031
diff --git a/plexus-velocity-build.xml b/plexus-velocity-build.xml
index 3a06f44..aed406c 100644
--- a/plexus-velocity-build.xml
+++ b/plexus-velocity-build.xml
@@ -10,9 +10,10 @@
   
   <property name="project.groupId" value="org.codehaus.plexus"/>
   <property name="project.artifactId" value="plexus-velocity"/>
-  <property name="project.version" value="1.2"/>
+  <property name="project.version" value="2.1.0"/>
   
-  <property name="compiler.source" value="1.8"/>
+  <property name="compiler.release" value="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}"/>
@@ -29,18 +30,12 @@
 
   <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>
@@ -65,6 +60,7 @@
            debug="true"
            optimize="false"
            deprecation="true"
+           release="${compiler.release}"
            target="${compiler.target}"
            verbose="false"
            fork="false"
@@ -74,11 +70,34 @@
       </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="*"
@@ -106,7 +125,7 @@
   <!-- Package target                                                         -->
   <!-- ====================================================================== -->
 
-  <target name="package" depends="compile" description="Package the application">
+  <target name="package" depends="sisu" description="Package the application">
     <jar jarfile="${build.dir}/${build.finalName}.jar"
          compress="true"
          index="false"
diff --git a/plexus-velocity.changes b/plexus-velocity.changes
index f4d67f9..4d2f1d5 100644
--- a/plexus-velocity.changes
+++ b/plexus-velocity.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Oct  3 13:56:35 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to version 2.1.0
+  * Changes:
+    + Upgrade to Velocity Engine 2.0
+    + Upgrade Velocity Engine from 2.0 to 2.3
+    + Move to JUnit5
+
 -------------------------------------------------------------------
 Sun May 26 19:41:56 UTC 2024 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/plexus-velocity.spec b/plexus-velocity.spec
index 5955e69..de3b8c2 100644
--- a/plexus-velocity.spec
+++ b/plexus-velocity.spec
@@ -17,7 +17,7 @@
 
 
 Name:           plexus-velocity
-Version:        1.2
+Version:        2.1.0
 Release:        0
 Summary:        Plexus Velocity Component
 License:        Apache-2.0
@@ -28,11 +28,12 @@ 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-plexus
-BuildRequires:  velocity
+BuildRequires:  sisu-inject
+BuildRequires:  velocity-engine-core
 BuildArch:      noarch
 
 %description
@@ -55,10 +56,8 @@ 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 commons-collections org.eclipse.sisu.plexus velocity
+build-jar-repository -s lib atinject commons-collections org.eclipse.sisu.inject velocity-engine/velocity-engine-core
 
 %build
 ant jar javadoc