Skip to content

Commit 0000663

Browse files
committed
[FIXUP] Include 'org.eclipse.equinox.executable' IU in category.xml
1 parent 55bd727 commit 0000663

File tree

4 files changed

+5
-162
lines changed

4 files changed

+5
-162
lines changed

eclipse-platform-parent/pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -633,11 +633,6 @@
633633
<artifactId>build-helper-maven-plugin</artifactId>
634634
<version>3.6.1</version>
635635
</plugin>
636-
<plugin>
637-
<groupId>org.codehaus.mojo</groupId>
638-
<artifactId>exec-maven-plugin</artifactId>
639-
<version>3.5.1</version>
640-
</plugin>
641636
<plugin>
642637
<groupId>org.apache.maven.plugins</groupId>
643638
<artifactId>maven-javadoc-plugin</artifactId>

eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,9 @@
1919
<bundle id="jakarta.inject.jakarta.inject-api" version="1.0.5"/>
2020
<bundle id="org.eclipse.equinox.slf4j"/>
2121
<bundle id="org.eclipse.debug.terminal"/>
22+
<iu>
23+
<query>
24+
<expression type="match">id == 'org.eclipse.equinox.executable'</expression>
25+
</query>
26+
</iu>
2227
</site>

eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/cp-content.xsl

Lines changed: 0 additions & 51 deletions
This file was deleted.

eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/pom.xml

Lines changed: 0 additions & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -52,112 +52,6 @@
5252
<includeAllSources>true</includeAllSources>
5353
</configuration>
5454
</plugin>
55-
<plugin>
56-
<artifactId>maven-antrun-plugin</artifactId>
57-
<executions>
58-
<execution>
59-
<id>unpack-content-jar</id>
60-
<phase>package</phase>
61-
<configuration>
62-
<target>
63-
<unjar
64-
src="target/repository/content.jar"
65-
dest="target/repository" />
66-
<delete file="target/repository/content.jar" />
67-
<delete file="target/repository/content.xml.xz" />
68-
</target>
69-
</configuration>
70-
<goals>
71-
<goal>run</goal>
72-
</goals>
73-
</execution>
74-
</executions>
75-
</plugin>
76-
<plugin>
77-
<groupId>org.codehaus.mojo</groupId>
78-
<artifactId>xml-maven-plugin</artifactId>
79-
<executions>
80-
<execution>
81-
<id>generate-extra-iu</id>
82-
<phase>package</phase>
83-
<goals>
84-
<goal>transform</goal>
85-
</goals>
86-
</execution>
87-
</executions>
88-
<configuration>
89-
<transformationSets>
90-
<transformationSet>
91-
<dir>target/repository</dir>
92-
<includes>
93-
<include>content.xml</include>
94-
</includes>
95-
<stylesheet>cp-content.xsl</stylesheet>
96-
</transformationSet>
97-
</transformationSets>
98-
</configuration>
99-
</plugin>
100-
<plugin>
101-
<artifactId>maven-resources-plugin</artifactId>
102-
<executions>
103-
<execution>
104-
<id>copy-extra-iu</id>
105-
<phase>package</phase>
106-
<goals>
107-
<goal>copy-resources</goal>
108-
</goals>
109-
<configuration>
110-
<outputDirectory>${basedir}/target/repository</outputDirectory>
111-
<resources>
112-
<resource>
113-
<directory>${basedir}/target/generated-resources/xml/xslt</directory>
114-
<includes>
115-
<include>content.xml</include>
116-
</includes>
117-
</resource>
118-
</resources>
119-
</configuration>
120-
</execution>
121-
</executions>
122-
</plugin>
123-
<plugin>
124-
<groupId>org.codehaus.mojo</groupId>
125-
<artifactId>exec-maven-plugin</artifactId>
126-
<executions>
127-
<execution>
128-
<id>repack-content-jar</id>
129-
<goals>
130-
<goal>exec</goal>
131-
</goals>
132-
<phase>package</phase>
133-
<configuration>
134-
<executable>jar</executable>
135-
<arguments>
136-
<argument>--create</argument>
137-
<argument>--no-manifest</argument>
138-
<argument>--file=${project.build.directory}/repository/content.jar</argument>
139-
<argument>${project.build.directory}/repository/content.xml</argument>
140-
</arguments>
141-
</configuration>
142-
</execution>
143-
<execution>
144-
<id>repack-content-xml-xz</id>
145-
<goals>
146-
<goal>exec</goal>
147-
</goals>
148-
<phase>package</phase>
149-
<configuration>
150-
<!-- Also deletes the content.xml file-->
151-
<executable>xz</executable>
152-
<arguments>
153-
<argument>--extreme</argument>
154-
<argument>--force</argument>
155-
<argument>${project.build.directory}/repository/content.xml</argument>
156-
</arguments>
157-
</configuration>
158-
</execution>
159-
</executions>
160-
</plugin>
16155
<plugin>
16256
<groupId>org.eclipse.tycho.extras</groupId>
16357
<artifactId>tycho-p2-extras-plugin</artifactId>

0 commit comments

Comments
 (0)