motiejus
/
jgit
1
Fork 0
Code Releases Activity

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>
This commit is contained in:
Matthias Sohn 2013-06-13 15:51:16 +02:00
parent 06ba0f6df1 01f6d91476
commit 2cd3a2df56
9 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml
View File

@ -63,12 +63,12 @@
<dependency> <dependency>
<groupId>org.eclipse.jgit</groupId> <groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit</artifactId> <artifactId>org.eclipse.jgit</artifactId>
<version>3.0.0-SNAPSHOT</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jgit</groupId> <groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.java7</artifactId> <artifactId>org.eclipse.jgit.java7</artifactId>
<version>3.0.0-SNAPSHOT</version> <version>${project.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>

4
org.eclipse.jgit.packaging/org.eclipse.jgit.java7.feature/pom.xml
View File

@ -63,13 +63,13 @@
<dependency> <dependency>
<groupId>org.eclipse.jgit</groupId> <groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit</artifactId> <artifactId>org.eclipse.jgit</artifactId>
<version>3.0.0-SNAPSHOT</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jgit</groupId> <groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.java7</artifactId> <artifactId>org.eclipse.jgit.java7</artifactId>
<version>3.0.0-SNAPSHOT</version> <version>${project.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>

6
org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml
View File

@ -63,17 +63,17 @@
<dependency> <dependency>
<groupId>org.eclipse.jgit</groupId> <groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.junit</artifactId> <artifactId>org.eclipse.jgit.junit</artifactId>
<version>3.0.0-SNAPSHOT</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jgit</groupId> <groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.junit.http</artifactId> <artifactId>org.eclipse.jgit.junit.http</artifactId>
<version>3.0.0-SNAPSHOT</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jgit</groupId> <groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.http.server</artifactId> <artifactId>org.eclipse.jgit.http.server</artifactId>
<version>3.0.0-SNAPSHOT</version> <version>${project.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>

8
org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml
View File

@ -64,25 +64,25 @@
<dependency> <dependency>
<groupId>org.eclipse.jgit</groupId> <groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit</artifactId> <artifactId>org.eclipse.jgit</artifactId>
<version>3.0.0-SNAPSHOT</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jgit</groupId> <groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.java7</artifactId> <artifactId>org.eclipse.jgit.java7</artifactId>
<version>3.0.0-SNAPSHOT</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jgit</groupId> <groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.pgm</artifactId> <artifactId>org.eclipse.jgit.pgm</artifactId>
<version>3.0.0-SNAPSHOT</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jgit</groupId> <groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.ui</artifactId> <artifactId>org.eclipse.jgit.ui</artifactId>
<version>3.0.0-SNAPSHOT</version> <version>${project.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>

2
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CheckoutCommandTest.java
View File

@ -44,7 +44,7 @@
package org.eclipse.jgit.api; package org.eclipse.jgit.api;
import static org.hamcrest.MatcherAssert.assertThat; 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.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;

4
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RebaseCommandTest.java
View File

@ -43,8 +43,8 @@
package org.eclipse.jgit.api; package org.eclipse.jgit.api;
import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.Matchers.not; import static org.hamcrest.CoreMatchers.not;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;

5
org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/DirCacheCheckoutMaliciousPathTest.java
View File

@ -37,8 +37,7 @@
*/ */
package org.eclipse.jgit.lib; package org.eclipse.jgit.lib;
import static org.hamcrest.Matchers.startsWith; import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;
import java.io.File; import java.io.File;
@ -399,7 +398,7 @@ private void testMaliciousPath(boolean good, boolean secondCheckout,
} catch (InvalidPathException e) { } catch (InvalidPathException e) {
if (good) if (good)
throw e; throw e;
assertThat(e.getMessage(), startsWith("Invalid path: ")); assertTrue(e.getMessage().startsWith("Invalid path: "));
} }
} }

4
org.eclipse.jgit.test/tst/org/eclipse/jgit/util/FileUtilTest.java
View File

@ -43,8 +43,6 @@
package org.eclipse.jgit.util; 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.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
@ -332,7 +330,7 @@ public void testDeleteNotEmptyTreeNotOk() throws IOException {
FileUtils.delete(t, FileUtils.EMPTY_DIRECTORIES_ONLY | FileUtils.RECURSIVE); FileUtils.delete(t, FileUtils.EMPTY_DIRECTORIES_ONLY | FileUtils.RECURSIVE);
fail("expected failure to delete f"); fail("expected failure to delete f");
} catch (IOException e) { } catch (IOException e) {
assertThat(e.getMessage(), endsWith(f.getAbsolutePath())); assertTrue(e.getMessage().endsWith(f.getAbsolutePath()));
} }
assertTrue(t.exists()); assertTrue(t.exists());
} }

13
tools/version.sh
View File

@ -133,7 +133,14 @@ perl -pi~ -e '
' org.eclipse.jgit.packaging/org.*.feature/feature.xml ' org.eclipse.jgit.packaging/org.*.feature/feature.xml
perl -pi~ -e ' 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 ' org.eclipse.jgit.packaging/org.*.feature/pom.xml
perl -pi~ -e ' perl -pi~ -e '
@ -152,8 +159,8 @@ perl -pi~ -e '
$seen_version = 0; $seen_version = 0;
$old_argv = $ARGV; $old_argv = $ARGV;
} }
if ($seen_version < 2) { if (!$seen_version) {
$seen_version++ if $seen_version = 1 if
s{<(version)>.*</\1>}{<${1}>'"$POM_V"'</${1}>}; s{<(version)>.*</\1>}{<${1}>'"$POM_V"'</${1}>};
} }
' org.eclipse.jgit.packaging/pom.xml ' org.eclipse.jgit.packaging/pom.xml