diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2009-12-28 12:01:19 -0800 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2009-12-28 15:59:14 -0800 |
| commit | fc5fc70e2e8cc8e3ef493e130c3227ef83400f80 (patch) | |
| tree | b99fb9230f88a5dcda9e3461a6ec52ac9f970622 | |
| parent | eb63bfc1b82ce21516b211df45069cbea87b7eee (diff) | |
| download | jgit-fc5fc70e2e8cc8e3ef493e130c3227ef83400f80.tar.gz jgit-fc5fc70e2e8cc8e3ef493e130c3227ef83400f80.zip | |
Switch build to Apache Felix maven-bundle-plugin
Tycho isn't production ready for projects like JGit to be using as
their primary build driver. Some problems we ran into with Tycho
0.6.0 that are preventing us from using it are:
* Tycho can't run offline
The P2 artifact resolver cannot perform its work offline. If the
build system has no network connection, it cannot compile a
project through Tycho. This is insane for a distributed version
control system where developers are used to being offline during
development and local testing.
* Magic state in ~/.m2/repository/.meta/p2-metadata.properties
Earlier iterations of this patch tried to use a hybrid build,
where Tycho was only used for the Eclipse specific feature and P2
update site, and maven-bundle-plugin was used for the other code.
This build seemed to work, but only due to magic Tycho specific
state held in my local home directory. This means builds are not
consistently repeatable across systems, and lead me to believe
I had a valid build, when in fact I did not.
* Manifest-first build produces incomplete POMs
The POM created by the manifest-first build format does not
contain the dependency chain, leading a downstream consumer to
not import the runtime dependencies necessary to execute the
bundle it has imported. In JGit's case, this means JSch isn't
included in our dependency chain.
* Manifest-first build produces POMs unreadable by Maven 2.x
JGit has existing application consumers who are relying on
Maven 2.x builds. Forcing them to step up to an alpha release
of Maven 3 is simply unacceptable.
* OSGi bundle export data management is tedious
Editing each of our pom.xml files to mark a new release is
difficult enough as it is. Editing every MANIFEST.MF file to
list our exported packages and their current version number is
something a machine should do, not a human. Yet the Tycho OSGi
way unfortunately demands that a human do this work.
* OSGi bundle import data management is tedious
There isn't a way in the MANIFEST.MF file format to reuse the
same version tags across all of our imports, but we want to have
a consistent view of our dependencies when we compile JGit.
After wasting more than 2 full days trying to get Tycho to work,
I've decided its a lost cause right now. We need to be chasing down
bugs and critical features, not trying to bridge the gap between
the stable Maven repository format and the undocumented P2 format
used only by Eclipse.
So, switch the build to use Apache Felix's maven-bundle-plugin.
This is the same plugin Jetty uses to produce their OSGi bundle
manifests, and is the same plugin used by the Apache Felix project,
which is an open-source OSGi runtime. It has a reasonable number
of folks using it for production builds, and is running on top of
the stable Maven 2.x code base.
With this switch we get automatically generated MANIFEST.MF files
based on reasonably sane default rules, which reduces the amount
of things we have to maintain by hand. When necessary, we can add
a few lines of XML to our POMs to tweak the output.
Our build artifacts are still fully compatible with Maven 2.x, so
any downstream consumers are still able to use our build products,
without stepping up to Maven 3.x. Our artifacts are also valid as
OSGi bundles, provided they are organized on disk into a repository
that the runtime can read.
With maven-bundle-plugin the build runs offline, as much as Maven
2.x is able to run offline anyway, so we're able to return to a
distributed development environment again.
By generating MANIFEST.MF at the top level of each project (and
therefore outside of the target directory), we're still compatible
with Eclipse's PDE tooling. Our projects can be imported as standard
Maven projects using the m2eclipse plugin, but the PDE will think
they are vaild plugins and make them available for plugin builds,
or while debugging another workbench.
This change also completely removes Tycho from the build.
Unfortunately, Tycho 0.6.0's pom-first dependency resolver is broken
when resolving a pom-first plugin bundle through a manifest-first
feature package, so bundle org.eclipse.jgit can't be resolved,
even though it might actually exist in the local Maven repository.
Rather than fight with Tycho any further, I'm just declaring it
plugina-non-grata and ripping it out of the build.
Since there are very few tools to build a P2 format repository, and
no documentation on how to create one without running the Eclipse
UI manually by poking buttons, I'm declaring that we are not going
to produce a P2 update site from our automated builds.
Change-Id: If7938a86fb0cc8e25099028d832dbd38110b9124
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
55 files changed, 309 insertions, 717 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000..3af100d8ca --- /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 f78e24546f..0000000000 --- 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 80b09533cc..0000000000 --- a/org.eclipse.jgit-feature/.project +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.jgit-feature</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.pde.FeatureBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.pde.FeatureNature</nature> - </natures> -</projectDescription> diff --git a/org.eclipse.jgit-feature/build.properties b/org.eclipse.jgit-feature/build.properties deleted file mode 100644 index b3a611b5c9..0000000000 --- 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 eba9a59e30..0000000000 --- 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 9facbe0d90..0000000000 --- a/org.eclipse.jgit-feature/feature.xml +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<feature - id="org.eclipse.jgit" - label="%featureName" - version="0.6.0.qualifier" - provider-name="%providerName"> - - <description url="http://www.eclipse.org/egit/"> - %description - </description> - - <copyright> - %copyright - </copyright> - - <license url="%licenseURL"> - %license - </license> - - <url> - <update label="%updateSiteName" url="http://www.jgit.org/updates"/> - <discovery label="%updateSiteName" url="http://www.jgit.org/updates"/> - </url> - - <requires> - <import plugin="com.jcraft.jsch"/> - </requires> - - <plugin - id="org.eclipse.jgit" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> -</feature> diff --git a/org.eclipse.jgit-feature/pom.xml b/org.eclipse.jgit-feature/pom.xml deleted file mode 100644 index 00c076a1ea..0000000000 --- a/org.eclipse.jgit-feature/pom.xml +++ /dev/null @@ -1,61 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright (C) 2009, Google Inc. - Copyright (C) 2009, Igor Fedorenko <igor@ifedorenko.com> - Copyright (C) 2008, Imran M Yousuf <imyousuf@smartitengineering.com> - and other copyright owners as documented in the project's IP log. - - This program and the accompanying materials are made available - under the terms of the Eclipse Distribution License v1.0 which - accompanies this distribution, is reproduced below, and is - available at http://www.eclipse.org/org/documents/edl-v10.php - - All rights reserved. - - Redistribution and use in source and binary forms, with or - without modification, are permitted provided that the following - conditions are met: - - - Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - - Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following - disclaimer in the documentation and/or other materials provided - with the distribution. - - - Neither the name of the Eclipse Foundation, Inc. nor the - names of its contributors may be used to endorse or promote - products derived from this software without specific prior - written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND - CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, - INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ---> - -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.eclipse.jgit</groupId> - <artifactId>jgit-parent</artifactId> - <version>0.6.0-SNAPSHOT</version> - </parent> - - <artifactId>org.eclipse.jgit-feature</artifactId> - <packaging>eclipse-feature</packaging> - -</project> diff --git a/org.eclipse.jgit.console/.classpath b/org.eclipse.jgit.console/.classpath deleted file mode 100644 index ad32c83a78..0000000000 --- a/org.eclipse.jgit.console/.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/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/.gitignore b/org.eclipse.jgit.console/.gitignore index 934e0e06ff..7bfe4ab211 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 4f272a7ccc..0000000000 --- a/org.eclipse.jgit.console/.project +++ /dev/null @@ -1,34 +0,0 @@ -<?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 deleted file mode 100644 index ed12693f0c..0000000000 --- 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 aa1a008269..0000000000 --- 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 a86bcd86b8..bce4263a49 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 98b1511ec1..94fe3afef0 100644 --- a/org.eclipse.jgit.console/pom.xml +++ b/org.eclipse.jgit.console/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,17 +83,29 @@ <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> <configuration> - <source>1.6</source> - <target>1.6</target> - <encoding>UTF-8</encoding> + <instructions> + <Bundle-RequiredExecutionEnvironment>J2SE-1.6</Bundle-RequiredExecutionEnvironment> + <Import-Package> + 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> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> <configuration> <archive> @@ -100,6 +113,15 @@ </archive> </configuration> </plugin> + + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.6</source> + <target>1.6</target> + <encoding>UTF-8</encoding> + </configuration> + </plugin> </plugins> </build> </project> 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> diff --git a/org.eclipse.jgit.pgm/.classpath b/org.eclipse.jgit.pgm/.classpath deleted file mode 100644 index 304e86186a..0000000000 --- a/org.eclipse.jgit.pgm/.classpath +++ /dev/null @@ -1,7 +0,0 @@ -<?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.pgm/.gitignore b/org.eclipse.jgit.pgm/.gitignore index 934e0e06ff..7351243d9d 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 6fc89ae5e6..0000000000 --- a/org.eclipse.jgit.pgm/.project +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.jgit.pgm</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.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF deleted file mode 100644 index fe59357ab8..0000000000 --- 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 aa1a008269..0000000000 --- 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 f8fbd725c1..0000000000 --- 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 e06dbc2d02..7b25efe19f 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -49,7 +49,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> - <artifactId>jgit-parent</artifactId> + <artifactId>org.eclipse.jgit-parent</artifactId> <version>0.6.0-SNAPSHOT</version> </parent> @@ -69,11 +69,13 @@ <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit</artifactId> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.ui</artifactId> + <version>${project.version}</version> </dependency> </dependencies> @@ -105,12 +107,10 @@ </resource> </resources> - <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> - <version>1.2</version> <executions> <execution> <phase>package</phase> @@ -126,7 +126,6 @@ <manifestEntries> <Main-Class>org.eclipse.jgit.pgm.Main</Main-Class> <Implementation-Title>JGit Command Line Interface</Implementation-Title> - <Implementation-Version>${project.version}</Implementation-Version> </manifestEntries> </transformer> </transformers> @@ -138,7 +137,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> - <version>1.3</version> <executions> <execution> <id>create_jgit</id> @@ -162,7 +160,6 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> - <version>1.3</version> <executions> <execution> <id>attach_jgit</id> diff --git a/org.eclipse.jgit.test/.classpath b/org.eclipse.jgit.test/.classpath deleted file mode 100644 index ea41285773..0000000000 --- a/org.eclipse.jgit.test/.classpath +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry excluding="**/*.idx|**/*.pack" kind="src" path="tst"/> - <classpathentry kind="src" path="tst-rsrc"/> - <classpathentry kind="src" path="exttst"/> - <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.test/.gitignore b/org.eclipse.jgit.test/.gitignore index b5bbb0ab81..ab3bd25ad8 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 84c971100e..0000000000 --- a/org.eclipse.jgit.test/.project +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.jgit.test</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.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF deleted file mode 100644 index 32d5efdfc4..0000000000 --- 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 afc4855d67..0000000000 --- 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 9a9ca124d3..6ef8132d05 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 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> <launchConfiguration type="org.eclipse.jdt.junit.launchconfig"> -<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/> -<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/> -<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> +<listEntry value="/org.eclipse.jgit.test"/> +</listAttribute> <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> <listEntry value="4"/> </listAttribute> -<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.jgit.test"/> -<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> +<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/> <listAttribute key="org.eclipse.debug.ui.favoriteGroups"> <listEntry value="org.eclipse.debug.ui.launchGroup.debug"/> <listEntry value="org.eclipse.debug.ui.launchGroup.run"/> </listAttribute> -<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> -<listEntry value="/org.eclipse.jgit.test"/> -</listAttribute> <stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value="=org.eclipse.jgit.test/exttst"/> -<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/> +<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/> +<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/> <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit3"/> +<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.maven.ide.eclipse.launchconfig.classpathProvider"/> +<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> +<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/> +<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.jgit.test"/> +<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.maven.ide.eclipse.launchconfig.sourcepathProvider"/> </launchConfiguration> 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 6735fb0a26..abdb965028 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 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> <launchConfiguration type="org.eclipse.jdt.junit.launchconfig"> -<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/> -<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/> -<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> +<listEntry value="/org.eclipse.jgit.test"/> +</listAttribute> <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> <listEntry value="4"/> </listAttribute> -<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.jgit.test"/> +<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/> <listAttribute key="org.eclipse.debug.ui.favoriteGroups"> <listEntry value="org.eclipse.debug.ui.launchGroup.debug"/> <listEntry value="org.eclipse.debug.ui.launchGroup.run"/> </listAttribute> -<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> -<listEntry value="/org.eclipse.jgit.test"/> -</listAttribute> <stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value="=org.eclipse.jgit.test/exttst"/> -<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/> +<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/> +<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/> <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit3"/> +<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.maven.ide.eclipse.launchconfig.classpathProvider"/> +<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/> +<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.jgit.test"/> +<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.maven.ide.eclipse.launchconfig.sourcepathProvider"/> </launchConfiguration> 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 a0aecf920c..075f47b8fe 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 @@ <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/> <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/> <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit3"/> +<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.maven.ide.eclipse.launchconfig.classpathProvider"/> <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.jgit.test"/> +<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.maven.ide.eclipse.launchconfig.sourcepathProvider"/> </launchConfiguration> 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 bff41ecf07..5735df0396 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 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> <launchConfiguration type="org.eclipse.jdt.junit.launchconfig"> -<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/> -<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/> -<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> +<listEntry value="/org.eclipse.jgit.test"/> +</listAttribute> <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> <listEntry value="4"/> </listAttribute> -<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.jgit.test"/> +<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/> <listAttribute key="org.eclipse.debug.ui.favoriteGroups"> <listEntry value="org.eclipse.debug.ui.launchGroup.debug"/> <listEntry value="org.eclipse.debug.ui.launchGroup.run"/> </listAttribute> -<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> -<listEntry value="/org.eclipse.jgit.test"/> -</listAttribute> <stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value="=org.eclipse.jgit.test/tst"/> -<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/> +<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/> +<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/> <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit3"/> +<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.maven.ide.eclipse.launchconfig.classpathProvider"/> +<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/> +<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.jgit.test"/> +<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.maven.ide.eclipse.launchconfig.sourcepathProvider"/> </launchConfiguration> diff --git a/org.eclipse.jgit.test/plugin.properties b/org.eclipse.jgit.test/plugin.properties deleted file mode 100644 index 68e67f8107..0000000000 --- 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 6938ea60a0..d65b8249cf 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -51,7 +51,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> - <artifactId>jgit-parent</artifactId> + <artifactId>org.eclipse.jgit-parent</artifactId> <version>0.6.0-SNAPSHOT</version> </parent> @@ -64,13 +64,21 @@ <dependencies> <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + + <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit</artifactId> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.junit</artifactId> + <version>${project.version}</version> </dependency> </dependencies> 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> diff --git a/org.eclipse.jgit/.classpath b/org.eclipse.jgit/.classpath deleted file mode 100644 index 304e86186a..0000000000 --- a/org.eclipse.jgit/.classpath +++ /dev/null @@ -1,7 +0,0 @@ -<?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/.gitignore b/org.eclipse.jgit/.gitignore index 934e0e06ff..7bfe4ab211 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 19aeef1fb8..0000000000 --- a/org.eclipse.jgit/.project +++ /dev/null @@ -1,28 +0,0 @@ -<?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 deleted file mode 100644 index 5c7f111fb9..0000000000 --- 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 aa1a008269..0000000000 --- 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 d8e4703b67..c11ccea45c 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 ce3256a512..b3d1ee6a3d 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -51,11 +51,10 @@ <parent> <groupId>org.eclipse.jgit</groupId> - <artifactId>jgit-parent</artifactId> + <artifactId>org.eclipse.jgit-parent</artifactId> <version>0.6.0-SNAPSHOT</version> </parent> - <packaging>eclipse-plugin</packaging> <artifactId>org.eclipse.jgit</artifactId> <name>JGit - Core</name> @@ -81,6 +80,40 @@ </includes> </resource> </resources> - </build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <configuration> + <instructions> + <Import-Package> + !org.xml.sax.*, + !javax.crypto.*, + 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> + <manifestFile>META-INF/MANIFEST.MF</manifestFile> + </archive> + </configuration> + </plugin> + </plugins> + </build> </project> @@ -48,12 +48,12 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.eclipse.jgit</groupId> - <artifactId>jgit-parent</artifactId> + <artifactId>org.eclipse.jgit-parent</artifactId> <packaging>pom</packaging> <version>0.6.0-SNAPSHOT</version> <name>JGit - Parent</name> - <url>http://www.eclipse.org/egit/</url> + <url>${jgit-url}</url> <description> Pure Java implementation of Git @@ -61,11 +61,11 @@ <mailingLists> <mailingList> - <name>egit-dev Mailing List</name> - <post>egit-dev@eclipse.org</post> - <subscribe>https://dev.eclipse.org/mailman/listinfo/egit-dev</subscribe> - <unsubscribe>https://dev.eclipse.org/mailman/listinfo/egit-dev</unsubscribe> - <archive>http://dev.eclipse.org/mhonarc/lists/egit-dev</archive> + <name>jgit-dev Mailing List</name> + <post>jgit-dev@eclipse.org</post> + <subscribe>https://dev.eclipse.org/mailman/listinfo/jgit-dev</subscribe> + <unsubscribe>https://dev.eclipse.org/mailman/listinfo/jgit-dev</unsubscribe> + <archive>http://dev.eclipse.org/mhonarc/lists/jgit-dev</archive> </mailingList> <mailingList> @@ -76,7 +76,7 @@ </mailingLists> <issueManagement> - <url>https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced;component=JGit;product=EGit;classification=Technology</url> + <url>https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced;component=JGit;product=JGit;classification=Technology</url> <system>Bugzilla</system> </issueManagement> @@ -121,25 +121,101 @@ </licenses> <properties> + <jgit-url>http://www.eclipse.org/jgit/</jgit-url> + <jgit-copyright>Copyright (c) 2005, 2009 Shawn Pearce, Robin Rosenberg, et.al.</jgit-copyright> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <tycho-version>0.6.0</tycho-version> - </properties> + <jsch-CQ>CQ 3493</jsch-CQ> + <jsch-version>0.1.41</jsch-version> - <repositories> - <repository> - <id>galileo</id> - <layout>p2</layout> - <url>http://download.eclipse.org/releases/galileo</url> - </repository> - </repositories> + <junit-CQ>CQ 3589</junit-CQ> + <junit-version>3.8.2</junit-version> + + <args4j-CQ>CQ 3454</args4j-CQ> + <args4j-version>2.0.12</args4j-version> + </properties> <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.0.1</version> + <configuration> + <manifestLocation>META-INF</manifestLocation> + <instructions> + <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment> + <Bundle-DocURL>${jgit-url}</Bundle-DocURL> + <Bundle-Vendor>%provider_name</Bundle-Vendor> + <Bundle-Name>%plugin_name</Bundle-Name> + <Bundle-Description>%plugin_description</Bundle-Description> + <Bundle-Localization>plugin</Bundle-Localization> + <Bundle-Copyright>${jgit-copyright}</Bundle-Copyright> + <Bundle-License>http://www.eclipse.org/org/documents/edl-v10.php</Bundle-License> + <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> + <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy> + </instructions> + </configuration> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifestEntries> + <Implementation-Title>JGit ${project.artifactId}</Implementation-Title> + <Implementation-Version>${project.version}</Implementation-Version> + <Implementation-Vendor>Eclipse.org - JGit</Implementation-Vendor> + <Implementation-Vendor-Id>org.eclipse.jgit</Implementation-Vendor-Id> + <Implementation-Vendor-URL>${jgit-url}</Implementation-Vendor-URL> + </manifestEntries> + </archive> + </configuration> + </plugin> + + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.0.2</version> + </plugin> + + <plugin> + <artifactId>maven-clean-plugin</artifactId> + <version>2.2</version> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <version>1.2</version> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.3</version> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.1</version> + </plugin> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <version>1.3</version> + </plugin> + </plugins> + </pluginManagement> + <plugins> <plugin> <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> <configuration> <source>1.5</source> <target>1.5</target> @@ -161,6 +237,20 @@ </plugin> <plugin> + <artifactId>maven-clean-plugin</artifactId> + <configuration> + <filesets> + <fileset> + <directory>${basedir}</directory> + <includes> + <include>META-INF/MANIFEST.MF</include> + </includes> + </fileset> + </filesets> + </configuration> + </plugin> + + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> <configuration> @@ -179,73 +269,27 @@ </execution> </executions> </plugin> - - <plugin> - <groupId>org.sonatype.tycho</groupId> - <artifactId>tycho-maven-plugin</artifactId> - <version>${tycho-version}</version> - <extensions>true</extensions> - </plugin> - - <plugin> - <groupId>org.sonatype.tycho</groupId> - <artifactId>target-platform-configuration</artifactId> - <version>${tycho-version}</version> - <configuration> - <resolver>p2</resolver> - </configuration> - </plugin> - </plugins> </build> - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - <dependencyManagement> <dependencies> <dependency> - <!-- CQ 3493 --> <groupId>com.jcraft</groupId> <artifactId>jsch</artifactId> - <version>0.1.41</version> + <version>${jsch-version}</version> </dependency> <dependency> - <!-- CQ 3454 --> <groupId>args4j</groupId> <artifactId>args4j</artifactId> - <version>2.0.12</version> + <version>${args4j-version}</version> </dependency> <dependency> - <!-- CQ 3589 --> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>3.8.2</version> - </dependency> - - <dependency> - <groupId>org.eclipse.jgit</groupId> - <artifactId>org.eclipse.jgit</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.eclipse.jgit</groupId> - <artifactId>org.eclipse.jgit.junit</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.eclipse.jgit</groupId> - <artifactId>org.eclipse.jgit.ui</artifactId> - <version>${project.version}</version> + <version>${junit-version}</version> </dependency> </dependencies> </dependencyManagement> @@ -262,7 +306,7 @@ <profiles> <!-- Set -Djgit.java6.skip=true to compile with only Java 5 --> <profile> - <id>java6</id> + <id>jgit.java6</id> <activation> <property> <name>!jgit.java6.skip</name> @@ -280,7 +324,5 @@ <module>org.eclipse.jgit.pgm</module> <module>org.eclipse.jgit.junit</module> <module>org.eclipse.jgit.test</module> - - <module>org.eclipse.jgit-feature</module> </modules> </project> diff --git a/tools/version.sh b/tools/version.sh index eee41f00a1..c3cf7ba25b 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,30 +77,23 @@ 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; $old_argv = $ARGV; } if (!$seen_version) { $seen_version = 1 if - s{(<version>).*(</version>)}{${1}'"$POM_V"'${2}}; + s{<(version)>.*</\1>}{<${1}>'"$POM_V"'</${1}>}; } ' $(git ls-files | grep pom.xml) |