summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.junit
diff options
context:
space:
mode:
Diffstat (limited to 'org.eclipse.jgit.junit')
-rw-r--r--org.eclipse.jgit.junit/.classpath7
-rw-r--r--org.eclipse.jgit.junit/.gitignore5
-rw-r--r--org.eclipse.jgit.junit/.project28
-rw-r--r--org.eclipse.jgit.junit/META-INF/MANIFEST.MF27
-rw-r--r--org.eclipse.jgit.junit/build.properties5
-rw-r--r--org.eclipse.jgit.junit/plugin.properties3
-rw-r--r--org.eclipse.jgit.junit/pom.xml26
7 files changed, 30 insertions, 71 deletions
diff --git a/org.eclipse.jgit.junit/.classpath b/org.eclipse.jgit.junit/.classpath
deleted file mode 100644
index 64c5e31b7a..0000000000
--- a/org.eclipse.jgit.junit/.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.junit/.gitignore b/org.eclipse.jgit.junit/.gitignore
index 934e0e06ff..7bfe4ab211 100644
--- a/org.eclipse.jgit.junit/.gitignore
+++ b/org.eclipse.jgit.junit/.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.junit/.project b/org.eclipse.jgit.junit/.project
deleted file mode 100644
index 90325d8fa2..0000000000
--- a/org.eclipse.jgit.junit/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jgit.junit</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.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF
deleted file mode 100644
index 0ff1c0f96a..0000000000
--- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,27 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %plugin_name
-Bundle-SymbolicName: org.eclipse.jgit.junit
-Bundle-Version: 0.6.0.qualifier
-Bundle-Localization: plugin
-Bundle-Vendor: %provider_name
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Import-Package: com.jcraft.jsch,
- junit.framework,
- org.eclipse.jgit.diff,
- org.eclipse.jgit.dircache,
- org.eclipse.jgit.errors,
- org.eclipse.jgit.fnmatch,
- org.eclipse.jgit.lib,
- org.eclipse.jgit.merge,
- org.eclipse.jgit.patch,
- org.eclipse.jgit.revplot,
- org.eclipse.jgit.revwalk,
- org.eclipse.jgit.revwalk.filter,
- org.eclipse.jgit.transport,
- org.eclipse.jgit.treewalk,
- org.eclipse.jgit.treewalk.filter,
- org.eclipse.jgit.util,
- org.eclipse.jgit.util.io
-Export-Package: org.eclipse.jgit.junit;version="0.6.0"
diff --git a/org.eclipse.jgit.junit/build.properties b/org.eclipse.jgit.junit/build.properties
deleted file mode 100644
index aa1a008269..0000000000
--- a/org.eclipse.jgit.junit/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.properties
diff --git a/org.eclipse.jgit.junit/plugin.properties b/org.eclipse.jgit.junit/plugin.properties
index d137bd4980..5a5dfade09 100644
--- a/org.eclipse.jgit.junit/plugin.properties
+++ b/org.eclipse.jgit.junit/plugin.properties
@@ -1,2 +1,3 @@
plugin_name=Java Git JUnit Utility Classes (Incubation)
-provider_name=eclipse.org
+provider_name=Eclipse.org
+plugin_description=Utility classes supporting testing under JUnit
diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml
index d38764a1fe..692b8b762d 100644
--- a/org.eclipse.jgit.junit/pom.xml
+++ b/org.eclipse.jgit.junit/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>
<dependency>
@@ -88,7 +89,28 @@
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Import-Package>
+ junit.framework;version="${junit-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>