Introduce Kepler and Luna target platform

We need this to enable building jgit with dependencies from Orbit
version used by Luna.

Default target platform is Kepler. In order to use Luna run

mvn clean install -P platform-luna -f org.eclipse.jgit.packaging/pom.xml

Change-Id: I544516d97067f45d1034929b534ad1600136614d
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.3.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.3.target
new file mode 100644 (file)
index 0000000..269b90b
--- /dev/null
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.3.target
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+   Copyright (C) 2012, 2013 Matthias Sohn <matthias.sohn@sap.com>
+
+   All rights reserved. This program and the accompanying materials
+   are made available under the terms of the Eclipse Public License v1.0
+   which accompanies this distribution, and is available at
+   http://www.eclipse.org/legal/epl-v10.html
+-->
+<?pde version="3.6"?>
+<target name="jgit.target" sequenceNumber="55">
+  <locations>
+    <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+      <repository location="http://download.eclipse.org/jetty/updates/jetty-bundles-7.x/7.6.11.v20130520/"/>
+      <unit id="org.eclipse.jetty.client" version="7.6.11.v20130520"/>
+      <unit id="org.eclipse.jetty.client.source" version="7.6.11.v20130520"/>
+      <unit id="org.eclipse.jetty.continuation" version="7.6.11.v20130520"/>
+      <unit id="org.eclipse.jetty.continuation.source" version="7.6.11.v20130520"/>
+      <unit id="org.eclipse.jetty.http" version="7.6.11.v20130520"/>
+      <unit id="org.eclipse.jetty.http.source" version="7.6.11.v20130520"/>
+      <unit id="org.eclipse.jetty.io" version="7.6.11.v20130520"/>
+      <unit id="org.eclipse.jetty.io.source" version="7.6.11.v20130520"/>
+      <unit id="org.eclipse.jetty.security" version="7.6.11.v20130520"/>
+      <unit id="org.eclipse.jetty.security.source" version="7.6.11.v20130520"/>
+      <unit id="org.eclipse.jetty.server" version="7.6.11.v20130520"/>
+      <unit id="org.eclipse.jetty.server.source" version="7.6.11.v20130520"/>
+      <unit id="org.eclipse.jetty.servlet" version="7.6.11.v20130520"/>
+      <unit id="org.eclipse.jetty.servlet.source" version="7.6.11.v20130520"/>
+      <unit id="org.eclipse.jetty.util" version="7.6.11.v20130520"/>
+      <unit id="org.eclipse.jetty.util.source" version="7.6.11.v20130520"/>
+    </location>
+    <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+      <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20130827064939/repository/"/>
+      <unit id="org.apache.ant.source" version="1.8.4.v201303080030"/>
+      <unit id="org.apache.ant" version="1.8.4.v201303080030"/>
+      <unit id="org.apache.commons.compress" version="1.4.1.v201301140946"/>
+      <unit id="org.apache.commons.compress.source" version="1.4.1.v201301140946"/>
+      <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
+      <unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
+      <unit id="org.kohsuke.args4j" version="2.0.21.v201301150030"/>
+      <unit id="org.kohsuke.args4j.source" version="2.0.21.v201301150030"/>
+      <unit id="org.hamcrest.core" version="1.3.0.v201303031735"/>
+      <unit id="org.hamcrest.core.source" version="1.3.0.v201303031735"/>
+      <unit id="javaewah" version="0.5.6.v201307211000"/>
+      <unit id="javaewah.source" version="0.5.6.v201307211000"/>
+      <unit id="org.objenesis" version="1.0.0.v201105211943"/>
+      <unit id="org.objenesis.source" version="1.0.0.v201105211943"/>
+      <unit id="org.mockito" version="1.8.4.v201303031500"/>
+      <unit id="org.mockito.source" version="1.8.4.v201303031500"/>
+      <unit id="com.jcraft.jsch" version="0.1.46.v201205102330"/>
+      <unit id="com.jcraft.jsch.source" version="0.1.46.v201205102330"/>
+      <unit id="org.junit" version="4.11.0.v201303080030"/>
+      <unit id="org.junit.source" version="4.11.0.v201303080030"/>
+      <unit id="javax.servlet" version="2.5.0.v201103041518"/>
+      <unit id="javax.servlet.source" version="2.5.0.v201103041518"/>
+      <unit id="org.tukaani.xz" version="1.3.0.v201308270617"/>
+      <unit id="org.tukaani.xz.source" version="1.3.0.v201308270617"/>
+    </location>
+    <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+      <repository location="http://download.eclipse.org/releases/kepler/"/>
+      <unit id="org.eclipse.osgi" version="0.0.0"/>
+    </location>
+  </locations>
+</target>

diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.4.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.4.target
new file mode 100644 (file)
index 0000000..a8d5d05
--- /dev/null
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.4.target
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+   Copyright (C) 2012, 2013 Matthias Sohn <matthias.sohn@sap.com>
+
+   All rights reserved. This program and the accompanying materials
+   are made available under the terms of the Eclipse Public License v1.0
+   which accompanies this distribution, and is available at
+   http://www.eclipse.org/legal/epl-v10.html
+-->
+<?pde version="3.6"?>
+<target name="jgit.target" sequenceNumber="55">
+  <locations>
+    <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+      <repository location="http://download.eclipse.org/jetty/updates/jetty-bundles-7.x/7.6.11.v20130520/"/>
+      <unit id="org.eclipse.jetty.client" version="7.6.11.v20130520"/>
+      <unit id="org.eclipse.jetty.client.source" version="7.6.11.v20130520"/>
+      <unit id="org.eclipse.jetty.continuation" version="7.6.11.v20130520"/>
+      <unit id="org.eclipse.jetty.continuation.source" version="7.6.11.v20130520"/>
+      <unit id="org.eclipse.jetty.http" version="7.6.11.v20130520"/>
+      <unit id="org.eclipse.jetty.http.source" version="7.6.11.v20130520"/>
+      <unit id="org.eclipse.jetty.io" version="7.6.11.v20130520"/>
+      <unit id="org.eclipse.jetty.io.source" version="7.6.11.v20130520"/>
+      <unit id="org.eclipse.jetty.security" version="7.6.11.v20130520"/>
+      <unit id="org.eclipse.jetty.security.source" version="7.6.11.v20130520"/>
+      <unit id="org.eclipse.jetty.server" version="7.6.11.v20130520"/>
+      <unit id="org.eclipse.jetty.server.source" version="7.6.11.v20130520"/>
+      <unit id="org.eclipse.jetty.servlet" version="7.6.11.v20130520"/>
+      <unit id="org.eclipse.jetty.servlet.source" version="7.6.11.v20130520"/>
+      <unit id="org.eclipse.jetty.util" version="7.6.11.v20130520"/>
+      <unit id="org.eclipse.jetty.util.source" version="7.6.11.v20130520"/>
+    </location>
+    <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+      <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20131024145017/repository/"/>
+      <unit id="org.apache.ant.source" version="1.9.2.v201307241445"/>
+      <unit id="org.apache.ant" version="1.9.2.v201307241445"/>
+      <unit id="org.apache.commons.compress" version="1.4.1.v201301140946"/>
+      <unit id="org.apache.commons.compress.source" version="1.4.1.v201301140946"/>
+      <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
+      <unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
+      <unit id="org.kohsuke.args4j" version="2.0.21.v201301150030"/>
+      <unit id="org.kohsuke.args4j.source" version="2.0.21.v201301150030"/>
+      <unit id="org.hamcrest.core" version="1.3.0.v201303031735"/>
+      <unit id="org.hamcrest.core.source" version="1.3.0.v201303031735"/>
+      <unit id="javaewah" version="0.5.6.v201307211000"/>
+      <unit id="javaewah.source" version="0.5.6.v201307211000"/>
+      <unit id="org.objenesis" version="1.0.0.v201105211943"/>
+      <unit id="org.objenesis.source" version="1.0.0.v201105211943"/>
+      <unit id="org.mockito" version="1.8.4.v201303031500"/>
+      <unit id="org.mockito.source" version="1.8.4.v201303031500"/>
+      <unit id="com.jcraft.jsch" version="0.1.50.v201310081430"/>
+      <unit id="com.jcraft.jsch.source" version="0.1.50.v201310081430"/>
+      <unit id="org.junit" version="4.11.0.v201303080030"/>
+      <unit id="org.junit.source" version="4.11.0.v201303080030"/>
+      <unit id="javax.servlet" version="2.5.0.v201103041518"/>
+      <unit id="javax.servlet.source" version="2.5.0.v201103041518"/>
+      <unit id="org.tukaani.xz" version="1.3.0.v201308270617"/>
+      <unit id="org.tukaani.xz.source" version="1.3.0.v201308270617"/>
+    </location>
+    <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+      <repository location="http://download.eclipse.org/releases/juno/"/>
+      <unit id="org.eclipse.osgi" version="0.0.0"/>
+    </location>
+  </locations>
+</target>

diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/org.eclipse.jgit.target.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/org.eclipse.jgit.target.target
deleted file mode 100644 (file)
index 9da29f8..0000000
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/org.eclipse.jgit.target.target
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
-   Copyright (C) 2012, 2013 Matthias Sohn <matthias.sohn@sap.com>
-
-   All rights reserved. This program and the accompanying materials
-   are made available under the terms of the Eclipse Public License v1.0
-   which accompanies this distribution, and is available at
-   http://www.eclipse.org/legal/epl-v10.html
--->
-<?pde version="3.6"?>
-<target name="jgit.target" sequenceNumber="55">
-  <locations>
-    <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-      <repository location="http://download.eclipse.org/jetty/updates/jetty-bundles-7.x/7.6.11.v20130520/"/>
-      <unit id="org.eclipse.jetty.client" version="7.6.11.v20130520"/>
-      <unit id="org.eclipse.jetty.client.source" version="7.6.11.v20130520"/>
-      <unit id="org.eclipse.jetty.continuation" version="7.6.11.v20130520"/>
-      <unit id="org.eclipse.jetty.continuation.source" version="7.6.11.v20130520"/>
-      <unit id="org.eclipse.jetty.http" version="7.6.11.v20130520"/>
-      <unit id="org.eclipse.jetty.http.source" version="7.6.11.v20130520"/>
-      <unit id="org.eclipse.jetty.io" version="7.6.11.v20130520"/>
-      <unit id="org.eclipse.jetty.io.source" version="7.6.11.v20130520"/>
-      <unit id="org.eclipse.jetty.security" version="7.6.11.v20130520"/>
-      <unit id="org.eclipse.jetty.security.source" version="7.6.11.v20130520"/>
-      <unit id="org.eclipse.jetty.server" version="7.6.11.v20130520"/>
-      <unit id="org.eclipse.jetty.server.source" version="7.6.11.v20130520"/>
-      <unit id="org.eclipse.jetty.servlet" version="7.6.11.v20130520"/>
-      <unit id="org.eclipse.jetty.servlet.source" version="7.6.11.v20130520"/>
-      <unit id="org.eclipse.jetty.util" version="7.6.11.v20130520"/>
-      <unit id="org.eclipse.jetty.util.source" version="7.6.11.v20130520"/>
-    </location>
-    <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-      <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20130827064939/repository/"/>
-      <unit id="org.apache.ant.source" version="1.8.4.v201303080030"/>
-      <unit id="org.apache.ant" version="1.8.4.v201303080030"/>
-      <unit id="org.apache.commons.compress" version="1.4.1.v201301140946"/>
-      <unit id="org.apache.commons.compress.source" version="1.4.1.v201301140946"/>
-      <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
-      <unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
-      <unit id="org.kohsuke.args4j" version="2.0.21.v201301150030"/>
-      <unit id="org.kohsuke.args4j.source" version="2.0.21.v201301150030"/>
-      <unit id="org.hamcrest.core" version="1.3.0.v201303031735"/>
-      <unit id="org.hamcrest.core.source" version="1.3.0.v201303031735"/>
-      <unit id="javaewah" version="0.5.6.v201307211000"/>
-      <unit id="javaewah.source" version="0.5.6.v201307211000"/>
-      <unit id="org.objenesis" version="1.0.0.v201105211943"/>
-      <unit id="org.objenesis.source" version="1.0.0.v201105211943"/>
-      <unit id="org.mockito" version="1.8.4.v201303031500"/>
-      <unit id="org.mockito.source" version="1.8.4.v201303031500"/>
-      <unit id="com.jcraft.jsch" version="0.1.46.v201205102330"/>
-      <unit id="com.jcraft.jsch.source" version="0.1.46.v201205102330"/>
-      <unit id="org.junit" version="4.11.0.v201303080030"/>
-      <unit id="org.junit.source" version="4.11.0.v201303080030"/>
-      <unit id="javax.servlet" version="2.5.0.v201103041518"/>
-      <unit id="javax.servlet.source" version="2.5.0.v201103041518"/>
-      <unit id="org.tukaani.xz" version="1.3.0.v201308270617"/>
-      <unit id="org.tukaani.xz.source" version="1.3.0.v201308270617"/>
-    </location>
-    <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-      <repository location="http://download.eclipse.org/releases/juno/"/>
-      <unit id="org.eclipse.osgi" version="0.0.0"/>
-    </location>
-  </locations>
-</target>

diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml
index afeb3347c67cb389a83152a7f58e57457de58612..a30f3c15577550605ff27fc8bf5de12ff9fad1dd 100644 (file)
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml
@@ -53,6 +53,33 @@
   </parent>
 
   <artifactId>org.eclipse.jgit.target</artifactId>
-  <packaging>eclipse-target-definition</packaging>
+  <packaging>pom</packaging>
   <name>JGit Target Platform</name>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>attach-artifacts</id>
+            <phase>package</phase>
+            <goals>
+              <goal>attach-artifact</goal>
+            </goals>
+            <configuration>
+              <artifacts>
+                <artifact>
+                  <file>${target-platform}.target</file>
+                  <type>target</type>
+                  <classifier>${target-platform}</classifier>
+                </artifact>
+              </artifacts>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>
\ No newline at end of file

diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml
index 7640955d8b9586bc9ccbe137bc820c665eaad1f2..f6ed15a598184a8ef60df9d5337dbb0e3e5e845d 100644 (file)
--- a/org.eclipse.jgit.packaging/pom.xml
+++ b/org.eclipse.jgit.packaging/pom.xml
@@ -164,6 +164,7 @@
                 <groupId>org.eclipse.jgit</groupId>
                 <artifactId>org.eclipse.jgit.target</artifactId>
                 <version>${project.version}</version>
+                <classifier>${target-platform}</classifier>
               </artifact>
             </target>
             <environments>
@@ -215,11 +216,42 @@
           <artifactId>eclipse-jarsigner-plugin</artifactId>
           <version>1.0.4</version>
         </plugin>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>build-helper-maven-plugin</artifactId>
+          <version>1.7</version>
+        </plugin>
       </plugins>
     </pluginManagement>
   </build>
 
   <profiles>
+    <profile>
+      <id>platform-kepler</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+        <property>
+          <name>platform-version-name</name>
+          <value>kepler</value>
+        </property>
+      </activation>
+      <properties>
+        <target-platform>jgit-4.3</target-platform>
+      </properties>
+    </profile>
+    <profile>
+      <id>platform-luna</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+        <property>
+          <name>platform-version-name</name>
+          <value>luna</value>
+        </property>
+      </activation>
+      <properties>
+        <target-platform>jgit-4.4</target-platform>
+      </properties>
+    </profile>
     <profile>
       <id>eclipse-sign</id>
       <build>