diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..3af100d8c --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +/.project +/.settings/org.maven.ide.eclipse.prefs diff --git a/org.eclipse.jgit-feature/.gitignore b/org.eclipse.jgit-feature/.gitignore deleted file mode 100644 index f78e24546..000000000 --- a/org.eclipse.jgit-feature/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/target -/compile.org.eclipse.jgit.xml diff --git a/org.eclipse.jgit-feature/.project b/org.eclipse.jgit-feature/.project deleted file mode 100644 index 80b09533c..000000000 --- a/org.eclipse.jgit-feature/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - org.eclipse.jgit-feature - - - - - - org.eclipse.pde.FeatureBuilder - - - - - - org.eclipse.pde.FeatureNature - - diff --git a/org.eclipse.jgit-feature/build.properties b/org.eclipse.jgit-feature/build.properties deleted file mode 100644 index b3a611b5c..000000000 --- a/org.eclipse.jgit-feature/build.properties +++ /dev/null @@ -1,2 +0,0 @@ -bin.includes = feature.xml,\ - feature.properties diff --git a/org.eclipse.jgit-feature/feature.properties b/org.eclipse.jgit-feature/feature.properties deleted file mode 100644 index eba9a59e3..000000000 --- a/org.eclipse.jgit-feature/feature.properties +++ /dev/null @@ -1,71 +0,0 @@ -############################################################################### -# Copyright (c) 2000, 2009 IBM Corporation and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -############################################################################### - -featureName=Eclipse JGit Feature (Incubation) -providerName=eclipse.org - -updateSiteName=Eclipse Update Site (experimental) - -# description property - text of the "Feature Descrption" -description=\ -A pure Java implementation of the Git version control system.\n -################ end of description property ################################## - -# "copyright" property - text of the "Feature Update Copyright" -copyright=\ -Copyright (c) 2005, 2009 Shawn Pearce, Robin Rosenberg, et.al.\n\ -All rights reserved. This program and the accompanying materials\n\ -are made available under the terms of the Eclipse Distribution License v1.0\n\ -which accompanies this distribution, and is available at\n\ -http://www.eclipse.org/org/documents/edl-v10.html\n -################ end of copyright property #################################### - -# "licenseURL" property - URL of the "Feature License" -# do not translate value - just change to point to a locale-specific HTML page -licenseURL=http://www.eclipse.org/org/documents/edl-v10.html - -# "license" property - text of the "Feature Update License" -# should be plain text version of license agreement pointed to be "licenseURL" -license=\ -Eclipse Distribution License - v 1.0\n\ -\n\ -Copyright (c) 2007, Eclipse Foundation, Inc. and its licensors.\n\ -\n\ -All rights reserved.\n\ -\n\ -Redistribution and use in source and binary forms, with or without\n\ -modification, are permitted provided that the following conditions are\n\ -met:\n\ -\n\ - * Redistributions of source code must retain the above copyright\n\ - notice, this list of conditions and the following disclaimer.\n\ -\n\ - * Redistributions in binary form must reproduce the above\n\ - copyright notice, this list of conditions and the following\n\ - disclaimer in the documentation and/or other materials provided\n\ - with the distribution.\n\ -\n\ - * Neither the name of the Eclipse Foundation, Inc. nor the names\n\ - of its contributors may be used to endorse or promote products\n\ - derived from this software without specific prior written\n\ - permission.\n\ -\n\ -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n\ -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\n\ -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\n\ -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\n\ -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n\ -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\n\ -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\n\ -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\n\ -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n\ -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\n\ -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n -########### end of license property ########################################## diff --git a/org.eclipse.jgit-feature/feature.xml b/org.eclipse.jgit-feature/feature.xml deleted file mode 100644 index 9facbe0d9..000000000 --- a/org.eclipse.jgit-feature/feature.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - %description - - - - %copyright - - - - %license - - - - - - - - - - - - - diff --git a/org.eclipse.jgit-feature/pom.xml b/org.eclipse.jgit-feature/pom.xml deleted file mode 100644 index 00c076a1e..000000000 --- a/org.eclipse.jgit-feature/pom.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - 4.0.0 - - - org.eclipse.jgit - jgit-parent - 0.6.0-SNAPSHOT - - - org.eclipse.jgit-feature - eclipse-feature - - diff --git a/org.eclipse.jgit.console/.classpath b/org.eclipse.jgit.console/.classpath deleted file mode 100644 index ad32c83a7..000000000 --- a/org.eclipse.jgit.console/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/org.eclipse.jgit.console/.gitignore b/org.eclipse.jgit.console/.gitignore index 934e0e06f..7bfe4ab21 100644 --- a/org.eclipse.jgit.console/.gitignore +++ b/org.eclipse.jgit.console/.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.console/.project b/org.eclipse.jgit.console/.project deleted file mode 100644 index 4f272a7cc..000000000 --- a/org.eclipse.jgit.console/.project +++ /dev/null @@ -1,34 +0,0 @@ - - - org.eclipse.jgit.console - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - org.eclipse.pde.api.tools.apiAnalysisBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - org.eclipse.pde.api.tools.apiAnalysisNature - - diff --git a/org.eclipse.jgit.console/META-INF/MANIFEST.MF b/org.eclipse.jgit.console/META-INF/MANIFEST.MF deleted file mode 100644 index ed12693f0..000000000 --- a/org.eclipse.jgit.console/META-INF/MANIFEST.MF +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100644 index aa1a00826..000000000 --- a/org.eclipse.jgit.console/build.properties +++ /dev/null @@ -1,5 +0,0 @@ -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 a86bcd86b..bce4263a4 100644 --- a/org.eclipse.jgit.console/plugin.properties +++ b/org.eclipse.jgit.console/plugin.properties @@ -1,2 +1,3 @@ plugin_name=Java Git Console User Interface (Incubation) -provider_name=eclipse.org +provider_name=Eclipse.org +plugin_description=Console based user interface support diff --git a/org.eclipse.jgit.console/pom.xml b/org.eclipse.jgit.console/pom.xml index 98b1511ec..94fe3afef 100644 --- a/org.eclipse.jgit.console/pom.xml +++ b/org.eclipse.jgit.console/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit - jgit-parent + org.eclipse.jgit-parent 0.6.0-SNAPSHOT @@ -65,6 +65,7 @@ org.eclipse.jgit org.eclipse.jgit + ${project.version} @@ -82,17 +83,29 @@ - maven-compiler-plugin - 2.0.2 + org.apache.felix + maven-bundle-plugin - 1.6 - 1.6 - UTF-8 + + J2SE-1.6 + + com.jcraft.jsch;version="${jsch-version}", + * + + + + + bundle-manifest + process-classes + + manifest + + + - org.apache.maven.plugins maven-jar-plugin @@ -100,6 +113,15 @@ + + + maven-compiler-plugin + + 1.6 + 1.6 + UTF-8 + + diff --git a/org.eclipse.jgit.junit/.classpath b/org.eclipse.jgit.junit/.classpath deleted file mode 100644 index 64c5e31b7..000000000 --- a/org.eclipse.jgit.junit/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/org.eclipse.jgit.junit/.gitignore b/org.eclipse.jgit.junit/.gitignore index 934e0e06f..7bfe4ab21 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 90325d8fa..000000000 --- a/org.eclipse.jgit.junit/.project +++ /dev/null @@ -1,28 +0,0 @@ - - - org.eclipse.jgit.junit - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.pde.PluginNature - - 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 0ff1c0f96..000000000 --- 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 aa1a00826..000000000 --- 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 d137bd498..5a5dfade0 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 d38764a1f..692b8b762 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit - jgit-parent + org.eclipse.jgit-parent 0.6.0-SNAPSHOT @@ -65,6 +65,7 @@ org.eclipse.jgit org.eclipse.jgit + ${project.version} @@ -88,7 +89,28 @@ - org.apache.maven.plugins + org.apache.felix + maven-bundle-plugin + + + + junit.framework;version="${junit-version}", + * + + + + + + bundle-manifest + process-classes + + manifest + + + + + + maven-jar-plugin diff --git a/org.eclipse.jgit.pgm/.classpath b/org.eclipse.jgit.pgm/.classpath deleted file mode 100644 index 304e86186..000000000 --- a/org.eclipse.jgit.pgm/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/org.eclipse.jgit.pgm/.gitignore b/org.eclipse.jgit.pgm/.gitignore index 934e0e06f..7351243d9 100644 --- a/org.eclipse.jgit.pgm/.gitignore +++ b/org.eclipse.jgit.pgm/.gitignore @@ -1,2 +1,4 @@ -/bin /target +/.project +/.classpath +/.settings/org.maven.ide.eclipse.prefs diff --git a/org.eclipse.jgit.pgm/.project b/org.eclipse.jgit.pgm/.project deleted file mode 100644 index 6fc89ae5e..000000000 --- a/org.eclipse.jgit.pgm/.project +++ /dev/null @@ -1,28 +0,0 @@ - - - org.eclipse.jgit.pgm - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.pde.PluginNature - - diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF deleted file mode 100644 index fe59357ab..000000000 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ /dev/null @@ -1,25 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %plugin_name -Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 0.6.0.qualifier -Bundle-Vendor: %provider_name -Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Import-Package: org.eclipse.jgit.awtui, - org.eclipse.jgit.dircache, - org.eclipse.jgit.errors, - org.eclipse.jgit.lib, - 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.kohsuke.args4j, - org.kohsuke.args4j.spi -Bundle-ActivationPolicy: lazy -Export-Package: org.eclipse.jgit.pgm -Main-Class: org.eclipse.jgit.pgm.Main -Implementation-Title: JGit Command Line Interface diff --git a/org.eclipse.jgit.pgm/build.properties b/org.eclipse.jgit.pgm/build.properties deleted file mode 100644 index aa1a00826..000000000 --- a/org.eclipse.jgit.pgm/build.properties +++ /dev/null @@ -1,5 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - .,\ - plugin.properties diff --git a/org.eclipse.jgit.pgm/plugin.properties b/org.eclipse.jgit.pgm/plugin.properties deleted file mode 100644 index f8fbd725c..000000000 --- a/org.eclipse.jgit.pgm/plugin.properties +++ /dev/null @@ -1,2 +0,0 @@ -plugin_name=Java Git Command Line Interface (Incubation) -provider_name=eclipse.org diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index e06dbc2d0..7b25efe19 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -49,7 +49,7 @@ org.eclipse.jgit - jgit-parent + org.eclipse.jgit-parent 0.6.0-SNAPSHOT @@ -69,11 +69,13 @@ org.eclipse.jgit org.eclipse.jgit + ${project.version} org.eclipse.jgit org.eclipse.jgit.ui + ${project.version} @@ -105,12 +107,10 @@ - org.apache.maven.plugins maven-shade-plugin - 1.2 package @@ -126,7 +126,6 @@ org.eclipse.jgit.pgm.Main JGit Command Line Interface - ${project.version} @@ -138,7 +137,6 @@ org.apache.maven.plugins maven-antrun-plugin - 1.3 create_jgit @@ -162,7 +160,6 @@ org.codehaus.mojo build-helper-maven-plugin - 1.3 attach_jgit diff --git a/org.eclipse.jgit.test/.classpath b/org.eclipse.jgit.test/.classpath deleted file mode 100644 index ea4128577..000000000 --- a/org.eclipse.jgit.test/.classpath +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/org.eclipse.jgit.test/.gitignore b/org.eclipse.jgit.test/.gitignore index b5bbb0ab8..ab3bd25ad 100644 --- a/org.eclipse.jgit.test/.gitignore +++ b/org.eclipse.jgit.test/.gitignore @@ -1,3 +1,6 @@ -/bin /target +/META-INF/MANIFEST.MF /trash +/.project +/.classpath +/.settings/org.maven.ide.eclipse.prefs diff --git a/org.eclipse.jgit.test/.project b/org.eclipse.jgit.test/.project deleted file mode 100644 index 84c971100..000000000 --- a/org.eclipse.jgit.test/.project +++ /dev/null @@ -1,28 +0,0 @@ - - - org.eclipse.jgit.test - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.pde.PluginNature - - diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF deleted file mode 100644 index 32d5efdfc..000000000 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ /dev/null @@ -1,28 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %plugin_name -Bundle-SymbolicName: org.eclipse.jgit.test -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, - junit.textui, - org.eclipse.jgit.junit, - 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 diff --git a/org.eclipse.jgit.test/build.properties b/org.eclipse.jgit.test/build.properties deleted file mode 100644 index afc4855d6..000000000 --- a/org.eclipse.jgit.test/build.properties +++ /dev/null @@ -1,6 +0,0 @@ -source.. = tst/,\ - tst-rsrc/,\ - exttst/ -bin.includes = META-INF/,\ - .,\ - plugin.properties diff --git a/org.eclipse.jgit.test/org.eclipse.jgit.core--All-External-Tests (Java 6).launch b/org.eclipse.jgit.test/org.eclipse.jgit.core--All-External-Tests (Java 6).launch index 9a9ca124d..6ef8132d0 100644 --- a/org.eclipse.jgit.test/org.eclipse.jgit.core--All-External-Tests (Java 6).launch +++ b/org.eclipse.jgit.test/org.eclipse.jgit.core--All-External-Tests (Java 6).launch @@ -1,21 +1,23 @@ - + - - - + + + - - + - - - - + + + + + + + diff --git a/org.eclipse.jgit.test/org.eclipse.jgit.core--All-External-Tests.launch b/org.eclipse.jgit.test/org.eclipse.jgit.core--All-External-Tests.launch index 6735fb0a2..abdb96502 100644 --- a/org.eclipse.jgit.test/org.eclipse.jgit.core--All-External-Tests.launch +++ b/org.eclipse.jgit.test/org.eclipse.jgit.core--All-External-Tests.launch @@ -1,20 +1,22 @@ - + - - - + + + - + - - - - + + + + + + diff --git a/org.eclipse.jgit.test/org.eclipse.jgit.core--All-Tests (Java 6).launch b/org.eclipse.jgit.test/org.eclipse.jgit.core--All-Tests (Java 6).launch index a0aecf920..075f47b8f 100644 --- a/org.eclipse.jgit.test/org.eclipse.jgit.core--All-Tests (Java 6).launch +++ b/org.eclipse.jgit.test/org.eclipse.jgit.core--All-Tests (Java 6).launch @@ -15,7 +15,9 @@ + + diff --git a/org.eclipse.jgit.test/org.eclipse.jgit.core--All-Tests.launch b/org.eclipse.jgit.test/org.eclipse.jgit.core--All-Tests.launch index bff41ecf0..5735df039 100644 --- a/org.eclipse.jgit.test/org.eclipse.jgit.core--All-Tests.launch +++ b/org.eclipse.jgit.test/org.eclipse.jgit.core--All-Tests.launch @@ -1,20 +1,22 @@ - + - - - + + + - + - - - - + + + + + + diff --git a/org.eclipse.jgit.test/plugin.properties b/org.eclipse.jgit.test/plugin.properties deleted file mode 100644 index 68e67f810..000000000 --- a/org.eclipse.jgit.test/plugin.properties +++ /dev/null @@ -1,2 +0,0 @@ -plugin_name=Java Git Core Tests (Incubation) -provider_name=eclipse.org diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index 6938ea60a..d65b8249c 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -51,7 +51,7 @@ org.eclipse.jgit - jgit-parent + org.eclipse.jgit-parent 0.6.0-SNAPSHOT @@ -63,14 +63,22 @@ + + junit + junit + test + + org.eclipse.jgit org.eclipse.jgit + ${project.version} org.eclipse.jgit org.eclipse.jgit.junit + ${project.version} diff --git a/org.eclipse.jgit.ui/.classpath b/org.eclipse.jgit.ui/.classpath deleted file mode 100644 index 64c5e31b7..000000000 --- a/org.eclipse.jgit.ui/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/org.eclipse.jgit.ui/.gitignore b/org.eclipse.jgit.ui/.gitignore index 934e0e06f..7bfe4ab21 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 59e2e097b..000000000 --- a/org.eclipse.jgit.ui/.project +++ /dev/null @@ -1,34 +0,0 @@ - - - org.eclipse.jgit.ui - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - org.eclipse.pde.api.tools.apiAnalysisBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - org.eclipse.pde.api.tools.apiAnalysisNature - - 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 a6710cd52..000000000 --- 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 aa1a00826..000000000 --- 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 b9acc5151..c359669db 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 f77a143cb..a910cb645 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -50,7 +50,7 @@ org.eclipse.jgit - jgit-parent + org.eclipse.jgit-parent 0.6.0-SNAPSHOT @@ -65,6 +65,7 @@ org.eclipse.jgit org.eclipse.jgit + ${project.version} @@ -82,7 +83,29 @@ - org.apache.maven.plugins + org.apache.felix + maven-bundle-plugin + + + + !javax.swing.*, + com.jcraft.jsch;version="${jsch-version}", + * + + + + + + bundle-manifest + process-classes + + manifest + + + + + + maven-jar-plugin diff --git a/org.eclipse.jgit/.classpath b/org.eclipse.jgit/.classpath deleted file mode 100644 index 304e86186..000000000 --- a/org.eclipse.jgit/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/org.eclipse.jgit/.gitignore b/org.eclipse.jgit/.gitignore index 934e0e06f..7bfe4ab21 100644 --- a/org.eclipse.jgit/.gitignore +++ b/org.eclipse.jgit/.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/.project b/org.eclipse.jgit/.project deleted file mode 100644 index 19aeef1fb..000000000 --- a/org.eclipse.jgit/.project +++ /dev/null @@ -1,28 +0,0 @@ - - - org.eclipse.jgit - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.pde.PluginNature - - diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF deleted file mode 100644 index 5c7f111fb..000000000 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ /dev/null @@ -1,25 +0,0 @@ -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 deleted file mode 100644 index aa1a00826..000000000 --- a/org.eclipse.jgit/build.properties +++ /dev/null @@ -1,5 +0,0 @@ -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 d8e4703b6..c11ccea45 100644 --- a/org.eclipse.jgit/plugin.properties +++ b/org.eclipse.jgit/plugin.properties @@ -1,2 +1,3 @@ plugin_name=Java Git Core (Incubation) -provider_name=eclipse.org +provider_name=Eclipse.org +plugin_description=Git file access and network transport diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index ce3256a51..b3d1ee6a3 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -51,11 +51,10 @@ org.eclipse.jgit - jgit-parent + org.eclipse.jgit-parent 0.6.0-SNAPSHOT - eclipse-plugin org.eclipse.jgit JGit - Core @@ -81,6 +80,40 @@ - + + + org.apache.felix + maven-bundle-plugin + + + + !org.xml.sax.*, + !javax.crypto.*, + com.jcraft.jsch;version="${jsch-version}", + * + + + + + + bundle-manifest + process-classes + + manifest + + + + + + + maven-jar-plugin + + + META-INF/MANIFEST.MF + + + + + diff --git a/pom.xml b/pom.xml index 82a45eb89..9d5bf712c 100644 --- a/pom.xml +++ b/pom.xml @@ -48,12 +48,12 @@ 4.0.0 org.eclipse.jgit - jgit-parent + org.eclipse.jgit-parent pom 0.6.0-SNAPSHOT JGit - Parent - http://www.eclipse.org/egit/ + ${jgit-url} Pure Java implementation of Git @@ -61,11 +61,11 @@ - egit-dev Mailing List - egit-dev@eclipse.org - https://dev.eclipse.org/mailman/listinfo/egit-dev - https://dev.eclipse.org/mailman/listinfo/egit-dev - http://dev.eclipse.org/mhonarc/lists/egit-dev + jgit-dev Mailing List + jgit-dev@eclipse.org + https://dev.eclipse.org/mailman/listinfo/jgit-dev + https://dev.eclipse.org/mailman/listinfo/jgit-dev + http://dev.eclipse.org/mhonarc/lists/jgit-dev @@ -76,7 +76,7 @@ - https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced;component=JGit;product=EGit;classification=Technology + https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced;component=JGit;product=JGit;classification=Technology Bugzilla @@ -121,25 +121,101 @@ + http://www.eclipse.org/jgit/ + Copyright (c) 2005, 2009 Shawn Pearce, Robin Rosenberg, et.al. + UTF-8 UTF-8 - 0.6.0 - + CQ 3493 + 0.1.41 - - - galileo - p2 - http://download.eclipse.org/releases/galileo - - + CQ 3589 + 3.8.2 + + CQ 3454 + 2.0.12 + + + + + org.apache.felix + maven-bundle-plugin + 2.0.1 + + META-INF + + J2SE-1.5 + ${jgit-url} + %provider_name + %plugin_name + %plugin_description + plugin + ${jgit-copyright} + http://www.eclipse.org/org/documents/edl-v10.php + ${project.artifactId} + <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@))) + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + JGit ${project.artifactId} + ${project.version} + Eclipse.org - JGit + org.eclipse.jgit + ${jgit-url} + + + + + + + maven-compiler-plugin + 2.0.2 + + + + maven-clean-plugin + 2.2 + + + + org.apache.maven.plugins + maven-shade-plugin + 1.2 + + + + org.apache.maven.plugins + maven-antrun-plugin + 1.3 + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.1 + + + + org.codehaus.mojo + build-helper-maven-plugin + 1.3 + + + + maven-compiler-plugin - 2.0.2 1.5 1.5 @@ -160,6 +236,20 @@ + + maven-clean-plugin + + + + ${basedir} + + META-INF/MANIFEST.MF + + + + + + org.apache.maven.plugins maven-javadoc-plugin @@ -179,73 +269,27 @@ - - - org.sonatype.tycho - tycho-maven-plugin - ${tycho-version} - true - - - - org.sonatype.tycho - target-platform-configuration - ${tycho-version} - - p2 - - - - - - junit - junit - test - - - - com.jcraft jsch - 0.1.41 + ${jsch-version} - args4j args4j - 2.0.12 + ${args4j-version} - junit junit - 3.8.2 - - - - org.eclipse.jgit - org.eclipse.jgit - ${project.version} - - - - org.eclipse.jgit - org.eclipse.jgit.junit - ${project.version} - - - - org.eclipse.jgit - org.eclipse.jgit.ui - ${project.version} + ${junit-version} @@ -262,7 +306,7 @@ - java6 + jgit.java6 !jgit.java6.skip @@ -280,7 +324,5 @@ org.eclipse.jgit.pgm org.eclipse.jgit.junit org.eclipse.jgit.test - - org.eclipse.jgit-feature diff --git a/tools/version.sh b/tools/version.sh index eee41f00a..c3cf7ba25 100644 --- a/tools/version.sh +++ b/tools/version.sh @@ -41,7 +41,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# Update all pom.xml and MANIFEST.MF with new build number +# Update all pom.xml with new build number # # TODO(spearce) This should be converted to some sort of # Java based Maven plugin so its fully portable. @@ -77,22 +77,15 @@ esac case "$V" in *-SNAPSHOT) POM_V=$V - MF_V=$(echo "$V" | perl -pe 's/-SNAPSHOT$/.qualifier/') ;; *-[1-9]*-g[0-9a-f]*) POM_V=$(echo "$V" | perl -pe 's/-(\d+-g.*)$/.$1/') - MF_V=$POM_V ;; *) POM_V=$V - MF_V=$V ;; esac -perl -pi -e ' - s/^(Bundle-Version:).*/$1 '"$MF_V"'/ - ' $(git ls-files | grep META-INF/MANIFEST.MF) - perl -pi -e ' if ($ARGV ne $old_argv) { $seen_version = 0; @@ -100,7 +93,7 @@ perl -pi -e ' } if (!$seen_version) { $seen_version = 1 if - s{().*()}{${1}'"$POM_V"'${2}}; + s{<(version)>.*}{<${1}>'"$POM_V"'}; } ' $(git ls-files | grep pom.xml)