GitHub #43: Do not use Tycho

10 files changed, 85 insertions, 169 deletions

diff --git a/org.jacoco.agent.test/pom.xml b/org.jacoco.agent.test/pom.xml
index fafa30fe..5185352a 100644
--- a/org.jacoco.agent.test/pom.xml
+++ b/org.jacoco.agent.test/pom.xml
@@ -20,7 +20,6 @@
   </parent>
 
   <artifactId>org.jacoco.agent.test</artifactId>
-  <packaging>eclipse-test-plugin</packaging>
 
   <name>JaCoCo :: Test :: Agent</name>
 
@@ -28,7 +27,6 @@
     <jacoco.includes>org.jacoco.agent.*</jacoco.includes>
   </properties>
 
-  <!-- Note that Tycho doesn't use those dependencies -->
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
diff --git a/org.jacoco.agent/pom.xml b/org.jacoco.agent/pom.xml
index cb0a3d4c..47011a81 100644
--- a/org.jacoco.agent/pom.xml
+++ b/org.jacoco.agent/pom.xml
@@ -20,7 +20,6 @@
   </parent>
 
   <artifactId>org.jacoco.agent</artifactId>
-  <packaging>eclipse-plugin</packaging>
 
   <name>JaCoCo :: Agent</name>
   <description>JaCoCo Agent</description>
diff --git a/org.jacoco.ant/pom.xml b/org.jacoco.ant/pom.xml
index d07cf1f2..3a0ebd95 100644
--- a/org.jacoco.ant/pom.xml
+++ b/org.jacoco.ant/pom.xml
@@ -20,12 +20,10 @@
   </parent>
 
   <artifactId>org.jacoco.ant</artifactId>
-  <packaging>eclipse-plugin</packaging>
 
   <name>JaCoCo :: Ant</name>
   <description>JaCoCo Ant Tasks</description>
 
-  <!-- Note that Tycho doesn't use those dependencies, but we need to declare them for consumers -->
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
diff --git a/org.jacoco.build/pom.xml b/org.jacoco.build/pom.xml
index 38e2b2a5..580e16f1 100644
--- a/org.jacoco.build/pom.xml
+++ b/org.jacoco.build/pom.xml
@@ -32,11 +32,6 @@
     </license>
   </licenses>
 
-  <prerequisites>
-    <!-- Tycho works only with Maven 3.x -->
-    <maven>3.0</maven>
-  </prerequisites>
-
   <developers>
     <developer>
       <id>mtnminds</id>
@@ -120,16 +115,11 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <sonatypeOssDistMgmtSnapshotsUrl>https://oss.sonatype.org/content/repositories/snapshots/</sonatypeOssDistMgmtSnapshotsUrl>
 
-    <maven.build.timestamp.format>yyyy/MM/dd</maven.build.timestamp.format>
-    <build.date>${maven.build.timestamp}</build.date>
+    <maven.build.timestamp.format>yyyyMMddhhmm</maven.build.timestamp.format>
     <jacoco.home.url>http://www.eclemma.org/jacoco</jacoco.home.url>
 
     <jvm.args></jvm.args>
     <argLine>${jvm.args}</argLine>
-    <tycho.testArgLine>${argLine}</tycho.testArgLine>
-
-    <!-- Plugins versions -->
-    <tycho.version>0.13.0</tycho.version>
 
     <!-- Dependencies versions -->
     <asm.version>4.1</asm.version>
@@ -360,48 +350,13 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-site-plugin</artifactId>
-          <version>3.0-beta-3</version>
+          <version>3.2</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-toolchains-plugin</artifactId>
           <version>1.0</version>
         </plugin>
-        <!-- Tycho plugins -->
-        <plugin>
-          <groupId>org.eclipse.tycho</groupId>
-          <artifactId>tycho-maven-plugin</artifactId>
-          <version>${tycho.version}</version>
-        </plugin>
-        <plugin>
-          <groupId>org.eclipse.tycho</groupId>
-          <artifactId>target-platform-configuration</artifactId>
-          <version>${tycho.version}</version>
-          <configuration>
-            <resolver>p2</resolver>
-            <pomDependencies>consider</pomDependencies>
-          </configuration>
-        </plugin>
-        <plugin>
-          <groupId>org.eclipse.tycho</groupId>
-          <artifactId>tycho-packaging-plugin</artifactId>
-          <version>${tycho.version}</version>
-        </plugin>
-        <plugin>
-          <groupId>org.eclipse.tycho</groupId>
-          <artifactId>tycho-source-plugin</artifactId>
-          <version>${tycho.version}</version>
-        </plugin>
-        <plugin>
-          <groupId>org.eclipse.tycho</groupId>
-          <artifactId>tycho-compiler-plugin</artifactId>
-          <version>${tycho.version}</version>
-        </plugin>
-        <plugin>
-          <groupId>org.eclipse.tycho</groupId>
-          <artifactId>tycho-surefire-plugin</artifactId>
-          <version>${tycho.version}</version>
-        </plugin>
         <!-- Mojo plugins -->
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
@@ -429,32 +384,6 @@
 
     <plugins>
       <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-maven-plugin</artifactId>
