Fridrich Strba 2020-07-01 13:04:54 +00:00 committed by Git OBS Bridge
parent ea8d762b4a
commit 89eb232cdd

View File

@ -1,3 +1,17 @@
From 3bd2d3d0c8c886ceb1f8d8c14e03b512daf3c69a Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Mon, 22 Jun 2020 04:00:51 +0100
Subject: [PATCH 3/3] Remove requirement on assertj-core
---
org.eclipse.jgit.test/META-INF/MANIFEST.MF | 1 -
org.eclipse.jgit.test/pom.xml | 5 -
.../transport/RequestValidatorTestCase.java | 292 ------------------
3 files changed, 298 deletions(-)
delete mode 100644 org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/RequestValidatorTestCase.java
diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF
index 83c9dc1..b7f0a53 100644
--- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF
@@ -15,7 +15,6 @@ Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)",
@ -24,18 +38,9 @@ index 3b100fa..a5b19ce 100644
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
--- a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF 2020-06-09 16:07:50.000000000 +0200
+++ b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF 2020-06-29 15:28:22.108828742 +0200
@@ -8,8 +8,7 @@
Bundle-Localization: plugin
Bundle-Version: 5.8.0.202006091008-r
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: org.assertj.core.annotations;version="3.14.0",
- org.bouncycastle.bcpg;version="[1.65.0,2.0.0)",
+Import-Package: org.bouncycastle.bcpg;version="[1.65.0,2.0.0)",
org.bouncycastle.gpg;version="[1.65.0,2.0.0)",
org.bouncycastle.gpg.keybox;version="[1.65.0,2.0.0)",
org.bouncycastle.gpg.keybox.jcajce;version="[1.65.0,2.0.0)",
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/RequestValidatorTestCase.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/RequestValidatorTestCase.java
deleted file mode 100644
index cc910b3..0000000
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/RequestValidatorTestCase.java
+++ /dev/null
@@ -1,292 +0,0 @@
@ -331,3 +336,6 @@ index 3b100fa..a5b19ce 100644
- return repo;
- }
-}
--
2.26.2