summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShawn O. Pearce <sop@google.com>2009-02-23 12:11:58 -0800
committerShawn O. Pearce <sop@google.com>2009-02-23 12:12:02 -0800
commitb48c19590acdb75922d74ccf5183b8cb0c05ff2f (patch)
tree6c0fe4a506ca2061b78d5cf69fd2bcf94a58de02
parentf3de4b1b7c19fe2d88fdd28e53fe937e52745ead (diff)
Peg the versions of JGit and MINA SSHD to something known
For our needs within Gerrit we can mostly stick to a known version of these two dependencies. JGit now has a more recent snapshot, but named with an exact version number off `git describe`, so we know rely on that so its clear from the JAR file name in our WAR exactly what version of code was used. For SSHD we tag the version with a suffix of "-r$SVNREVISION", but we also put the JARs into our own Gerrit Maven repository, as they aren't available from any other public Maven repository. This simplifies the new developer installation guide, as most users only need to use our own project and can get the rest off Maven repositories. Signed-off-by: Shawn O. Pearce <sop@google.com>
-rw-r--r--Documentation/dev-eclipse.txt16
-rw-r--r--Documentation/dev-readme.txt13
-rw-r--r--Documentation/install.txt8
-rw-r--r--pom.xml8
4 files changed, 4 insertions, 41 deletions
diff --git a/Documentation/dev-eclipse.txt b/Documentation/dev-eclipse.txt
index e66e4127a8..352fb04b2c 100644
--- a/Documentation/dev-eclipse.txt
+++ b/Documentation/dev-eclipse.txt
@@ -37,22 +37,6 @@ Install the Maven Integration plugins:
http://m2eclipse.codehaus.org/[m2eclipse]
-Pre-Build
----------
-
-Ensure jgit has been installed in your maven repository:
-
-====
- (cd ../jgit/jgit-maven/jgit/ && mvn install)
-====
-
-Ensure sshd has been installed in your maven repository:
-
-====
- (cd ../sshd/ && mvn install)
-====
-
-
Import Projects
---------------
diff --git a/Documentation/dev-readme.txt b/Documentation/dev-readme.txt
index 566f44d3e8..1816403278 100644
--- a/Documentation/dev-readme.txt
+++ b/Documentation/dev-readme.txt
@@ -88,19 +88,6 @@ see link:dev-eclipse.html[Eclipse Setup] for more details on how
to configure your workspace.
-Dependencies
-------------
-
-You need to ensure all dependencies have been installed into your
-local maven repository if Gerrit is relying on snapshots and not
-release versions of them.
-
-====
- (cd ../jgit/jgit-maven/jgit && mvn clean install)
- (cd ../sshd && mvn clean install)
-====
-
-
Building
--------
diff --git a/Documentation/install.txt b/Documentation/install.txt
index 1ebe8025a2..74398e2916 100644
--- a/Documentation/install.txt
+++ b/Documentation/install.txt
@@ -41,9 +41,6 @@ Maven from a source download obtained directly from Git:
cd gerrit2
repo init -u git://android.git.kernel.org/tools/manifest.git
- (cd jgit/jgit-maven/jgit && mvn install)
- (cd sshd && mvn install)
-
mvn clean package
cp target/gerrit-*.war ...YOUR.DEST.../gerrit.war
====
@@ -51,11 +48,6 @@ Maven from a source download obtained directly from Git:
The first build may take a while as dependencies are searched
for and downloaded from Maven distribution repositories.
-Unfortunately you need to install snapshots of both JGit and
-SSHD to your local Maven repository (typically under `~/.m2`).
-These core dependencies are still under active development and have
-not made final releases yet.
-
Apache Maven:
* http://maven.apache.org/download.html[Download]
diff --git a/pom.xml b/pom.xml
index 2b20c1654f..84e4745599 100644
--- a/pom.xml
+++ b/pom.xml
@@ -463,7 +463,7 @@ limitations under the License.
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-r742884</version>
<scope>compile</scope>
</dependency>
@@ -491,7 +491,7 @@ limitations under the License.
<dependency>
<groupId>org.spearce</groupId>
<artifactId>jgit</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.4.0-204-g0aae0d8</version>
<scope>compile</scope>
</dependency>
@@ -578,8 +578,8 @@ limitations under the License.
</repository>
<repository>
- <id>jgit-snapshot-repository</id>
- <url>http://egit.googlecode.com/svn/maven/snapshot-repository/</url>
+ <id>jgit-repository</id>
+ <url>http://egit.googlecode.com/svn/maven/</url>
</repository>
<repository>