diff options
author | Robin Rosenberg <robin.rosenberg@dewire.com> | 2010-01-10 13:46:33 +0100 |
---|---|---|
committer | Robin Rosenberg <robin.rosenberg@dewire.com> | 2010-01-10 15:59:03 +0100 |
commit | 5eac1a4896175065065133dbc8d213dacba201b3 (patch) | |
tree | 78f143a113e3a3ae07b84279e0922247ea862ede /org.eclipse.jgit.console | |
parent | fc5fc70e2e8cc8e3ef493e130c3227ef83400f80 (diff) | |
download | jgit-5eac1a4896175065065133dbc8d213dacba201b3.tar.gz jgit-5eac1a4896175065065133dbc8d213dacba201b3.zip |
Partial revert "Switch build to Apache Felix maven-bundle-plugin"
This restores the ability to build using just Eclipse without
strange procedures, extra plugins and it is again possible to
work on both JGit and EGit in the same Eclipse workspace with
ease.
Change-Id: I0af08127d507fbce186f428f1cdeff280f0ddcda
Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
Diffstat (limited to 'org.eclipse.jgit.console')
-rw-r--r-- | org.eclipse.jgit.console/.classpath | 7 | ||||
-rw-r--r-- | org.eclipse.jgit.console/.project | 34 | ||||
-rw-r--r-- | org.eclipse.jgit.console/META-INF/MANIFEST.MF | 12 | ||||
-rw-r--r-- | org.eclipse.jgit.console/build.properties | 5 | ||||
-rw-r--r-- | org.eclipse.jgit.console/plugin.properties | 3 | ||||
-rw-r--r-- | org.eclipse.jgit.console/pom.xml | 9 |
6 files changed, 59 insertions, 11 deletions
diff --git a/org.eclipse.jgit.console/.classpath b/org.eclipse.jgit.console/.classpath new file mode 100644 index 0000000000..ad32c83a78 --- /dev/null +++ b/org.eclipse.jgit.console/.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/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="output" path="bin"/> +</classpath> diff --git a/org.eclipse.jgit.console/.project b/org.eclipse.jgit.console/.project new file mode 100644 index 0000000000..4f272a7ccc --- /dev/null +++ b/org.eclipse.jgit.console/.project @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.jgit.console</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> + <buildCommand> + <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> + </natures> +</projectDescription> diff --git a/org.eclipse.jgit.console/META-INF/MANIFEST.MF b/org.eclipse.jgit.console/META-INF/MANIFEST.MF new file mode 100644 index 0000000000..ed12693f0c --- /dev/null +++ b/org.eclipse.jgit.console/META-INF/MANIFEST.MF @@ -0,0 +1,12 @@ +Bundle-Localization: plugin +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: %plugin_name +Bundle-SymbolicName: org.eclipse.jgit.console +Bundle-Version: 0.6.0.qualifier +Bundle-Vendor: %provider_name +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Export-Package: org.eclipse.jgit.console;version="0.6.0" +Import-Package: com.jcraft.jsch;version="0.1.41", + org.eclipse.jgit.transport;version="0.6.0", + org.eclipse.jgit.util diff --git a/org.eclipse.jgit.console/build.properties b/org.eclipse.jgit.console/build.properties new file mode 100644 index 0000000000..aa1a008269 --- /dev/null +++ b/org.eclipse.jgit.console/build.properties @@ -0,0 +1,5 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + .,\ + plugin.properties diff --git a/org.eclipse.jgit.console/plugin.properties b/org.eclipse.jgit.console/plugin.properties index bce4263a49..a86bcd86b8 100644 --- a/org.eclipse.jgit.console/plugin.properties +++ b/org.eclipse.jgit.console/plugin.properties @@ -1,3 +1,2 @@ plugin_name=Java Git Console User Interface (Incubation) -provider_name=Eclipse.org -plugin_description=Console based user interface support +provider_name=eclipse.org diff --git a/org.eclipse.jgit.console/pom.xml b/org.eclipse.jgit.console/pom.xml index 94fe3afef0..c84587a5a0 100644 --- a/org.eclipse.jgit.console/pom.xml +++ b/org.eclipse.jgit.console/pom.xml @@ -94,15 +94,6 @@ </Import-Package> </instructions> </configuration> - <executions> - <execution> - <id>bundle-manifest</id> - <phase>process-classes</phase> - <goals> - <goal>manifest</goal> - </goals> - </execution> - </executions> </plugin> <plugin> |