summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorIgor Fedorenko2009-12-05 01:07:42 (EST)
committer Matthias Sohn2009-12-08 07:23:50 (EST)
commit96c7f75fade2bd36a0e7d9dbb2064de0ed452021 (patch)
tree812c55d6cc7e0e2a3da87578ebd090150827cfd5
parent7eef835ad50971bf6ecc3fcff2ebd9558757c28f (diff)
downloadjgit-96c7f75fade2bd36a0e7d9dbb2064de0ed452021.zip
jgit-96c7f75fade2bd36a0e7d9dbb2064de0ed452021.tar.gz
jgit-96c7f75fade2bd36a0e7d9dbb2064de0ed452021.tar.bz2
Flipped jgit.core to manifest-first maven-3/tycho buildrefs/changes/25/125/3
Change-Id: I6005134a45046d16e323a2f9b2815831cdbe15e0 Signed-off-by: Igor Fedorenko <igor@ifedorenko.com>
-rw-r--r--org.eclipse.jgit-feature/pom.xml61
-rw-r--r--org.eclipse.jgit/pom.xml15
-rw-r--r--pom.xml46
3 files changed, 110 insertions, 12 deletions
diff --git a/org.eclipse.jgit-feature/pom.xml b/org.eclipse.jgit-feature/pom.xml
new file mode 100644
index 0000000..00c076a
--- /dev/null
+++ b/org.eclipse.jgit-feature/pom.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2009, Google Inc.
+ Copyright (C) 2009, Igor Fedorenko <igor@ifedorenko.com>
+ Copyright (C) 2008, Imran M Yousuf <imyousuf@smartitengineering.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-parent</artifactId>
+ <version>0.6.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.eclipse.jgit-feature</artifactId>
+ <packaging>eclipse-feature</packaging>
+
+</project>
diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml
index e035939..ce3256a 100644
--- a/org.eclipse.jgit/pom.xml
+++ b/org.eclipse.jgit/pom.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (C) 2009, Google Inc.
+ Copyright (C) 2009, Igor Fedorenko <igor@ifedorenko.com>
Copyright (C) 2008, Imran M Yousuf <imyousuf@smartitengineering.com>
and other copyright owners as documented in the project's IP log.
@@ -54,6 +55,7 @@
<version>0.6.0-SNAPSHOT</version>
</parent>
+ <packaging>eclipse-plugin</packaging>
<artifactId>org.eclipse.jgit</artifactId>
<name>JGit - Core</name>
@@ -79,17 +81,6 @@
</includes>
</resource>
</resources>
-
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestFile>META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
- </plugins>
</build>
+
</project>
diff --git a/pom.xml b/pom.xml
index 7663eaa..2ae1682 100644
--- a/pom.xml
+++ b/pom.xml
@@ -123,8 +123,35 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+
+ <tycho-version>0.6.0-SNAPSHOT</tycho-version>
</properties>
+ <repositories>
+ <repository>
+ <id>galileo</id>
+ <layout>p2</layout>
+ <url>http://download.eclipse.org/releases/galileo</url>
+ </repository>
+ </repositories>
+
+ <!--
+ Temporary, until we sycn Tycho to maven central,
+ see https://issues.sonatype.org/browse/TYCHO-312
+ -->
+ <pluginRepositories>
+ <pluginRepository>
+ <id>nexus</id>
+ <url>http://repository.sonatype.org/content/groups/public</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+
<build>
<plugins>
<plugin>
@@ -169,6 +196,23 @@
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <groupId>org.sonatype.tycho</groupId>
+ <artifactId>tycho-maven-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <extensions>true</extensions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.sonatype.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <resolver>p2</resolver>
+ </configuration>
+ </plugin>
+
</plugins>
</build>
@@ -253,5 +297,7 @@
<module>org.eclipse.jgit.pgm</module>
<module>org.eclipse.jgit.junit</module>
<module>org.eclipse.jgit.test</module>
+
+ <module>org.eclipse.jgit-feature</module>
</modules>
</project>