TODO: - update target platform as soon as hamcrest 2.2 and assertj 3.20.2 are available in Orbit - update DEPENDENCIES CQ: 23501 CQ: 23599 Change-Id: Ife871c0343b611be9203aed7f86577e85bbf5c95changes/88/182788/2
@@ -188,15 +188,9 @@ maven_jar( | |||
) | |||
maven_jar( | |||
name = "hamcrest-library", | |||
artifact = "org.hamcrest:hamcrest-library:1.3", | |||
sha1 = "4785a3c21320980282f9f33d0d1264a69040538f", | |||
) | |||
maven_jar( | |||
name = "hamcrest-core", | |||
artifact = "org.hamcrest:hamcrest-core:1.3", | |||
sha1 = "42a25dc3219429f0e5d060061f71acb49bf010a0", | |||
name = "hamcrest", | |||
artifact = "org.hamcrest:hamcrest:2.2", | |||
sha1 = "1820c0968dba3a11a1b30669bb1f01978a91dedc", | |||
) | |||
maven_jar( | |||
@@ -207,8 +201,8 @@ maven_jar( | |||
maven_jar( | |||
name = "assertj-core", | |||
artifact = "org.assertj:assertj-core:3.14.0", | |||
sha1 = "3b7b0fcac821f3d167764e9926573cd64f78f9e9", | |||
artifact = "org.assertj:assertj-core:3.20.2", | |||
sha1 = "66f1f0ebd6db2b24e4a731979171da16ba919cd5", | |||
) | |||
BYTE_BUDDY_VERSION = "1.9.0" |
@@ -205,8 +205,7 @@ java_library( | |||
exports = [ | |||
"@bytebuddy-agent//jar", | |||
"@bytebuddy//jar", | |||
"@hamcrest-core//jar", | |||
"@hamcrest-library//jar", | |||
"@hamcrest//jar", | |||
"@junit//jar", | |||
"@mockito//jar", | |||
"@objenesis//jar", |
@@ -13,5 +13,5 @@ Import-Package: org.apache.tools.ant, | |||
org.eclipse.jgit.junit;version="[5.13.0,5.14.0)", | |||
org.eclipse.jgit.lib;version="[5.13.0,5.14.0)", | |||
org.eclipse.jgit.util;version="[5.13.0,5.14.0)", | |||
org.hamcrest.core;version="[1.1.0,2.0.0)", | |||
org.hamcrest.core;version="[2.2.0,3.0.0)", | |||
org.junit;version="[4.13,5.0.0)" |
@@ -20,5 +20,5 @@ Import-Package: org.bouncycastle.jce.provider;version="[1.65.0,2.0.0)", | |||
org.junit.runners;version="[4.13,5.0.0)" | |||
Export-Package: org.eclipse.jgit.gpg.bc.internal;x-internal:=true, | |||
org.eclipse.jgit.gpg.bc.internal.keys;x-internal:=true | |||
Require-Bundle: org.hamcrest.core;bundle-version="[1.1.0,2.0.0)", | |||
org.hamcrest.library;bundle-version="[1.1.0,2.0.0)" | |||
Require-Bundle: org.hamcrest.core;bundle-version="[2.2.0,3.0.0)", | |||
org.hamcrest.library;bundle-version="[2.2.0,3.0.0)" |
@@ -48,10 +48,10 @@ Import-Package: javax.servlet;version="[2.5.0,3.2.0)", | |||
org.eclipse.jgit.transport.http.apache;version="[5.13.0,5.14.0)", | |||
org.eclipse.jgit.transport.resolver;version="[5.13.0,5.14.0)", | |||
org.eclipse.jgit.util;version="[5.13.0,5.14.0)", | |||
org.hamcrest;version="[1.1.0,2.0.0)", | |||
org.hamcrest.core;version="[1.1.0,2.0.0)", | |||
org.hamcrest;version="[2.2.0,3.0.0)", | |||
org.hamcrest.core;version="[2.2.0,3.0.0)", | |||
org.junit;version="[4.13,5.0.0)", | |||
org.junit.rules;version="[4.13,5.0.0)", | |||
org.junit.runner;version="[4.13,5.0.0)", | |||
org.junit.runners;version="[4.13,5.0.0)" | |||
Require-Bundle: org.hamcrest.library;bundle-version="[1.1.0,2.0.0)" | |||
Require-Bundle: org.hamcrest.library;bundle-version="[2.2.0,3.0.0)" |
@@ -52,9 +52,9 @@ | |||
<dependency> | |||
<groupId>org.hamcrest</groupId> | |||
<artifactId>hamcrest-library</artifactId> | |||
<artifactId>hamcrest</artifactId> | |||
<scope>test</scope> | |||
<version>[1.1.0,2.0.0)</version> | |||
<version>${hamcrest-version}</version> | |||
</dependency> | |||
<dependency> |
@@ -46,7 +46,7 @@ Import-Package: javax.servlet;version="[3.1.0,4.0.0)", | |||
org.eclipse.jgit.treewalk;version="[5.13.0,5.14.0)", | |||
org.eclipse.jgit.treewalk.filter;version="[5.13.0,5.14.0)", | |||
org.eclipse.jgit.util;version="[5.13.0,5.14.0)", | |||
org.hamcrest.core;version="[1.1.0,2.0.0)", | |||
org.hamcrest.core;version="[2.2.0,3.0.0)", | |||
org.junit;version="[4.13,5.0.0)", | |||
org.junit.rules;version="[4.13,5.0.0)", | |||
org.junit.runner;version="[4.13,5.0.0)", |
@@ -19,7 +19,7 @@ Import-Package: org.eclipse.jgit.api;version="[5.13.0,5.14.0)", | |||
org.eclipse.jgit.treewalk;version="[5.13.0,5.14.0)", | |||
org.eclipse.jgit.treewalk.filter;version="[5.13.0,5.14.0)", | |||
org.eclipse.jgit.util;version="[5.13.0,5.14.0)", | |||
org.hamcrest.core;version="[1.1.0,2.0.0)", | |||
org.hamcrest.core;version="[2.2.0,3.0.0)", | |||
org.junit;version="[4.13,5.0.0)", | |||
org.junit.runner;version="[4.13,5.0.0)", | |||
org.junit.runners;version="[4.13,5.0.0)" |
@@ -25,7 +25,7 @@ Import-Package: org.eclipse.jgit.api;version="[5.13.0,5.14.0)", | |||
org.eclipse.jgit.treewalk;version="[5.13.0,5.14.0)", | |||
org.eclipse.jgit.util;version="[5.13.0,5.14.0)", | |||
org.eclipse.jgit.util.io;version="[5.13.0,5.14.0)", | |||
org.hamcrest.core;bundle-version="[1.1.0,2.0.0)", | |||
org.hamcrest.core;bundle-version="[2.2.0,3.0.0)", | |||
org.junit;version="[4.13,5.0.0)", | |||
org.junit.rules;version="[4.13,5.0.0)", | |||
org.kohsuke.args4j;version="[2.33.0,3.0.0)" |
@@ -32,4 +32,4 @@ Import-Package: org.apache.sshd.client.config.hosts;version="[2.7.0,2.8.0)", | |||
org.junit;version="[4.13,5.0.0)", | |||
org.junit.experimental.theories;version="[4.13,5.0.0)", | |||
org.junit.runner;version="[4.13,5.0.0)" | |||
Require-Bundle: org.hamcrest.core;bundle-version="[1.3.0,2.0.0)" | |||
Require-Bundle: org.hamcrest.core;bundle-version="[2.2.0,3.0.0)" |
@@ -17,4 +17,4 @@ Import-Package: com.jcraft.jsch;version="[0.1.54,0.2.0)", | |||
org.junit;version="[4.13,5.0.0)", | |||
org.junit.experimental.theories;version="[4.13,5.0.0)", | |||
org.junit.runner;version="[4.13,5.0.0)" | |||
Require-Bundle: org.hamcrest.core;bundle-version="[1.3.0,2.0.0)" | |||
Require-Bundle: org.hamcrest.core;bundle-version="[2.2.0,3.0.0)" |
@@ -82,5 +82,5 @@ Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)", | |||
org.objenesis;version="[2.6.0,3.0.0)", | |||
org.slf4j;version="[1.7.0,2.0.0)", | |||
org.tukaani.xz;version="[1.6.0,2.0)" | |||
Require-Bundle: org.hamcrest.core;bundle-version="[1.1.0,2.0.0)", | |||
org.hamcrest.library;bundle-version="[1.1.0,2.0.0)" | |||
Require-Bundle: org.hamcrest.core;bundle-version="[2.2.0,3.0.0)", | |||
org.hamcrest.library;bundle-version="[2.2.0,3.0.0)" |
@@ -60,9 +60,9 @@ | |||
<dependency> | |||
<groupId>org.hamcrest</groupId> | |||
<artifactId>hamcrest-library</artifactId> | |||
<artifactId>hamcrest</artifactId> | |||
<scope>test</scope> | |||
<version>[1.1.0,2.0.0)</version> | |||
<version>${hamcrest-version}</version> | |||
</dependency> | |||
<dependency> |
@@ -16,7 +16,6 @@ import java.util.stream.Collectors; | |||
import org.eclipse.jgit.lib.ObjectId; | |||
import org.eclipse.jgit.lib.Sets; | |||
import org.hamcrest.Description; | |||
import org.hamcrest.Factory; | |||
import org.hamcrest.Matcher; | |||
import org.hamcrest.TypeSafeMatcher; | |||
@@ -59,7 +58,6 @@ class ObjectIdMatcher extends TypeSafeMatcher<Collection<ObjectId>> { | |||
* @return true if examined and specified sets contains exactly the same | |||
* elements. | |||
*/ | |||
@Factory | |||
static Matcher<Collection<ObjectId>> hasOnlyObjectIds( | |||
String... oids) { | |||
return new ObjectIdMatcher(Sets.of(oids)); |
@@ -179,6 +179,7 @@ | |||
<maven-surefire-report-plugin-version>${maven-surefire-plugin-version}</maven-surefire-report-plugin-version> | |||
<maven-compiler-plugin-version>3.8.1</maven-compiler-plugin-version> | |||
<plexus-compiler-version>2.8.8</plexus-compiler-version> | |||
<hamcrest-version>2.2</hamcrest-version> | |||
<!-- Properties to enable jacoco code coverage analysis --> | |||
<sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin> |