From fc2525d18e5ff455e5cd31fd0bd114b98f2bab50 Mon Sep 17 00:00:00 2001
From: Hannes Wellmann <wellmann.hannes1@gmx.net>
Date: Mon, 16 Sep 2024 20:50:35 +0200
Subject: [PATCH] [FIXUP] Use new tycho properties

---
 eclipse-platform-parent/pom.xml | 97 ++++++++++++---------------------
 1 file changed, 36 insertions(+), 61 deletions(-)

diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml
index ca3ac48cb5..78dcce204c 100644
--- a/eclipse-platform-parent/pom.xml
+++ b/eclipse-platform-parent/pom.xml
@@ -578,11 +578,6 @@
           <artifactId>maven-resources-plugin</artifactId>
           <version>3.3.1</version>
         </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-jar-plugin</artifactId>
-          <version>3.4.2</version>
-        </plugin>
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>xml-maven-plugin</artifactId>
@@ -931,7 +926,7 @@
             <artifactId>maven-antrun-plugin</artifactId>
             <executions>
               <execution>
-                <id>resolve-version-qualifier</id>
+                <id>set-skip-properties</id>
                 <goals>
                   <goal>run</goal>
                 </goals>
@@ -939,73 +934,53 @@
                 <configuration>
                   <exportAntProperties>true</exportAntProperties>
                   <target>
-                    <!-- See https://stackoverflow.com/a/53227117 and http://ant-contrib.sourceforge.net/tasks/tasks/index.html -->
-                    <taskdef resource="net/sf/antcontrib/antlib.xml"/>
-                    <if>
-                      <or>
-                        <equals arg1="${project.packaging}" arg2="eclipse-plugin"/>
-                        <equals arg1="${project.packaging}" arg2="eclipse-test-plugin"/>
-                      </or>
-                      <then>
-                        <copy file="META-INF/MANIFEST.MF" tofile="${project.build.directory}/MANIFEST.MF"/>
-                        <manifest file="${project.build.directory}/MANIFEST.MF" mode="update">
-                          <attribute name="Bundle-Version" value="${qualifiedVersion}"/>
-                        </manifest>
-                        <property name="version.check.skip" value="false"/>
-                      </then>
-                      <elseif>
+                    <condition property="skip.packaging.plugin">
+                      <not>
+                        <or>
+                          <equals arg1="${project.packaging}" arg2="eclipse-plugin"/>
+                          <equals arg1="${project.packaging}" arg2="eclipse-test-plugin"/>
+                        </or>
+                      </not>
+                    </condition>
+                    <condition property="skip.packaging.feature">
+                      <not>
                         <equals arg1="${project.packaging}" arg2="eclipse-feature"/>
-                        <then>
-                          <copy file="feature.xml" tofile="${project.build.directory}/feature.xml"/>
-                          <replace file="${project.build.directory}/feature.xml" 
-                            token='version="${unqualifiedVersion}.qualifier"' value='version="${qualifiedVersion}"'/>
-                          <manifest file="${project.build.directory}/MANIFEST.MF"/>
-                          <property name="version.check.skip" value="false"/>
-                        </then>
-                      </elseif>
-                      <else>
-                        <property name="version.check.skip" value="true"/>
-                        <manifest file="${project.build.directory}/MANIFEST.MF"/>
-                        <echo message="Configure to skip version checks"/>
-                      </else>
-                    </if>
+                      </not>
+                    </condition>
+                    <condition property="skip.version.check">
+                      <and>
+                        <istrue value="${skip.packaging.plugin}"/>
+                        <istrue value="${skip.packaging.feature}"/>
+                      </and>
+                    </condition>
                   </target>
                 </configuration>
               </execution>
             </executions>
-            <dependencies>
-              <dependency>
-                <groupId>ant-contrib</groupId>
-                <artifactId>ant-contrib</artifactId>
-                <version>1.0b3</version>
-                <exclusions>
-                  <exclusion>
-                    <groupId>ant</groupId>
-                    <artifactId>ant</artifactId>
-                  </exclusion>
-                </exclusions>
-              </dependency>
-            </dependencies>
           </plugin>
           <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-jar-plugin</artifactId>
+            <groupId>org.eclipse.tycho</groupId>
+            <artifactId>tycho-packaging-plugin</artifactId>
             <executions>
               <execution>
-                <id>pack-pseudo-jar</id>
+                <id>package-plugin-placeholder</id>
                 <goals>
-                  <goal>jar</goal>
+                  <goal>package-plugin</goal>
                 </goals>
                 <phase>generate-sources</phase>
                 <configuration>
-                  <classesDirectory>${project.build.directory}</classesDirectory>
-                  <includes>
-                    <include>feature.xml</include>
-                    <include>MANIFEST.MF</include>
-                  </includes>
-                  <archive>
-                    <manifestFile>${project.build.directory}/MANIFEST.MF</manifestFile>
-                  </archive>
+                  <skip>${skip.packaging.plugin}</skip>
+                  <checkServiceComponentFilesExist>false</checkServiceComponentFilesExist>
+                </configuration>
+              </execution>
+              <execution>
+                <id>package-feature-placeholder</id>
+                <goals>
+                  <goal>package-feature</goal>
+                </goals>
+                <phase>generate-sources</phase>
+                <configuration>
+                  <skip>${skip.packaging.feature}</skip>
                 </configuration>
               </execution>
             </executions>
@@ -1037,7 +1012,7 @@
                 </goals>
                 <phase>generate-sources</phase>
                 <configuration>
-                  <skip>${version.check.skip}</skip>
+                  <skip>${skip.version.check}</skip>
                   <ignoredPatterns>**</ignoredPatterns>
                 </configuration>
               </execution>