diff options
Diffstat (limited to 'org.eclipse.jgit.ui')
| -rw-r--r-- | org.eclipse.jgit.ui/.classpath | 7 | ||||
| -rw-r--r-- | org.eclipse.jgit.ui/.gitignore | 5 | ||||
| -rw-r--r-- | org.eclipse.jgit.ui/.project | 34 | ||||
| -rw-r--r-- | org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 15 | ||||
| -rw-r--r-- | org.eclipse.jgit.ui/build.properties | 5 | ||||
| -rw-r--r-- | org.eclipse.jgit.ui/plugin.properties | 3 | ||||
| -rw-r--r-- | org.eclipse.jgit.ui/pom.xml | 27 |
7 files changed, 31 insertions, 65 deletions
diff --git a/org.eclipse.jgit.ui/.classpath b/org.eclipse.jgit.ui/.classpath deleted file mode 100644 index 64c5e31b7a..0000000000 --- a/org.eclipse.jgit.ui/.classpath +++ /dev/null @@ -1,7 +0,0 @@ -<?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/J2SE-1.5"/> - <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.ui/.gitignore b/org.eclipse.jgit.ui/.gitignore index 934e0e06ff..7bfe4ab211 100644 --- a/org.eclipse.jgit.ui/.gitignore +++ b/org.eclipse.jgit.ui/.gitignore @@ -1,2 +1,5 @@ -/bin /target +/META-INF/MANIFEST.MF +/.project +/.classpath +/.settings/org.maven.ide.eclipse.prefs diff --git a/org.eclipse.jgit.ui/.project b/org.eclipse.jgit.ui/.project deleted file mode 100644 index 59e2e097b6..0000000000 --- a/org.eclipse.jgit.ui/.project +++ /dev/null @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.jgit.ui</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.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF deleted file mode 100644 index a6710cd526..0000000000 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ /dev/null @@ -1,15 +0,0 @@ -Bundle-Localization: plugin -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %plugin_name -Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 0.6.0.qualifier -Bundle-Vendor: %provider_name -Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Export-Package: org.eclipse.jgit.awtui;version="0.6.0" -Import-Package: com.jcraft.jsch, - org.eclipse.jgit.lib;version="0.6.0", - org.eclipse.jgit.transport, - org.eclipse.jgit.revplot, - org.eclipse.jgit.revwalk, - org.eclipse.jgit.util diff --git a/org.eclipse.jgit.ui/build.properties b/org.eclipse.jgit.ui/build.properties deleted file mode 100644 index aa1a008269..0000000000 --- a/org.eclipse.jgit.ui/build.properties +++ /dev/null @@ -1,5 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - .,\ - plugin.properties diff --git a/org.eclipse.jgit.ui/plugin.properties b/org.eclipse.jgit.ui/plugin.properties index b9acc51512..c359669db1 100644 --- a/org.eclipse.jgit.ui/plugin.properties +++ b/org.eclipse.jgit.ui/plugin.properties @@ -1,2 +1,3 @@ plugin_name=Java Git AWT User Interface (Incubation) -provider_name=eclipse.org +provider_name=Eclipse.org +plugin_description=AWT/Swing based user interface support diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index f77a143cb3..a910cb645a 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -50,7 +50,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> - <artifactId>jgit-parent</artifactId> + <artifactId>org.eclipse.jgit-parent</artifactId> <version>0.6.0-SNAPSHOT</version> </parent> @@ -65,6 +65,7 @@ <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit</artifactId> + <version>${project.version}</version> </dependency> </dependencies> @@ -82,7 +83,29 @@ <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <configuration> + <instructions> + <Import-Package> + !javax.swing.*, + com.jcraft.jsch;version="${jsch-version}", + * + </Import-Package> + </instructions> + </configuration> + <executions> + <execution> + <id>bundle-manifest</id> + <phase>process-classes</phase> + <goals> + <goal>manifest</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> <artifactId>maven-jar-plugin</artifactId> <configuration> <archive> |