diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2013-06-13 15:51:16 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2013-06-13 15:51:44 +0200 |
| commit | 2cd3a2df560cba9bc781395fdc3f8ab86a8d3167 (patch) | |
| tree | 97a5fe336f46a6b1fefe8d7d738fbcdadd6e8ce7 /org.eclipse.jgit.packaging | |
| parent | 06ba0f6df15868e3d2e1cb0b5f928a68b2f188bb (diff) | |
| parent | 01f6d914764b9392934eb63cfbb2421347269e09 (diff) | |
| download | jgit-2cd3a2df560cba9bc781395fdc3f8ab86a8d3167.tar.gz jgit-2cd3a2df560cba9bc781395fdc3f8ab86a8d3167.zip | |
Merge branch 'stable-3.0'
* stable-3.0:
Prepare post 3.0.0.201306101825-r builds
JGit v3.0.0.201306101825-r
Make JGit test work with both hamcrest 1.1 (juno) and 1.3 (kepler)
Fix version.sh to not overwrite ${project.version}
Prepare post 3.0.0 RC3 builds
JGit v3.0.0.201306040240-rc3
Change-Id: I5b1db1f5b69bad1136dd21b956e798f63b1ba0ee
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit.packaging')
4 files changed, 11 insertions, 11 deletions
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml index abf2888abe..33a90a6528 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -63,12 +63,12 @@ <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.java7</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>${project.version}</version> </dependency> </dependencies> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.java7.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.java7.feature/pom.xml index e2d338f02b..df58462ee6 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.java7.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.java7.feature/pom.xml @@ -63,13 +63,13 @@ <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.java7</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>${project.version}</version> </dependency> </dependencies> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml index 617064eda0..652bc1fd55 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml @@ -63,17 +63,17 @@ <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.junit</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.junit.http</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.http.server</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>${project.version}</version> </dependency> </dependencies> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml index 4148a5ac40..1c16bf0544 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml @@ -64,25 +64,25 @@ <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.java7</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.pgm</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.ui</artifactId> - <version>3.0.0-SNAPSHOT</version> + <version>${project.version}</version> </dependency> </dependencies> |