Skip to content

Commit 2ac15c6

Browse files
adangeladangel
committed
Bump tycho from 2.6.0 to 2.7.4
1 parent aace94f commit 2ac15c6

File tree

4 files changed

+109
-31
lines changed

4 files changed

+109
-31
lines changed

‎kepler/kepler.target‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<target includeMode="feature" name="Kepler (4.3)">
44
<locations>
55
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
6-
<repository location="http://download.eclipse.org/releases/kepler/"/>
6+
<repository location="https://download.eclipse.org/releases/kepler/"/>
77
<unit id="org.eclipse.jdt.feature.group" version="3.9.2.v20140221-1700"/>
88
<unit id="org.eclipse.wst.xml_core.feature.feature.group" version="3.5.2.v201401062113-7C7OFvVF7RZHQXIlNxNyPh"/>
99
</location>

‎net.sourceforge.pmd.eclipse.plugin.test/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<artifactId>target-platform-configuration</artifactId>
5353
<configuration>
5454
<dependency-resolution>
55-
<extraRequirements>
55+
<extraRequirements combine.children="append">
5656
<requirement>
5757
<type>eclipse-plugin</type>
5858
<id>net.sourceforge.pmd.eclipse.plugin.test.fragment</id>

‎net.sourceforge.pmd.eclipse.plugin/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
<stripVersion>true</stripVersion>
6868
<prependGroupId>false</prependGroupId>
6969
<outputDirectory>${project.build.directory}/lib</outputDirectory>
70-
<excludeGroupIds>p2.eclipse-plugin</excludeGroupIds>
70+
<excludeGroupIds>p2.eclipse-plugin,p2.eclipse.plugin</excludeGroupIds>
7171
<excludeArtifactIds>net.sourceforge.pmd.eclipse.plugin,net.sourceforge.pmd.eclipse.plugin.source</excludeArtifactIds>
7272
<useRepositoryLayout>false</useRepositoryLayout>
7373
</configuration>

‎pom.xml‎

Lines changed: 106 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
<target.platform>kepler</target.platform>
2020

2121
<java.version>1.7</java.version>
22-
<tycho.version>2.6.0</tycho.version>
22+
<!-- https://github.com/eclipse/tycho/blob/master/RELEASE_NOTES.md -->
23+
<tycho.version>2.7.4</tycho.version>
2324
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2425
<pmd.version>6.47.0</pmd.version>
2526
<maven-antrun-plugin.version>1.8</maven-antrun-plugin.version>
@@ -79,33 +80,6 @@
7980
<version>${project.version}</version>
8081
</artifact>
8182
</target>
82-
<environments>
83-
<environment>
84-
<os>linux</os>
85-
<ws>gtk</ws>
86-
<arch>x86</arch>
87-
</environment>
88-
<environment>
89-
<os>linux</os>
90-
<ws>gtk</ws>
91-
<arch>x86_64</arch>
92-
</environment>
93-
<environment>
94-
<os>win32</os>
95-
<ws>win32</ws>
96-
<arch>x86</arch>
97-
</environment>
98-
<environment>
99-
<os>win32</os>
100-
<ws>win32</ws>
101-
<arch>x86_64</arch>
102-
</environment>
103-
<environment>
104-
<os>macosx</os>
105-
<ws>cocoa</ws>
106-
<arch>x86_64</arch>
107-
</environment>
108-
</environments>
10983
</configuration>
11084
</plugin>
11185

@@ -356,6 +330,110 @@
356330
</build>
357331

358332
<profiles>
333+
<!-- for some reason, tycho 2.7 doesn't always add the swt-fragments to the classpath.
334+
Therefore it is added explicitly - depending on the os.
335+
Otherwise the SWT classes are missing for PMD analysis and when running the tests.
336+
Note: This problem only occurs with old eclipse versions like kepler.
337+
-->
338+
<profile>
339+
<id>linux-swt</id>
340+
<activation>
341+
<os><family>unix</family></os>
342+
</activation>
343+
<build>
344+
<plugins>
345+
<plugin>
346+
<groupId>org.eclipse.tycho</groupId>
347+
<artifactId>target-platform-configuration</artifactId>
348+
<configuration>
349+
<environments>
350+
<environment>
351+
<os>linux</os>
352+
<ws>gtk</ws>
353+
<arch>x86_64</arch>
354+
</environment>
355+
</environments>
356+
<dependency-resolution>
357+
<extraRequirements>
358+
<requirement>
359+
<type>eclipse-plugin</type>
360+
<id>org.eclipse.swt.gtk.linux.x86_64</id>
361+
<versionRange>0.0.0</versionRange>
362+
</requirement>
363+
</extraRequirements>
364+
</dependency-resolution>
365+
</configuration>
366+
</plugin>
367+
</plugins>
368+
</build>
369+
</profile>
370+
371+
<profile>
372+
<id>win32-swt</id>
373+
<activation>
374+
<os><family>windows</family></os>
375+
</activation>
376+
<build>
377+
<plugins>
378+
<plugin>
379+
<groupId>org.eclipse.tycho</groupId>
380+
<artifactId>target-platform-configuration</artifactId>
381+
<configuration>
382+
<environments>
383+
<environment>
384+
<os>win32</os>
385+
<ws>win32</ws>
386+
<arch>x86_64</arch>
387+
</environment>
388+
</environments>
389+
<dependency-resolution>
390+
<extraRequirements>
391+
<requirement>
392+
<type>eclipse-plugin</type>
393+
<id>org.eclipse.swt.win32.win32.x86_64</id>
394+
<versionRange>0.0.0</versionRange>
395+
</requirement>
396+
</extraRequirements>
397+
</dependency-resolution>
398+
</configuration>
399+
</plugin>
400+
</plugins>
401+
</build>
402+
</profile>
403+
404+
<profile>
405+
<id>mac-swt</id>
406+
<activation>
407+
<os><family>mac</family></os>
408+
</activation>
409+
<build>
410+
<plugins>
411+
<plugin>
412+
<groupId>org.eclipse.tycho</groupId>
413+
<artifactId>target-platform-configuration</artifactId>
414+
<configuration>
415+
<environments>
416+
<environment>
417+
<os>macosx</os>
418+
<ws>cocoa</ws>
419+
<arch>x86_64</arch>
420+
</environment>
421+
</environments>
422+
<dependency-resolution>
423+
<extraRequirements>
424+
<requirement>
425+
<type>eclipse-plugin</type>
426+
<id>org.eclipse.swt.cocoa.macosx.x86_64</id>
427+
<versionRange>0.0.0</versionRange>
428+
</requirement>
429+
</extraRequirements>
430+
</dependency-resolution>
431+
</configuration>
432+
</plugin>
433+
</plugins>
434+
</build>
435+
</profile>
436+
359437
<profile>
360438
<id>sign</id>
361439
<build>

0 commit comments

Comments
 (0)