* 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>tags/v3.1.0.201309270735-rc1
@@ -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> | |||
@@ -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> |
@@ -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> | |||
@@ -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> | |||
@@ -44,7 +44,7 @@ | |||
package org.eclipse.jgit.api; | |||
import static org.hamcrest.MatcherAssert.assertThat; | |||
import static org.hamcrest.Matchers.is; | |||
import static org.hamcrest.CoreMatchers.is; | |||
import static org.junit.Assert.assertEquals; | |||
import static org.junit.Assert.assertFalse; | |||
import static org.junit.Assert.assertNotNull; |
@@ -43,8 +43,8 @@ | |||
package org.eclipse.jgit.api; | |||
import static org.hamcrest.MatcherAssert.assertThat; | |||
import static org.hamcrest.Matchers.equalTo; | |||
import static org.hamcrest.Matchers.not; | |||
import static org.hamcrest.CoreMatchers.equalTo; | |||
import static org.hamcrest.CoreMatchers.not; | |||
import static org.junit.Assert.assertEquals; | |||
import static org.junit.Assert.assertFalse; | |||
import static org.junit.Assert.assertNotNull; |
@@ -37,8 +37,7 @@ | |||
*/ | |||
package org.eclipse.jgit.lib; | |||
import static org.hamcrest.Matchers.startsWith; | |||
import static org.junit.Assert.assertThat; | |||
import static org.junit.Assert.assertTrue; | |||
import static org.junit.Assert.fail; | |||
import java.io.File; | |||
@@ -399,7 +398,7 @@ public class DirCacheCheckoutMaliciousPathTest extends RepositoryTestCase { | |||
} catch (InvalidPathException e) { | |||
if (good) | |||
throw e; | |||
assertThat(e.getMessage(), startsWith("Invalid path: ")); | |||
assertTrue(e.getMessage().startsWith("Invalid path: ")); | |||
} | |||
} | |||
@@ -43,8 +43,6 @@ | |||
package org.eclipse.jgit.util; | |||
import static org.hamcrest.MatcherAssert.assertThat; | |||
import static org.hamcrest.Matchers.endsWith; | |||
import static org.junit.Assert.assertEquals; | |||
import static org.junit.Assert.assertFalse; | |||
import static org.junit.Assert.assertTrue; | |||
@@ -332,7 +330,7 @@ public class FileUtilTest { | |||
FileUtils.delete(t, FileUtils.EMPTY_DIRECTORIES_ONLY | FileUtils.RECURSIVE); | |||
fail("expected failure to delete f"); | |||
} catch (IOException e) { | |||
assertThat(e.getMessage(), endsWith(f.getAbsolutePath())); | |||
assertTrue(e.getMessage().endsWith(f.getAbsolutePath())); | |||
} | |||
assertTrue(t.exists()); | |||
} |
@@ -133,7 +133,14 @@ perl -pi~ -e ' | |||
' org.eclipse.jgit.packaging/org.*.feature/feature.xml | |||
perl -pi~ -e ' | |||
s{<(version)>.*</\1>}{<${1}>'"$POM_V"'</${1}>}; | |||
if ($ARGV ne $old_argv) { | |||
$seen_version = 0; | |||
$old_argv = $ARGV; | |||
} | |||
if (!$seen_version) { | |||
$seen_version = 1 if | |||
s{<(version)>.*</\1>}{<${1}>'"$POM_V"'</${1}>}; | |||
} | |||
' org.eclipse.jgit.packaging/org.*.feature/pom.xml | |||
perl -pi~ -e ' | |||
@@ -152,8 +159,8 @@ perl -pi~ -e ' | |||
$seen_version = 0; | |||
$old_argv = $ARGV; | |||
} | |||
if ($seen_version < 2) { | |||
$seen_version++ if | |||
if (!$seen_version) { | |||
$seen_version = 1 if | |||
s{<(version)>.*</\1>}{<${1}>'"$POM_V"'</${1}>}; | |||
} | |||
' org.eclipse.jgit.packaging/pom.xml |