Merge pull request #163 from adangel:upgrade-tycho-2.7

Bump tycho from 2.6.0 to 2.7.4 #163

Author: adangel

ReleaseNotes.md

@@ -15,6 +15,8 @@ This is a minor release.
 
 ### Fixed Issues
 
+*   [#163](https://github.com/pmd/pmd-eclipse-plugin/pull/163): Bump tycho from 2.6.0 to 2.7.4
+
 ### API Changes
 
 ### External Contributions

kepler/kepler.target

@@ -3,7 +3,7 @@
 <target includeMode="feature" name="Kepler (4.3)">
     <locations>
         <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-            <repository location="http://download.eclipse.org/releases/kepler/"/>
+            <repository location="https://download.eclipse.org/releases/kepler/"/>
             <unit id="org.eclipse.jdt.feature.group" version="3.9.2.v20140221-1700"/>
             <unit id="org.eclipse.wst.xml_core.feature.feature.group" version="3.5.2.v201401062113-7C7OFvVF7RZHQXIlNxNyPh"/>
         </location>

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

@@ -52,7 +52,7 @@
         <artifactId>target-platform-configuration</artifactId>
         <configuration>
           <dependency-resolution>
-            <extraRequirements>
+            <extraRequirements combine.children="append">
               <requirement>
                 <type>eclipse-plugin</type>
                 <id>net.sourceforge.pmd.eclipse.plugin.test.fragment</id>

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

@@ -67,7 +67,7 @@
                 <stripVersion>true</stripVersion>
                 <prependGroupId>false</prependGroupId>
                 <outputDirectory>${project.build.directory}/lib</outputDirectory>
-                <excludeGroupIds>p2.eclipse-plugin</excludeGroupIds>
+                <excludeGroupIds>p2.eclipse-plugin,p2.eclipse.plugin</excludeGroupIds>
                 <excludeArtifactIds>net.sourceforge.pmd.eclipse.plugin,net.sourceforge.pmd.eclipse.plugin.source</excludeArtifactIds>
                 <useRepositoryLayout>false</useRepositoryLayout>
             </configuration>

pom.xml

@@ -19,7 +19,8 @@
     <target.platform>kepler</target.platform>
 
     <java.version>1.7</java.version>
-    <tycho.version>2.6.0</tycho.version>
+    <!-- https://github.com/eclipse/tycho/blob/master/RELEASE_NOTES.md -->
+    <tycho.version>2.7.4</tycho.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <pmd.version>6.47.0</pmd.version>
     <maven-antrun-plugin.version>1.8</maven-antrun-plugin.version>
@@ -79,33 +80,6 @@
               <version>${project.version}</version>
             </artifact>
           </target>
-          <environments>
-            <environment>
-              <os>linux</os>
-              <ws>gtk</ws>
-              <arch>x86</arch>
-            </environment>
-            <environment>
-              <os>linux</os>
-              <ws>gtk</ws>
-              <arch>x86_64</arch>
-            </environment>
-            <environment>
-              <os>win32</os>
-              <ws>win32</ws>
-              <arch>x86</arch>
-            </environment>
-            <environment>
-              <os>win32</os>
-              <ws>win32</ws>
-              <arch>x86_64</arch>
-            </environment>
-            <environment>
-              <os>macosx</os>
-              <ws>cocoa</ws>
-              <arch>x86_64</arch>
-            </environment>
-          </environments>
         </configuration>
       </plugin>
 
@@ -356,6 +330,110 @@
   </build>
 
   <profiles>
+    <!-- for some reason, tycho 2.7 doesn't always add the swt-fragments to the classpath.
+         Therefore it is added explicitly - depending on the os.
+         Otherwise the SWT classes are missing for PMD analysis and when running the tests.
+         Note: This problem only occurs with old eclipse versions like kepler.
+    -->
+    <profile>
+      <id>linux-swt</id>
+      <activation>
+        <os><family>unix</family></os>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.eclipse.tycho</groupId>
+            <artifactId>target-platform-configuration</artifactId>
+            <configuration>
+              <environments>
+                <environment>
+                  <os>linux</os>
+                  <ws>gtk</ws>
+                  <arch>x86_64</arch>
+                </environment>
+              </environments>
+              <dependency-resolution>
+                <extraRequirements>
+                  <requirement>
+                    <type>eclipse-plugin</type>
+                    <id>org.eclipse.swt.gtk.linux.x86_64</id>
+                    <versionRange>0.0.0</versionRange>
+                  </requirement>
+                </extraRequirements>
+              </dependency-resolution>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+    <profile>
+      <id>win32-swt</id>
+      <activation>
+        <os><family>windows</family></os>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.eclipse.tycho</groupId>
+            <artifactId>target-platform-configuration</artifactId>
+            <configuration>
+              <environments>
+                <environment>
+                  <os>win32</os>
+                  <ws>win32</ws>
+                  <arch>x86_64</arch>
+                </environment>
+              </environments>
+              <dependency-resolution>
+                <extraRequirements>
+                  <requirement>
+                    <type>eclipse-plugin</type>
+                    <id>org.eclipse.swt.win32.win32.x86_64</id>
+                    <versionRange>0.0.0</versionRange>
+                  </requirement>
+                </extraRequirements>
+              </dependency-resolution>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+    <profile>
+      <id>mac-swt</id>
+      <activation>
+        <os><family>mac</family></os>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.eclipse.tycho</groupId>
+            <artifactId>target-platform-configuration</artifactId>
+            <configuration>
+              <environments>
+                <environment>
+                  <os>macosx</os>
+                  <ws>cocoa</ws>
+                  <arch>x86_64</arch>
+                </environment>
+              </environments>
+              <dependency-resolution>
+                <extraRequirements>
+                  <requirement>
+                    <type>eclipse-plugin</type>
+                    <id>org.eclipse.swt.cocoa.macosx.x86_64</id>
+                    <versionRange>0.0.0</versionRange>
+                  </requirement>
+                </extraRequirements>
+              </dependency-resolution>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
     <profile>
       <id>sign</id>
       <build>