Browse Source

Add jgit target platform to define dependencies more precisely

Avoid that the packaging build picks an older jgit version coming with
eclipse platform by using a target platform which allows to define the
dependencies more precisely.

Change-Id: I39bba3baa4517e2b5e5fe0de096e756f2904e3e9
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
stable-3.0
Matthias Sohn 12 years ago
parent
commit
f94b258717
  1. 7
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/.classpath
  2. 17
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/.project
  3. 5
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF
  4. 4
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/build.properties
  5. 72
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/org.eclipse.jgit.target.target
  6. 58
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml
  7. 31
      org.eclipse.jgit.packaging/pom.xml

7
org.eclipse.jgit.packaging/org.eclipse.jgit.target/.classpath

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
</classpath>

17
org.eclipse.jgit.packaging/org.eclipse.jgit.target/.project

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.eclipse.jgit.target</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
</natures>
</projectDescription>

5
org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF

@ -0,0 +1,5 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: JGit Target Platform Bundle
Bundle-SymbolicName: org.eclipse.jgit.target
Bundle-Version: 3.0.2.qualifier

4
org.eclipse.jgit.packaging/org.eclipse.jgit.target/build.properties

@ -0,0 +1,4 @@
source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.

72
org.eclipse.jgit.packaging/org.eclipse.jgit.target/org.eclipse.jgit.target.target

@ -0,0 +1,72 @@
<?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="54">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<repository location="http://archive.eclipse.org/jetty/updates/jetty-bundles-7.x/7.6.0.v20120127/"/>
<unit id="org.eclipse.jetty.client" version="7.6.0.v20120127"/>
<unit id="org.eclipse.jetty.client.source" version="7.6.0.v20120127"/>
<unit id="org.eclipse.jetty.continuation" version="7.6.0.v20120127"/>
<unit id="org.eclipse.jetty.continuation.source" version="7.6.0.v20120127"/>
<unit id="org.eclipse.jetty.http" version="7.6.0.v20120127"/>
<unit id="org.eclipse.jetty.http.source" version="7.6.0.v20120127"/>
<unit id="org.eclipse.jetty.io" version="7.6.0.v20120127"/>
<unit id="org.eclipse.jetty.io.source" version="7.6.0.v20120127"/>
<unit id="org.eclipse.jetty.security" version="7.6.0.v20120127"/>
<unit id="org.eclipse.jetty.security.source" version="7.6.0.v20120127"/>
<unit id="org.eclipse.jetty.server" version="7.6.0.v20120127"/>
<unit id="org.eclipse.jetty.server.source" version="7.6.0.v20120127"/>
<unit id="org.eclipse.jetty.servlet" version="7.6.0.v20120127"/>
<unit id="org.eclipse.jetty.servlet.source" version="7.6.0.v20120127"/>
<unit id="org.eclipse.jetty.util" version="7.6.0.v20120127"/>
<unit id="org.eclipse.jetty.util.source" version="7.6.0.v20120127"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20130517111416/repository/"/>
<unit id="org.apache.ant.source" version="1.8.2.v201303080311"/>
<unit id="org.apache.ant" version="1.8.2.v201303080311"/>
<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.1.0.v20090501071000"/>
<unit id="org.hamcrest.core.source" version="1.1.0.v20090501071000"/>
<unit id="org.hamcrest.generator" version="1.1.0.v20090501071000"/>
<unit id="org.hamcrest.generator.source" version="1.1.0.v20090501071000"/>
<unit id="org.hamcrest.integration" version="1.1.0.v201303031500"/>
<unit id="org.hamcrest.integration.source" version="1.1.0.v201303031500"/>
<unit id="org.hamcrest.library" version="1.1.0.v20090501071000"/>
<unit id="org.hamcrest.library.source" version="1.1.0.v20090501071000"/>
<unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
<unit id="org.hamcrest.text" version="1.1.0.v20090501071000"/>
<unit id="org.hamcrest.text.source" version="1.1.0.v20090501071000"/>
<unit id="javaewah" version="0.5.6.v201210150900"/>
<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.8.2.v4_8_2_v20130308-0413"/>
<unit id="org.junit.source" version="4.8.2.v4_8_2_v20130308-0413"/>
<unit id="com.google.protobuf" version="2.4.0.v201105131100"/>
<unit id="com.google.protobuf.source" version="2.4.0.v201105131100"/>
<unit id="javax.servlet" version="2.5.0.v201103041518"/>
<unit id="javax.servlet.source" version="2.5.0.v201103041518"/>
</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>

58
org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml

@ -0,0 +1,58 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (C) 2013, Matthias Sohn <matthias.sohn@sap.com>
and other copyright owners as documented in the project's IP log.
This program and the accompanying materials are made available
under the terms of the Eclipse Distribution License v1.0 which
accompanies this distribution, is reproduced below, and is
available at http://www.eclipse.org/org/documents/edl-v10.php
All rights reserved.
Redistribution and use in source and binary forms, with or
without modification, are permitted provided that the following
conditions are met:
- Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
- Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following
disclaimer in the documentation and/or other materials provided
with the distribution.
- Neither the name of the Eclipse Foundation, Inc. nor the
names of its contributors may be used to endorse or promote
products derived from this software without specific prior
written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
<version>3.0.2-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.target</artifactId>
<packaging>eclipse-target-definition</packaging>
<name>JGit Target Platform</name>
</project>

31
org.eclipse.jgit.packaging/pom.xml

@ -60,14 +60,10 @@
<properties>
<tycho-version>0.17.0</tycho-version>
<jetty-version>7.6.0.v20120127</jetty-version>
<args4j-version>2.0.21.v201301150030</args4j-version>
<jsch-version>0.1.46.v201205102330</jsch-version>
<eclipse-site>http://download.eclipse.org/releases/juno</eclipse-site>
<orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20130517111416/repository/</orbit-site>
</properties>
<modules>
<module>org.eclipse.jgit.target</module>
<module>org.eclipse.jgit.feature</module>
<module>org.eclipse.jgit.java7.feature</module>
<module>org.eclipse.jgit.pgm.feature</module>
@ -77,24 +73,6 @@
<module>org.eclipse.jgit.repository</module>
</modules>
<repositories>
<repository>
<id>indigo</id>
<layout>p2</layout>
<url>${eclipse-site}</url>
</repository>
<repository>
<id>jetty</id>
<layout>p2</layout>
<url>http://archive.eclipse.org/jetty/updates/jetty-bundles-7.x/${jetty-version}/</url>
</repository>
<repository>
<id>orbit</id>
<layout>p2</layout>
<url>${orbit-site}</url>
</repository>
</repositories>
<distributionManagement>
<repository>
<id>repo.eclipse.org</id>
@ -167,6 +145,13 @@
<configuration>
<resolver>p2</resolver>
<pomDependencies>consider</pomDependencies>
<target>
<artifact>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.target</artifactId>
<version>${project.version}</version>
</artifact>
</target>
<environments>
<environment>
<os>linux</os>

Loading…
Cancel
Save