Skip to content

Commit

Permalink
[FIXUP] Adaption to ignore missing DS component files
Browse files Browse the repository at this point in the history
  • Loading branch information
@HannesWell
HannesWell committed Sep 16, 2024
1 parent 81642db commit 3ae1ef2
Showing 1 changed file with 70 additions and 65 deletions.
135 changes: 70 additions & 65 deletions eclipse-platform-parent/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2012, 2022 Eclipse Foundation and others.
Copyright (c) 2012, 2024 Eclipse Foundation and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Distribution License v1.0
which accompanies this distribution, and is available at
Expand Down Expand Up @@ -578,6 +578,11 @@
<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>
Expand Down Expand Up @@ -918,93 +923,93 @@
</profile>

<profile>
<id>fast-version-check-plugins</id>
<activation>
<property>
<name>fast-version-check-enabled</name>
<value>true</value>
</property>
<file>
<exists>META-INF/MANIFEST.MF</exists>
</file>
</activation>
<id>fast-version-check</id>
<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-packaging-plugin</artifactId>
<executions>
<execution>
<id>package-plugin-placeholder</id>
<goals>
<goal>package-plugin</goal>
</goals>
<phase>generate-sources</phase>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-plugin</artifactId>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>generate-p2-metadata</id>
<id>resolve-version-qualifier</id>
<goals>
<goal>p2-metadata</goal>
<goal>run</goal>
</goals>
<phase>generate-sources</phase>
<configuration>
<baselineMode>disable</baselineMode>
<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>
<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>
</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.eclipse.tycho.extras</groupId>
<artifactId>tycho-p2-extras-plugin</artifactId>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<id>compare-artifact-version-with-release</id>
<id>pack-pseudo-jar</id>
<goals>
<goal>compare-version-with-baselines</goal>
<goal>jar</goal>
</goals>
<phase>generate-sources</phase>
<configuration>
<skip>false</skip>
<ignoredPatterns>**</ignoredPatterns>
<classesDirectory>${project.build.directory}</classesDirectory>
<includes>
<include>feature.xml</include>
<include>MANIFEST.MF</include>
</includes>
<archive>
<manifestFile>${project.build.directory}/MANIFEST.MF</manifestFile>
</archive>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>fast-version-check-features</id>
<activation>
<property>
<name>fast-version-check-enabled</name>
<value>true</value>
</property>
<file>
<exists>feature.xml</exists>
</file>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-packaging-plugin</artifactId>
<executions>
<execution>
<id>package-feature-placeholder</id>
<goals>
<goal>package-feature</goal>
</goals>
<phase>generate-sources</phase>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-plugin</artifactId>
Expand Down Expand Up @@ -1032,7 +1037,7 @@
</goals>
<phase>generate-sources</phase>
<configuration>
<skip>false</skip>
<skip>${version.check.skip}</skip>
<ignoredPatterns>**</ignoredPatterns>
</configuration>
</execution>
Expand Down

0 comments on commit 3ae1ef2

Please sign in to comment.