Skip to content

Commit 11ef931

Browse files
tcornerstonetcornerstone
committed
Clean up build config files.
1 parent ac7793d commit 11ef931

File tree

4 files changed

+45
-109
lines changed

4 files changed

+45
-109
lines changed

‎com.wamas.ide.launching.update/category.xml

-5
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,4 @@
33
<feature id="com.wamas.ide.launching.feature" version="0.0.0">
44
<category name="releng"/>
55
</feature>
6-
<category-def name="releng" label="Eclipse CBI Release Engineering tools">
7-
<description>
8-
Eclipse CBI Release Engineering tools
9-
</description>
10-
</category-def>
116
</site>

‎pom.xml

+33-90
Original file line numberDiff line numberDiff line change
@@ -14,47 +14,20 @@
1414
<maven.compiler.target>11</maven.compiler.target>
1515
<maven.version.ignore>.*[a-zA-Z]+.*</maven.version.ignore>
1616
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
17-
<tycho-version>4.0.8</tycho-version>
17+
<tycho-version>4.0.10</tycho-version>
1818
<xtext-version>2.36.0</xtext-version>
19-
<cbi-plugins.version>1.5.0</cbi-plugins.version>
20-
<os-jvm-flags/>
21-
<eclipse-repo.url>https://repo.eclipse.org/content/repositories/cbi/</eclipse-repo.url>
22-
<!-- comment out snapshots repo, when not intending to use snapshots. releases come from "eclipse-repo.url"
23-
<cbi-snapshots-repo.url>https://repo.eclipse.org/content/repositories/cbi-snapshots/</cbi-snapshots-repo.url>
24-
-->
25-
<!--
26-
<tycho-snapshots>https://repo.eclipse.org/content/repositories/tycho-snapshots/</tycho-snapshots>
27-
-->
2819
<unofficialSuffix>'-UNOFFICIAL'</unofficialSuffix>
2920
</properties>
3021

31-
<pluginRepositories>
32-
<pluginRepository>
33-
<id>eclipse</id>
34-
<url>${eclipse-repo.url}</url>
35-
<releases>
36-
<enabled>true</enabled>
37-
</releases>
38-
<snapshots>
39-
<enabled>false</enabled>
40-
</snapshots>
41-
</pluginRepository>
42-
<!--
43-
<pluginRepository>
44-
<id>tycho-snapshots</id>
45-
<url>${tycho-snapshots}</url>
46-
<releases>
47-
<enabled>true</enabled>
48-
</releases>
49-
<snapshots>
50-
<enabled>true</enabled>
51-
</snapshots>
52-
</pluginRepository>
53-
-->
54-
</pluginRepositories>
22+
<modules>
23+
<module>com.wamas.ide.launching</module>
24+
<module>com.wamas.ide.launching.ide</module>
25+
<module>com.wamas.ide.launching.ui</module>
26+
<module>com.wamas.ide.launching.feature</module>
27+
<module>com.wamas.ide.launching.update</module>
28+
</modules>
5529

