From f245579820f8113ae767864772731e8ad97b5a1f Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Thu, 14 Jan 2010 01:22:42 +0100 Subject: [PATCH] Maven 3/Tycho build for JGit feature As discussed on the jgit-dev list here: http://dev.eclipse.org/mhonarc/lists/egit-dev/msg00654.html - Define a separate JGit feature. - As of now create a separate JGit update site and zip it. Change-Id: Ie4026f15f6250c4933dccf6f31b5009b90c036bc Signed-off-by: Matthias Sohn --- .../org.eclipse.jgit.feature/.gitignore | 1 + .../org.eclipse.jgit.feature}/.project | 2 +- .../build.properties | 0 .../feature.properties | 0 .../org.eclipse.jgit.feature}/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 89 ++++++++ .../org.eclipse.jgit.updatesite/.gitignore | 1 + .../org.eclipse.jgit.updatesite/.project | 19 ++ .../org.eclipse.core.resources.prefs | 3 + .../.settings/org.eclipse.core.runtime.prefs | 3 + .../org.eclipse.jgit.updatesite/assembly.xml | 15 ++ .../org.eclipse.jgit.updatesite/index.html | 60 +++++ .../org.eclipse.jgit.updatesite/pom.xml | 104 +++++++++ .../org.eclipse.jgit.updatesite/site.xml | 14 ++ .../org.eclipse.jgit.updatesite/web/site.css | 12 + .../org.eclipse.jgit.updatesite/web/site.xsl | 214 ++++++++++++++++++ org.eclipse.jgit.packaging/pom.xml | 126 +++++++++++ 17 files changed, 663 insertions(+), 2 deletions(-) create mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.feature/.gitignore rename {org.eclipse.jgit-feature => org.eclipse.jgit.packaging/org.eclipse.jgit.feature}/.project (89%) rename {org.eclipse.jgit-feature => org.eclipse.jgit.packaging/org.eclipse.jgit.feature}/build.properties (100%) rename {org.eclipse.jgit-feature => org.eclipse.jgit.packaging/org.eclipse.jgit.feature}/feature.properties (100%) rename {org.eclipse.jgit-feature => org.eclipse.jgit.packaging/org.eclipse.jgit.feature}/feature.xml (93%) create mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml create mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/.gitignore create mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/.project create mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/.settings/org.eclipse.core.resources.prefs create mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/.settings/org.eclipse.core.runtime.prefs create mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/assembly.xml create mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/index.html create mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/pom.xml create mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/site.xml create mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/web/site.css create mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/web/site.xsl create mode 100644 org.eclipse.jgit.packaging/pom.xml diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/.gitignore b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/.gitignore new file mode 100644 index 000000000..2f7896d1d --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/.gitignore @@ -0,0 +1 @@ +target/ diff --git a/org.eclipse.jgit-feature/.project b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/.project similarity index 89% rename from org.eclipse.jgit-feature/.project rename to org.eclipse.jgit.packaging/org.eclipse.jgit.feature/.project index 80b09533c..aaee80f00 100644 --- a/org.eclipse.jgit-feature/.project +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/.project @@ -1,6 +1,6 @@ - org.eclipse.jgit-feature + org.eclipse.jgit.feature diff --git a/org.eclipse.jgit-feature/build.properties b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/build.properties similarity index 100% rename from org.eclipse.jgit-feature/build.properties rename to org.eclipse.jgit.packaging/org.eclipse.jgit.feature/build.properties diff --git a/org.eclipse.jgit-feature/feature.properties b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.properties similarity index 100% rename from org.eclipse.jgit-feature/feature.properties rename to org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.properties diff --git a/org.eclipse.jgit-feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml similarity index 93% rename from org.eclipse.jgit-feature/feature.xml rename to org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml index 9facbe0d9..5cc5b84ce 100644 --- a/org.eclipse.jgit-feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml @@ -5,7 +5,7 @@ version="0.6.0.qualifier" provider-name="%providerName"> - + %description diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml new file mode 100644 index 000000000..4f00f0f4f --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -0,0 +1,89 @@ + + + + + 4.0.0 + + + org.eclipse.jgit + jgit.tycho.parent + 0.6.0-SNAPSHOT + + + org.eclipse.jgit.feature + eclipse-feature + + JGit Feature (Incubation) + + + + org.eclipse.jgit + org.eclipse.jgit + 0.6.0-SNAPSHOT + + + + + + + org.sonatype.tycho + tycho-maven-plugin + ${tycho-version} + true + + + org.sonatype.tycho + target-platform-configuration + ${tycho-version} + + p2 + consider + + + + + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/.gitignore b/org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/.gitignore new file mode 100644 index 000000000..2f7896d1d --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/.gitignore @@ -0,0 +1 @@ +target/ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/.project b/org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/.project new file mode 100644 index 000000000..be21ac055 --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/.project @@ -0,0 +1,19 @@ + + + org.eclipse.jgit.updatesite + + + org.eclipse.jgit + org.eclipse.jgit.feature + + + + org.eclipse.pde.UpdateSiteBuilder + + + + + + org.eclipse.pde.UpdateSiteNature + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/.settings/org.eclipse.core.resources.prefs b/org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..4ec836b53 --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,3 @@ +#Mon Aug 11 16:46:54 PDT 2008 +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/.settings/org.eclipse.core.runtime.prefs new file mode 100644 index 000000000..fc5b578c1 --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/.settings/org.eclipse.core.runtime.prefs @@ -0,0 +1,3 @@ +#Mon Mar 24 18:55:44 EDT 2008 +eclipse.preferences.version=1 +line.separator=\n diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/assembly.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/assembly.xml new file mode 100644 index 000000000..0d258f74a --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/assembly.xml @@ -0,0 +1,15 @@ + + + site + + zip + + false + + + ${project.build.directory}/site + / + + + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/index.html b/org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/index.html new file mode 100644 index 000000000..9872ba6b1 --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/index.html @@ -0,0 +1,60 @@ + + +org.eclipse.jgit.updatesite + + + + + + +
+ + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/pom.xml new file mode 100644 index 000000000..02a2386d4 --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/pom.xml @@ -0,0 +1,104 @@ + + + + + 4.0.0 + + + org.eclipse.jgit + jgit.tycho.parent + 0.6.0-SNAPSHOT + + + org.eclipse.jgit.updatesite + eclipse-update-site + + Eclipse JGit Plugin Update Site (Incubation) + + + + org.eclipse.jgit + org.eclipse.jgit + 0.6.0-SNAPSHOT + + + + + + + org.codehaus.tycho + target-platform-configuration + ${tycho-version} + + p2 + consider + + + + org.apache.maven.plugins + maven-assembly-plugin + 2.2-beta-4 + + + assembly.xml + + + + + make-assembly + package + + single + + + + + + + + 0.6.0 + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/site.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/site.xml new file mode 100644 index 000000000..ab13de9fd --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/site.xml @@ -0,0 +1,14 @@ + + + + This is a pure Java implementation of the Git version control system. The native Git version is also required in this version. + + + + + + + JGit (Incubation) + + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/web/site.css b/org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/web/site.css new file mode 100644 index 000000000..62c6f9ffa --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/web/site.css @@ -0,0 +1,12 @@ + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/web/site.xsl b/org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/web/site.xsl new file mode 100644 index 000000000..7620ffae7 --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/web/site.xsl @@ -0,0 +1,214 @@ + + + + + + + + org.eclipse.jgit.updatesite + + + +

