From ce3079bc9f85a28e73ce825b64762b8434d7af4f99e10ab2050469916f6e68de Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 18 Apr 2024 12:17:43 +0000 Subject: [PATCH 1/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/eclipse-jgit?expand=0&rev=63 --- eclipse-jgit.spec | 11 +++++++++++ jgit.spec | 12 +++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/eclipse-jgit.spec b/eclipse-jgit.spec index a945ded..4162c13 100644 --- a/eclipse-jgit.spec +++ b/eclipse-jgit.spec @@ -122,6 +122,17 @@ done %pom_disable_module org.eclipse.jgit.benchmarks %pom_disable_module org.eclipse.jgit.coverage +# Don't build tests +%pom_disable_module org.eclipse.jgit.ant.test +%pom_disable_module org.eclipse.jgit.http.test +%pom_disable_module org.eclipse.jgit.lfs.test +%pom_disable_module org.eclipse.jgit.ssh.apache.test +%pom_disable_module org.eclipse.jgit.test +%pom_disable_module org.eclipse.jgit.gpg.bc.test +%pom_disable_module org.eclipse.jgit.lfs.server.test +%pom_disable_module org.eclipse.jgit.pgm.test +%pom_disable_module org.eclipse.jgit.ssh.jsch.test + # Use newer Felix dep %pom_change_dep -r org.osgi:org.osgi.core org.osgi:osgi.core diff --git a/jgit.spec b/jgit.spec index b749b33..e6bb579 100644 --- a/jgit.spec +++ b/jgit.spec @@ -64,7 +64,6 @@ BuildRequires: mvn(org.bouncycastle:bcpkix-jdk15on) BuildRequires: mvn(org.bouncycastle:bcprov-jdk15on) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) BuildRequires: mvn(org.eclipse.jetty:jetty-servlet) -BuildRequires: mvn(org.mockito:mockito-core) BuildRequires: mvn(org.osgi:osgi.core) BuildRequires: mvn(org.slf4j:slf4j-api) BuildRequires: mvn(org.slf4j:slf4j-simple) @@ -131,6 +130,17 @@ done %pom_disable_module org.eclipse.jgit.benchmarks %pom_disable_module org.eclipse.jgit.coverage +# Don't build tests +%pom_disable_module org.eclipse.jgit.ant.test +%pom_disable_module org.eclipse.jgit.http.test +%pom_disable_module org.eclipse.jgit.lfs.test +%pom_disable_module org.eclipse.jgit.ssh.apache.test +%pom_disable_module org.eclipse.jgit.test +%pom_disable_module org.eclipse.jgit.gpg.bc.test +%pom_disable_module org.eclipse.jgit.lfs.server.test +%pom_disable_module org.eclipse.jgit.pgm.test +%pom_disable_module org.eclipse.jgit.ssh.jsch.test + # Use newer Felix dep %pom_change_dep -r org.osgi:org.osgi.core org.osgi:osgi.core From 08c51087fa4367a58070901b1f92b3e579f3cbfc36cbc0a30c4377451eacf644 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 18 Apr 2024 12:25:32 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/eclipse-jgit?expand=0&rev=64 --- eclipse-jgit.changes | 5 +++++ jgit.changes | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/eclipse-jgit.changes b/eclipse-jgit.changes index e13a45b..e936912 100644 --- a/eclipse-jgit.changes +++ b/eclipse-jgit.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Apr 18 12:24:53 UTC 2024 - Fridrich Strba + +- Do not build tests and thus avoid dependency on mockito + ------------------------------------------------------------------- Wed Feb 21 21:55:25 UTC 2024 - Fridrich Strba diff --git a/jgit.changes b/jgit.changes index e13a45b..e936912 100644 --- a/jgit.changes +++ b/jgit.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Apr 18 12:24:53 UTC 2024 - Fridrich Strba + +- Do not build tests and thus avoid dependency on mockito + ------------------------------------------------------------------- Wed Feb 21 21:55:25 UTC 2024 - Fridrich Strba