From c31ca025325bbb08c367b4b7dd005841415b968c6cebe06bfd6d0972598355cd Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 14 Nov 2024 07:01:37 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/google-http-java-client?expand=0&rev=10 --- google-http-java-client.changes | 10 ++++++++++ google-http-java-client.spec | 11 ++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/google-http-java-client.changes b/google-http-java-client.changes index 4db24cf..2fbe8f5 100644 --- a/google-http-java-client.changes +++ b/google-http-java-client.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri Mar 8 08:30:56 UTC 2024 - Fridrich Strba + +- Fix build breakage on SLE-15-SP2 after javapackages-tools upgrade + +------------------------------------------------------------------- +Mon May 23 05:24:42 UTC 2022 - Fridrich Strba + +- Build with java source and target levels 8 + ------------------------------------------------------------------- Sun Nov 24 12:32:45 UTC 2019 - Fridrich Strba diff --git a/google-http-java-client.spec b/google-http-java-client.spec index 7bf79d0..0f60ece 100644 --- a/google-http-java-client.spec +++ b/google-http-java-client.spec @@ -1,7 +1,7 @@ # # spec file for package google-http-java-client # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,6 +26,7 @@ Group: Development/Libraries/Java URL: https://github.com/google/google-http-java-client/ Source0: https://github.com/google/google-http-java-client/archive/%{version}/%{name}-%{version}.tar.gz BuildRequires: fdupes +BuildRequires: java-devel >= 1.8 BuildRequires: maven-local BuildRequires: protobuf-devel BuildRequires: mvn(com.fasterxml.jackson.core:jackson-core) @@ -138,8 +139,7 @@ This package contains javadoc for %{name}. %pom_remove_plugin -r :maven-deploy-plugin %pom_remove_plugin :maven-release-plugin - -%pom_xpath_remove "pom:plugin[pom:artifactId = 'maven-javadoc-plugin']/pom:executions" +%pom_remove_plugin :maven-javadoc-plugin # kr.motd.maven:os-maven-plugin:1.4.0.Final %pom_xpath_remove -r "pom:build/pom:extensions" @@ -238,10 +238,11 @@ rm -r google-http-client/src/test/java/com/google/api/client/http/apache/ApacheH %build -%{mvn_build} -s -f \ +%{mvn_build} -s -f -- \ %if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0} - -- -Dmaven.compiler.release=6 + -Dmaven.compiler.release=8 \ %endif + -Dsource=8 %install %mvn_install