diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2012-05-21 20:51:10 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2012-05-21 20:51:10 +0200 |
| commit | 8c73245fd0b6c764c629d241e3cb3c6b24f3ec9b (patch) | |
| tree | 0bb0404087fd236fb073f76c07fce168e9069fa5 /org.eclipse.jgit.packaging | |
| parent | 1953ae6aeec51dafedadb0fdb3f352ed4d027f45 (diff) | |
| download | jgit-8c73245fd0b6c764c629d241e3cb3c6b24f3ec9b.tar.gz jgit-8c73245fd0b6c764c629d241e3cb3c6b24f3ec9b.zip | |
Fix JGit source bundle packaging
Due to Tycho bug 368596 we didn't package the correct JGit source bundle
anymore. Instead of sources it contained the binary bundle. As a
workaround fall back to use packaging type eclipse-update-site which
doesn't seem to have this problem.
Bug: 368596
Bug: 379402
Change-Id: I3192dbd00b51e6ee6596d2301050b2a6f7028e3b
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit.packaging')
| -rw-r--r-- | org.eclipse.jgit.packaging/org.eclipse.jgit.repository/assembly.xml | 14 | ||||
| -rw-r--r-- | org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml | 28 | ||||
| -rw-r--r-- | org.eclipse.jgit.packaging/org.eclipse.jgit.repository/site.xml (renamed from org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml) | 0 |
3 files changed, 41 insertions, 1 deletions
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/assembly.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/assembly.xml new file mode 100644 index 0000000000..5bcf746028 --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/assembly.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<assembly> + <id>site</id> + <formats> + <format>zip</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <fileSets> + <fileSet> + <directory>${project.build.directory}/site</directory> + <outputDirectory>/</outputDirectory> + </fileSet> + </fileSets> +</assembly>
\ No newline at end of file diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml index 0cf09dd652..f088af1953 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -54,7 +54,9 @@ </parent> <artifactId>org.eclipse.jgit.repository</artifactId> - <packaging>eclipse-repository</packaging> + <!-- TODO as soon as Tycho bug 368596 is fixed we should use packaging type + eclipse-repository --> + <packaging>eclipse-update-site</packaging> <name>JGit P2 Repository</name> @@ -80,4 +82,28 @@ <version>2.0.0-SNAPSHOT</version> </dependency> </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.3</version> + <configuration> + <descriptors> + <descriptor>assembly.xml</descriptor> + </descriptors> + </configuration> + <executions> + <execution> + <id>make-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/site.xml index dd20b56a7a..dd20b56a7a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/site.xml |