-        <extensions>true</extensions>
-      </plugin>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>target-platform-configuration</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-compiler-plugin</artifactId>
-        <configuration>
-          <excludeResources>
-            <excludeResource>**/*.properties</excludeResource>
-          </excludeResources>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-surefire-plugin</artifactId>
-        <configuration>
-          <skipExec>${skipTests}</skipExec>
-        </configuration>
-      </plugin>
-
-      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
@@ -583,6 +512,45 @@
           </execution>
         </executions>
       </plugin>
+
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>parse-version</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>parse-version</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.groovy.maven</groupId>
+        <artifactId>gmaven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>parse-version</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>execute</goal>
+            </goals>
+            <configuration>
+              <source>
+                major = project.properties['parsedVersion.majorVersion']
+                minor = project.properties['parsedVersion.minorVersion']
+                incremental = project.properties['parsedVersion.incrementalVersion']
+                qualifier = "${maven.build.timestamp}"
+                project.properties['buildQualifier'] = qualifier
+                project.properties['unqualifiedVersion'] = major + '.' + minor + '.' + incremental
+                project.properties['qualified.bundle.version'] = project.properties['unqualifiedVersion'] + '.' + project.properties['buildQualifier']
+                project.properties['build.date'] = qualifier.substring(0, 4) + '/' + qualifier.substring(4, 6) + '/' + qualifier.substring(6, 8)
+              </source>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 
@@ -696,36 +664,70 @@
     </profile>
 
     <profile>
-      <id>sources</id>
+      <id>manifest</id>
       <activation>
         <file>
-          <exists>src/</exists>
+          <exists>META-INF/MANIFEST.MF</exists>
         </file>
       </activation>
+      <properties>
+        <bundle-manifest>${project.build.directory}/META-INF/MANIFEST.MF</bundle-manifest>
+      </properties>
       <build>
         <plugins>
-          <!-- Generates jar with sources -->
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-source-plugin</artifactId>
+            <artifactId>maven-antrun-plugin</artifactId>
             <executions>
               <execution>
-                <id>attach-sources</id>
-                <phase>verify</phase>
+                <id>translate-qualifier</id>
+                <phase>generate-resources</phase>
+                <configuration>
+                  <target>
+                    <copy file="META-INF/MANIFEST.MF" tofile="${bundle-manifest}" overwrite="true"/>
+                    <replace file="${bundle-manifest}">
+                      <replacefilter token=".qualifier" value=".${buildQualifier}"/>
+                    </replace>
+                  </target>
+                </configuration>
                 <goals>
-                  <goal>jar-no-fork</goal>
+                  <goal>run</goal>
                 </goals>
               </execution>
             </executions>
           </plugin>
           <plugin>
-            <groupId>org.eclipse.tycho</groupId>
-            <artifactId>tycho-source-plugin</artifactId>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-jar-plugin</artifactId>
+            <configuration>
+              <archive>
+                <manifestFile>${bundle-manifest}</manifestFile>
+              </archive>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+    <profile>
+      <id>sources</id>
+      <activation>
+        <file>
+          <exists>src/</exists>
+        </file>
+      </activation>
+      <build>
+        <plugins>
+          <!-- Generates jar with sources -->
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-source-plugin</artifactId>
             <executions>
               <execution>
                 <id>attach-sources</id>
+                <phase>verify</phase>
                 <goals>
-                  <goal>plugin-source</goal>
+                  <goal>jar-no-fork</goal>
                 </goals>
               </execution>
             </executions>
@@ -816,24 +818,6 @@
       </build>
     </profile>
 
-    <!-- This profile is activated only during build and allows to use p2 repository without bothering our consumers and in compliance with rules for repo1 -->
-    <profile>
-      <id>tycho</id>
-      <activation>
-        <file>
-          <!-- This employs that the basedir expression is only recognized by Maven 3.x (see MNG-2363) -->
-          <exists>${basedir}</exists>
-        </file>
-      </activation>
-      <repositories>
-        <repository>
-          <id>jacoco-thirdparty</id>
-          <layout>p2</layout>
-          <url>http://download.eclipse.org/releases/helios</url>
-        </repository>
-      </repositories>
-    </profile>
-
     <!-- This profile is active only when used from Eclipse m2e and is used only to store settings. -->
     <profile>
       <id>m2e</id>
@@ -881,19 +865,6 @@
                     </pluginExecution>
                     <pluginExecution>
                       <pluginExecutionFilter>
-                        <groupId>org.eclipse.tycho</groupId>
-                        <artifactId>tycho-packaging-plugin</artifactId>
-                        <versionRange>[0.13.0,)</versionRange>
-                        <goals>
-                          <goal>validate-id</goal>
-                        </goals>
-                      </pluginExecutionFilter>
-                      <action>
-                        <ignore></ignore>
-                      </action>
-                    </pluginExecution>
-                    <pluginExecution>
-                      <pluginExecutionFilter>
                         <groupId>org.jacoco</groupId>
                         <artifactId>jacoco-maven-plugin</artifactId>
                         <versionRange>[0.5.3,)</versionRange>
diff --git a/org.jacoco.core.test/pom.xml b/org.jacoco.core.test/pom.xml
index 524d9e8d..70ba3565 100644
--- a/org.jacoco.core.test/pom.xml
+++ b/org.jacoco.core.test/pom.xml
@@ -20,7 +20,6 @@
   </parent>
 
   <artifactId>org.jacoco.core.test</artifactId>
-  <packaging>eclipse-test-plugin</packaging>
 
   <name>JaCoCo :: Test :: Core</name>
 
@@ -28,7 +27,6 @@
     <jacoco.includes>org.jacoco.core.*</jacoco.includes>
   </properties>
 
-  <!-- Note that Tycho doesn't use those dependencies -->
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
diff --git a/org.jacoco.core/pom.xml b/org.jacoco.core/pom.xml
index 2dc74008..9a2974e5 100644
--- a/org.jacoco.core/pom.xml
+++ b/org.jacoco.core/pom.xml
@@ -20,12 +20,10 @@
   </parent>
 
   <artifactId>org.jacoco.core</artifactId>
-  <packaging>eclipse-plugin</packaging>
 
   <name>JaCoCo :: Core</name>
   <description>JaCoCo Core</description>
 
-  <!-- Note that Tycho doesn't use those dependencies, but we need to declare them for consumers -->
   <dependencies>
     <dependency>
       <groupId>org.ow2.asm</groupId>
@@ -35,27 +33,5 @@
 
   <build>
     <sourceDirectory>src</sourceDirectory>
-
-    <plugins>
-      <!-- We can't define qualified.bundle.version as a project property, because buildQualifier constructed after reading POM by tycho-packaging-plugin -->
-      <!-- but we need it for resource filtering in compliance with Ant build, so here is workaround -->
-      <plugin>
-        <groupId>org.codehaus.groovy.maven</groupId>
-        <artifactId>gmaven-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>validate</phase>
-            <goals>
-              <goal>execute</goal>
-            </goals>
-            <configuration>
-              <source>
-              project.properties['qualified.bundle.version'] = project.properties['unqualifiedVersion'] + '.' + project.properties['buildQualifier']
-              </source>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
   </build>
 </project>
diff --git a/org.jacoco.doc/pom.xml b/org.jacoco.doc/pom.xml
index 2bd373f9..d4f40733 100644
--- a/org.jacoco.doc/pom.xml
+++ b/org.jacoco.doc/pom.xml
@@ -21,7 +21,6 @@
 
   <artifactId>org.jacoco.doc</artifactId>
   <!-- do not set packaging to pom, because otherwise we will receive "Not executing Javadoc as the project is not a Java classpath-capable package" -->
-  <packaging>eclipse-plugin</packaging>
 
   <name>JaCoCo :: Documentation</name>
   <description>JaCoCo Standalone Distribution</description>
@@ -72,24 +71,6 @@
 
     <plugins>
       <plugin>
-        <groupId>org.codehaus.groovy.maven</groupId>
-        <artifactId>gmaven-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>validate</phase>
-            <goals>
-              <goal>execute</goal>
-            </goals>
-            <configuration>
-              <source>
-              project.properties['qualified.bundle.version'] = project.properties['unqualifiedVersion'] + '.' + project.properties['buildQualifier']
-              </source>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
         <executions>
diff --git a/org.jacoco.examples/pom.xml b/org.jacoco.examples/pom.xml
index c0714635..1dc08f58 100644
--- a/org.jacoco.examples/pom.xml
+++ b/org.jacoco.examples/pom.xml
@@ -20,7 +20,6 @@
   </parent>
 
   <artifactId>org.jacoco.examples</artifactId>
-  <packaging>eclipse-plugin</packaging>
 
   <name>JaCoCo :: Examples</name>
   <description>JaCoCo API Usage Examples</description>
diff --git a/org.jacoco.report.test/pom.xml b/org.jacoco.report.test/pom.xml
index 06bd6ce0..7d5a314a 100644
--- a/org.jacoco.report.test/pom.xml
+++ b/org.jacoco.report.test/pom.xml
@@ -20,7 +20,6 @@
   </parent>
 
   <artifactId>org.jacoco.report.test</artifactId>
-  <packaging>eclipse-test-plugin</packaging>
 
   <name>JaCoCo :: Test :: Report</name>
 
@@ -28,7 +27,6 @@
     <jacoco.includes>org.jacoco.report.*</jacoco.includes>
   </properties>
 
-  <!-- Note that Tycho doesn't use those dependencies -->
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
diff --git a/org.jacoco.report/pom.xml b/org.jacoco.report/pom.xml
index 9d200996..a39f1011 100644
--- a/org.jacoco.report/pom.xml
+++ b/org.jacoco.report/pom.xml
@@ -20,12 +20,10 @@
   </parent>
 
   <artifactId>org.jacoco.report</artifactId>
-  <packaging>eclipse-plugin</packaging>
 
   <name>JaCoCo :: Report</name>
   <description>JaCoCo Reporting</description>
 
-  <!-- Note that Tycho doesn't use those dependencies, but we need to declare them for consumers -->
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>