Skip to content

Commit 4fadf3e

Browse files
author
jantje
committed
upgrade to tycho 4.0.4
1 parent 0b5f619 commit 4fadf3e

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

io.sloeber.parent/pom.xml

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<packaging>pom</packaging>
1010

1111
<properties>
12-
<tycho.version>2.7.5</tycho.version>
12+
<tycho.version>4.0.4</tycho.version>
1313
<built.repo.dir>${project.build.directory}/repo</built.repo.dir>
1414
<!-- maven.compiler.source>11</maven.compiler.source>
1515
<maven.compiler.target>11</maven.compiler.target -->
@@ -51,13 +51,17 @@
5151
<version>${tycho.version}</version>
5252
<configuration>
5353
<dependency-resolution>
54-
<profileProperties>
55-
<org.eclipse.justj.buildtime>true</org.eclipse.justj.buildtime>
54+
<profileProperties>
55+
<org.eclipse.justj.buildtime>true</org.eclipse.justj.buildtime>
5656
</profileProperties>
57-
</dependency-resolution>
57+
</dependency-resolution>
58+
<target>
59+
<file>../io.sloeber.product/sloeber.target</file>
60+
</target>
61+
5862
</configuration>
5963
</plugin>
60-
64+
6165
<!-- Enable tycho build extension -->
6266
<plugin>
6367
<groupId>org.eclipse.tycho</groupId>
@@ -76,9 +80,9 @@
7680
<!--
7781
<source>11</source>
7882
<target>11</target> -->
79-
<executionEnvironment>org.eclipse.justj.openjdk.hotspot.jre.full-17</executionEnvironment>
83+
<executionEnvironment>org.eclipse.justj.openjdk.hotspot.jre.full-17</executionEnvironment>
8084

81-
</configuration>
85+
</configuration>
8286
</plugin>
8387

8488
<!-- Enable version management -->
@@ -190,7 +194,7 @@
190194
<version>${tycho.version}</version>
191195
<configuration>
192196
<!-- configure the p2 target environments for multi-platform build -->
193-
<!-- The strings ("linux", "gtk", "x86"...) are defined by the OSGi
197+
<!-- The strings ("linux", "gtk", "x86"...) are defined by the OSGi
194198
spec -->
195199
<environments>
196200
<environment>
@@ -207,7 +211,7 @@
207211
<os>macosx</os>
208212
<ws>cocoa</ws>
209213
<arch>x86_64</arch>
210-
</environment>
214+
</environment>
211215
<environment>
212216
<os>macosx</os>
213217
<ws>cocoa</ws>
@@ -231,7 +235,7 @@
231235
<version>${tycho.version}</version>
232236
<configuration>
233237
<!-- configure the p2 target environments for multi-platform build -->
234-
<!-- The strings ("linux", "gtk", "x86"...) are defined by the OSGi
238+
<!-- The strings ("linux", "gtk", "x86"...) are defined by the OSGi
235239
spec -->
236240
<environments>
237241
<environment>
@@ -256,7 +260,7 @@
256260
<version>${tycho.version}</version>
257261
<configuration>
258262
<!-- configure the p2 target environments for multi-platform build -->
259-
<!-- The strings ("linux", "gtk", "x86"...) are defined by the OSGi
263+
<!-- The strings ("linux", "gtk", "x86"...) are defined by the OSGi
260264
spec -->
261265
<environments>
262266
<environment>
@@ -270,7 +274,7 @@
270274
</plugins>
271275
</build>
272276
</profile>
273-
277+
274278
<profile>
275279
<id>mac64</id>
276280
<build>
@@ -281,7 +285,7 @@
281285
<version>${tycho.version}</version>
282286
<configuration>
283287
<!-- configure the p2 target environments for multi-platform build -->
284-
<!-- The strings ("linux", "gtk", "x86"...) are defined by the OSGi
288+
<!-- The strings ("linux", "gtk", "x86"...) are defined by the OSGi
285289
spec -->
286290
<environments>
287291
<!-- Mac -->
@@ -296,7 +300,7 @@
296300
</plugins>
297301
</build>
298302
</profile>
299-
303+
300304
<profile>
301305
<id>macm1</id>
302306
<build>
@@ -307,7 +311,7 @@
307311
<version>${tycho.version}</version>
308312
<configuration>
309313
<!-- configure the p2 target environments for multi-platform build -->
310-
<!-- The strings ("linux", "gtk", "x86"...) are defined by the OSGi
314+
<!-- The strings ("linux", "gtk", "x86"...) are defined by the OSGi
311315
spec -->
312316
<environments>
313317
<!-- Mac aarch64 -->

io.sloeber.tests/.classpath

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<classpath>
33
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
44
<attributes>
5+
<attribute name="module" value="true"/>
56
<attribute name="maven.pomderived" value="true"/>
67
</attributes>
78
</classpathentry>
@@ -12,10 +13,5 @@
1213
<attribute name="maven.pomderived" value="true"/>
1314
</attributes>
1415
</classpathentry>
15-
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
16-
<attributes>
17-
<attribute name="maven.pomderived" value="true"/>
18-
</attributes>
19-
</classpathentry>
2016
<classpathentry kind="output" path="bin"/>
2117
</classpath>

0 commit comments

Comments
 (0)