From fb50b181794855c0bd1e512ffb99c941da7c1bfdca90553931195e89663b0af9 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sat, 20 Apr 2024 18:56:52 +0000 Subject: [PATCH] revert this one, since some things depend on the test artifacts OBS-URL: https://build.opensuse.org/package/show/Java:packages/eclipse-jgit?expand=0&rev=66 --- eclipse-jgit.changes | 5 ----- eclipse-jgit.spec | 11 ----------- jgit.changes | 5 ----- jgit.spec | 12 +----------- 4 files changed, 1 insertion(+), 32 deletions(-) diff --git a/eclipse-jgit.changes b/eclipse-jgit.changes index e936912..e13a45b 100644 --- a/eclipse-jgit.changes +++ b/eclipse-jgit.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -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/eclipse-jgit.spec b/eclipse-jgit.spec index 4162c13..a945ded 100644 --- a/eclipse-jgit.spec +++ b/eclipse-jgit.spec @@ -122,17 +122,6 @@ 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.changes b/jgit.changes index e936912..e13a45b 100644 --- a/jgit.changes +++ b/jgit.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -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.spec b/jgit.spec index e6bb579..b749b33 100644 --- a/jgit.spec +++ b/jgit.spec @@ -64,6 +64,7 @@ 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) @@ -130,17 +131,6 @@ 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