summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit
diff options
context:
space:
mode:
authorRobin Rosenberg <robin.rosenberg@dewire.com>2010-01-12 14:35:17 -0500
committerCode Review <codereview-daemon@eclipse.org>2010-01-12 14:35:17 -0500
commitb014502e79dd3e491fc9be045eb9e2f660958dd5 (patch)
treea6a78a14144335bb9abae32970f5242df8031e6c /org.eclipse.jgit
parentaa4b1157910f674ab49033f8bc8e03658d4631a1 (diff)
parent5eac1a4896175065065133dbc8d213dacba201b3 (diff)
downloadjgit-b014502e79dd3e491fc9be045eb9e2f660958dd5.tar.gz
jgit-b014502e79dd3e491fc9be045eb9e2f660958dd5.zip
Merge "Partial revert "Switch build to Apache Felix maven-bundle-plugin""
Diffstat (limited to 'org.eclipse.jgit')
-rw-r--r--org.eclipse.jgit/.classpath7
-rw-r--r--org.eclipse.jgit/.project28
-rw-r--r--org.eclipse.jgit/META-INF/MANIFEST.MF25
-rw-r--r--org.eclipse.jgit/build.properties5
-rw-r--r--org.eclipse.jgit/plugin.properties3
-rw-r--r--org.eclipse.jgit/pom.xml9
6 files changed, 66 insertions, 11 deletions
diff --git a/org.eclipse.jgit/.classpath b/org.eclipse.jgit/.classpath
new file mode 100644
index 0000000000..304e86186a
--- /dev/null
+++ b/org.eclipse.jgit/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <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="output" path="bin"/>
+</classpath>
diff --git a/org.eclipse.jgit/.project b/org.eclipse.jgit/.project
new file mode 100644
index 0000000000..19aeef1fb8
--- /dev/null
+++ b/org.eclipse.jgit/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.jgit</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ </natures>
+</projectDescription>
diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..5c7f111fb9
--- /dev/null
+++ b/org.eclipse.jgit/META-INF/MANIFEST.MF
@@ -0,0 +1,25 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %plugin_name
+Bundle-SymbolicName: org.eclipse.jgit
+Bundle-Version: 0.6.0.qualifier
+Bundle-Localization: plugin
+Bundle-Vendor: %provider_name
+Export-Package: org.eclipse.jgit.diff;version="0.6.0",
+ org.eclipse.jgit.dircache;version="0.6.0",
+ org.eclipse.jgit.errors;version="0.6.0",
+ org.eclipse.jgit.fnmatch;version="0.6.0",
+ org.eclipse.jgit.lib;version="0.6.0",
+ org.eclipse.jgit.merge;version="0.6.0",
+ org.eclipse.jgit.patch;version="0.6.0",
+ org.eclipse.jgit.revplot;version="0.6.0",
+ org.eclipse.jgit.revwalk;version="0.6.0",
+ org.eclipse.jgit.revwalk.filter;version="0.6.0",
+ org.eclipse.jgit.transport;version="0.6.0",
+ org.eclipse.jgit.treewalk;version="0.6.0",
+ org.eclipse.jgit.treewalk.filter;version="0.6.0",
+ org.eclipse.jgit.util;version="0.6.0",
+ org.eclipse.jgit.util.io;version="0.6.0"
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Import-Package: com.jcraft.jsch
diff --git a/org.eclipse.jgit/build.properties b/org.eclipse.jgit/build.properties
new file mode 100644
index 0000000000..aa1a008269
--- /dev/null
+++ b/org.eclipse.jgit/build.properties
@@ -0,0 +1,5 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .,\
+ plugin.properties
diff --git a/org.eclipse.jgit/plugin.properties b/org.eclipse.jgit/plugin.properties
index c11ccea45c..d8e4703b67 100644
--- a/org.eclipse.jgit/plugin.properties
+++ b/org.eclipse.jgit/plugin.properties
@@ -1,3 +1,2 @@
plugin_name=Java Git Core (Incubation)
-provider_name=Eclipse.org
-plugin_description=Git file access and network transport
+provider_name=eclipse.org
diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml
index b3d1ee6a3d..a751da3fa3 100644
--- a/org.eclipse.jgit/pom.xml
+++ b/org.eclipse.jgit/pom.xml
@@ -95,15 +95,6 @@
</Import-Package>
</instructions>
</configuration>
- <executions>
- <execution>
- <id>bundle-manifest</id>
- <phase>process-classes</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
- </executions>
</plugin>
<plugin>