org.eclipse.jgit.updatesite

+

+ + + + + + + + + + + + + + + + dark-row + + + light-row + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + dark-row + + + light-row + + + + + + + + + + + + + + + dark-row + + + light-row + + + + + + + + +
+ + + +
+ + + +
+
+ ( - ) +
+
+ + - + +
+
+
+ + + + + + + + + + + + + + + + + + + + + +
Operating Systems:
Windows Systems:
Languages:
Architecture:
+


+ Uncategorized +
+ + + +
+
+ ( - ) +
+
+ + - + +
+

+
+ + + + + + + + + + + + + + + + + + + + + +
Operating Systems:
Windows Systems:
Languages:
Architecture:
+
+ + + +
+
+ ( - ) +
+
+ + - + +
+

+
+ + + + + + + + + + + + + + + + + + + + + +
Operating Systems:
Windows Systems:
Languages:
Architecture:
+
+ + +
+
+
diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml new file mode 100644 index 000000000..a32a862d9 --- /dev/null +++ b/org.eclipse.jgit.packaging/pom.xml @@ -0,0 +1,126 @@ + + + + + 4.0.0 + + + 3.0 + + + org.eclipse.jgit + jgit.tycho.parent + 0.6.0-SNAPSHOT + pom + + JGit Tycho Parent (Incubation) + + + 0.6.0 + + + + org.eclipse.jgit.feature + org.eclipse.jgit.updatesite + + + + + galileo + p2 + http://download.eclipse.org/releases/galileo + + + + + + + org.sonatype.tycho + tycho-maven-plugin + ${tycho-version} + true + + + org.sonatype.tycho + target-platform-configuration + ${tycho-version} + + p2 + + + + + + + org.sonatype.tycho + maven-osgi-compiler-plugin + ${tycho-version} + + UTF-8 + + + + org.apache.maven.plugins + maven-resources-plugin + 2.4.1 + + ISO-8859-1 + + + + org.sonatype.tycho + target-platform-configuration + ${tycho-version} + + p2 + consider + + + + + + +