5630
<build>
57-
<finalName>foobar</finalName>
5831
<pluginManagement>
5932
<plugins>
6033
<plugin>
@@ -96,7 +69,7 @@
9669
<artifactId>maven-site-plugin</artifactId>
9770
<version>3.20.0</version>
9871
</plugin>
99-
<!-- <plugin>
72+
<plugin>
10073
<groupId>org.apache.maven.plugins</groupId>
10174
<artifactId>maven-enforcer-plugin</artifactId>
10275
<version>3.5.0</version>
@@ -125,7 +98,7 @@
12598
</configuration>
12699
</execution>
127100
</executions>
128-
</plugin>-->
101+
</plugin>
129102
<plugin>
130103
<groupId>org.codehaus.mojo</groupId>
131104
<artifactId>exec-maven-plugin</artifactId>
@@ -161,16 +134,14 @@
161134
<artifactId>tycho-p2-publisher-plugin</artifactId>
162135
<version>${tycho-version}</version>
163136
</plugin>
164-
<plugin>
165-
<groupId>org.eclipse.tycho</groupId>
166-
<artifactId>tycho-packaging-plugin</artifactId>
167-
<version>${tycho-version}</version>
168-
</plugin>
169137
<plugin>
170138
<groupId>org.eclipse.tycho</groupId>
171139
<artifactId>target-platform-configuration</artifactId>
172140
<version>${tycho-version}</version>
173141
<configuration>
142+
<target>
143+
<file>${basedir}/../target-platforms/default.target</file>
144+
</target>
174145
<environments>
175146
<environment>
176147
<os>linux</os>
@@ -263,12 +234,12 @@
263234
<repository>
264235
<id>eclipse</id>
265236
<layout>p2</layout>
266-
<url>http://download.eclipse.org/releases/2024-06</url>
237+
<url>https://download.eclipse.org/releases/2022-12/202212071000/</url>
267238
</repository>
268239
<repository>
269240
<id>cbi-targetplatform-dsl-mirror</id>
270241
<layout>p2</layout>
271-
<url>https://download.eclipse.org/cbi/updates/tpd/release/</url>
242+
<url>https://download.eclipse.org/cbi/updates/tpd/release/3.0.0/</url>
272243
</repository>
273244
</repositories>
274245
<dependencies>
@@ -288,52 +259,24 @@
288259
</applicationArgs>
289260
</configuration>
290261
</plugin>
262+
<plugin>
263+
<groupId>org.eclipse.tycho</groupId>
264+
<artifactId>tycho-packaging-plugin</artifactId>
265+
<version>${tycho-version}</version>
266+
<dependencies>
267+
<dependency>
268+
<groupId>org.eclipse.tycho</groupId>
269+
<artifactId>tycho-buildtimestamp-jgit</artifactId>
270+
<version>${tycho-version}</version>
271+
</dependency>
272+
</dependencies>
273+
<configuration>
274+
<timestampProvider>jgit</timestampProvider>
275+
<jgit.ignore>pom.xml .gitignore .launchers/**</jgit.ignore>
276+
<jgit.dirtyWorkingTree>warning</jgit.dirtyWorkingTree>
277+
<format>yyyyMMddHHmm${unofficialSuffix}</format>
278+
</configuration>
279+
</plugin>
291280
</plugins>
292281
</build>
293-
294-
<profiles>
295-
<profile>
296-
<id>target-default</id>
297-
<activation>
298-
<activeByDefault>true</activeByDefault>
299-
</activation>
300-
<modules>
301-
<module>com.wamas.ide.launching</module>
302-
<module>com.wamas.ide.launching.ide</module>
303-
<module>com.wamas.ide.launching.ui</module>
304-
<module>com.wamas.ide.launching.feature</module>
305-
<module>com.wamas.ide.launching.update</module>
306-
</modules>
307-
<build>
308-
<plugins>
309-
<plugin>
310-
<groupId>org.eclipse.tycho</groupId>
311-
<artifactId>target-platform-configuration</artifactId>
312-
<configuration>
313-
<target>
314-
<file>${basedir}/../target-platforms/default.target</file>
315-
</target>
316-
</configuration>
317-
</plugin>
318-
<plugin>
319-
<groupId>org.eclipse.tycho</groupId>
320-
<artifactId>tycho-packaging-plugin</artifactId>
321-
<dependencies>
322-
<dependency>
323-
<groupId>org.eclipse.tycho</groupId>
324-
<artifactId>tycho-buildtimestamp-jgit</artifactId>
325-
<version>${tycho-version}</version>
326-
</dependency>
327-
</dependencies>
328-
<configuration>
329-
<timestampProvider>jgit</timestampProvider>
330-
<jgit.ignore>pom.xml .gitignore .launchers/**</jgit.ignore>
331-
<jgit.dirtyWorkingTree>warning</jgit.dirtyWorkingTree>
332-
<format>yyyyMMddHHmm${unofficialSuffix}</format>
333-
</configuration>
334-
</plugin>
335-
</plugins>
336-
</build>
337-
</profile>
338-
</profiles>
339282
</project>

‎target-platforms/default.target

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<?pde?>
33
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
4-
<target name="Default (clean build) Target Platform" sequenceNumber="1729513186">
4+
<target name="Default (clean build) Target Platform" sequenceNumber="1733764141">
55
<locations>
66
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
7-
<unit id="org.eclipse.platform.feature.group" version="4.32.0.v20240601-0610"/>
8-
<unit id="org.eclipse.pde.core" version="3.18.100.v20240531-0649"/>
9-
<unit id="org.eclipse.equinox.p2.core" version="2.12.0.v20240515-1919"/>
10-
<unit id="org.eclipse.equinox.p2.repository" version="2.9.100.v20240511-1722"/>
11-
<unit id="org.eclipse.equinox.p2.metadata" version="2.9.100.v20240416-0654"/>
12-
<unit id="org.eclipse.jdt.launching" version="3.22.0.v20240424-1830"/>
13-
<unit id="org.eclipse.osgi.services" version="3.12.100.v20240327-0645"/>
14-
<repository location="https://download.eclipse.org/eclipse/updates/4.32"/>
7+
<unit id="org.eclipse.platform.feature.group" version="4.26.0.v20221123-2302"/>
8+
<unit id="org.eclipse.pde.core" version="3.16.0.v20221119-0340"/>
9+
<unit id="org.eclipse.equinox.p2.core" version="2.9.200.v20220817-1208"/>
10+
<unit id="org.eclipse.equinox.p2.repository" version="2.6.300.v20221030-1923"/>
11+
<unit id="org.eclipse.equinox.p2.metadata" version="2.6.300.v20220817-1208"/>
12+
<unit id="org.eclipse.jdt.launching" version="3.19.800.v20221107-1851"/>
13+
<unit id="org.eclipse.osgi.services" version="3.11.100.v20221006-1531"/>
14+
<repository location="https://download.eclipse.org/releases/2022-12/202212071000/"/>
1515
</location>
1616
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
1717
<unit id="de.itemis.xtext.antlr.sdk.feature.group" version="2.1.1.v201405091103"/>
@@ -48,5 +48,5 @@
4848
<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.19.0"/>
4949
</location>
5050
</locations>
51-
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
51+
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
5252
</target>

‎target-platforms/default.tpd

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
target "Default (clean build) Target Platform"
22

3-
// include "testing/4.32-2024-06.tpd" with source requirements environment JavaSE-17
4-
53
with source requirements
6-
environment JavaSE-17
4+
environment JavaSE-11
75

8-
location "https://download.eclipse.org/eclipse/updates/4.32" {
6+
location "https://download.eclipse.org/releases/2022-12/202212071000/" {
97
// required to start UI tests in workbench - not a dependency per se
108
// org.eclipse.pde.junit.runtime
119
// org.eclipse.jdt.junit4.runtime

0 commit comments

Comments
 (0)