From 5c5ea4ad7612732a8fd5f9a51d0859a9d01fca7e47e92f3a9a0a702be18e5087 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 10 Feb 2021 06:03:01 +0000 Subject: [PATCH 1/6] OBS-URL: https://build.opensuse.org/package/show/Java:packages/gradle-bootstrap?expand=0&rev=20 --- gradle-bootstrap.spec | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gradle-bootstrap.spec b/gradle-bootstrap.spec index 9fce881..4457f8d 100644 --- a/gradle-bootstrap.spec +++ b/gradle-bootstrap.spec @@ -1,7 +1,7 @@ # # spec file for package gradle-bootstrap # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -243,7 +243,6 @@ Bootstrap version of the groovy-all.jar needed by xmvn-connector-gradle This package is useful only for bootstrapping a repository that does not have yet gradle, groovy and gpars built. - %package -n gpars-bootstrap Version: %{gpars_version} Release: 0 @@ -315,8 +314,8 @@ install -p -m 755 gradle.sh %{buildroot}%{_bindir}/%{short_name} install -d -m 755 %{buildroot}%{_mandir}/man1/ install -p -m 644 man/%{short_name}.1 %{buildroot}%{_mandir}/man1/%{short_name}.1 -xmvn-subst $(find %{buildroot}%{_datadir}/%{short_name} -type f -name \*.jar) -xmvn-subst -R %{buildroot} $(find %{buildroot}%{_datadir}/%{short_name} -type f -name \*.jar) +#xmvn-subst $(find %{buildroot}%{_datadir}/%{short_name} -type f -name \*.jar) +#xmvn-subst -R %{buildroot} $(find %{buildroot}%{_datadir}/%{short_name} -type f -name \*.jar) %files -f .mfiles %{_bindir}/%{short_name} From b491de6247cf4f61f95b8ccd0f753a96c81c26ab7ba24eaf57fa17e750864285 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 10 Feb 2021 08:10:00 +0000 Subject: [PATCH 2/6] OBS-URL: https://build.opensuse.org/package/show/Java:packages/gradle-bootstrap?expand=0&rev=21 --- gradle-4.4.1-built.tar.xz | 4 ++-- gradle-bootstrap.spec | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle-4.4.1-built.tar.xz b/gradle-4.4.1-built.tar.xz index 7945c9e..a4d1c05 100644 --- a/gradle-4.4.1-built.tar.xz +++ b/gradle-4.4.1-built.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:833c36445c2ad592db1beafcec7035269b130761fe0d85b506455877b9db7b39 -size 50356672 +oid sha256:1195f152dc0f2dde7f3ba8ff0ed59589711fe958cde70d07325dd543ee25de63 +size 50645236 diff --git a/gradle-bootstrap.spec b/gradle-bootstrap.spec index 4457f8d..e156cab 100644 --- a/gradle-bootstrap.spec +++ b/gradle-bootstrap.spec @@ -314,8 +314,8 @@ install -p -m 755 gradle.sh %{buildroot}%{_bindir}/%{short_name} install -d -m 755 %{buildroot}%{_mandir}/man1/ install -p -m 644 man/%{short_name}.1 %{buildroot}%{_mandir}/man1/%{short_name}.1 -#xmvn-subst $(find %{buildroot}%{_datadir}/%{short_name} -type f -name \*.jar) -#xmvn-subst -R %{buildroot} $(find %{buildroot}%{_datadir}/%{short_name} -type f -name \*.jar) +xmvn-subst $(find %{buildroot}%{_datadir}/%{short_name} -type f -name \*.jar) +xmvn-subst -R %{buildroot} $(find %{buildroot}%{_datadir}/%{short_name} -type f -name \*.jar) %files -f .mfiles %{_bindir}/%{short_name} From 59575e5bf9308d769128eef3183b01a908b62dfa19b9228359c5c8e4e72f94be Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 10 Feb 2021 08:57:07 +0000 Subject: [PATCH 3/6] OBS-URL: https://build.opensuse.org/package/show/Java:packages/gradle-bootstrap?expand=0&rev=22 --- gradle-4.4.1-built.tar.xz | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle-4.4.1-built.tar.xz b/gradle-4.4.1-built.tar.xz index a4d1c05..7945c9e 100644 --- a/gradle-4.4.1-built.tar.xz +++ b/gradle-4.4.1-built.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1195f152dc0f2dde7f3ba8ff0ed59589711fe958cde70d07325dd543ee25de63 -size 50645236 +oid sha256:833c36445c2ad592db1beafcec7035269b130761fe0d85b506455877b9db7b39 +size 50356672 From fa9d36c9872f701b9213eb118510b3d843e144e05ba6718af2b18cb2b0ecb72a Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 12 May 2021 07:26:38 +0000 Subject: [PATCH 4/6] OBS-URL: https://build.opensuse.org/package/show/Java:packages/gradle-bootstrap?expand=0&rev=23 --- gpars.jar | 2 +- gradle-4.4.1-built.tar.xz | 4 ++-- gradle-bootstrap.changes | 5 +++++ gradle-bootstrap.spec | 4 ++-- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/gpars.jar b/gpars.jar index 3b11970..4dc276e 100644 --- a/gpars.jar +++ b/gpars.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2596ada4af955e3c67c1cf3118afea826ddd1570a0e6cf98a7ac8699953deb3f +oid sha256:36fb5ab16df5dfe1c673de236c8bdac616bc6aa73dd4f657d09925daf3dad9dc size 634129 diff --git a/gradle-4.4.1-built.tar.xz b/gradle-4.4.1-built.tar.xz index 7945c9e..36ac904 100644 --- a/gradle-4.4.1-built.tar.xz +++ b/gradle-4.4.1-built.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:833c36445c2ad592db1beafcec7035269b130761fe0d85b506455877b9db7b39 -size 50356672 +oid sha256:e3128c8e96b1c5ba869ebc645d48bd40ab36d97e49807216d3db6bd8791e3eaa +size 51327440 diff --git a/gradle-bootstrap.changes b/gradle-bootstrap.changes index 966a5ba..f1cff47 100644 --- a/gradle-bootstrap.changes +++ b/gradle-bootstrap.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed May 12 07:23:31 UTC 2021 - Fridrich Strba + +- Regenerate to account for guava upgrade to 30.1.1 + ------------------------------------------------------------------- Mon Dec 7 22:01:43 UTC 2020 - Fridrich Strba diff --git a/gradle-bootstrap.spec b/gradle-bootstrap.spec index e156cab..993d9eb 100644 --- a/gradle-bootstrap.spec +++ b/gradle-bootstrap.spec @@ -63,7 +63,7 @@ BuildRequires: ecj BuildRequires: glassfish-servlet-api BuildRequires: google-gson BuildRequires: google-guice -BuildRequires: guava20 +#BuildRequires: guava BuildRequires: hawtjni-runtime BuildRequires: httpcomponents-client BuildRequires: httpcomponents-core @@ -152,7 +152,7 @@ Requires: ecj Requires: glassfish-servlet-api Requires: google-gson Requires: google-guice -Requires: guava20 +#Requires: guava Requires: hawtjni-runtime Requires: httpcomponents-client Requires: httpcomponents-core From 5d6865c8aac3eaa44cc0ff56f2b09cda3619ed3624eddbf0a22cd6165ebe7aaa Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 12 May 2021 07:29:18 +0000 Subject: [PATCH 5/6] OBS-URL: https://build.opensuse.org/package/show/Java:packages/gradle-bootstrap?expand=0&rev=24 --- gradle-bootstrap.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle-bootstrap.spec b/gradle-bootstrap.spec index 993d9eb..7111a88 100644 --- a/gradle-bootstrap.spec +++ b/gradle-bootstrap.spec @@ -63,7 +63,7 @@ BuildRequires: ecj BuildRequires: glassfish-servlet-api BuildRequires: google-gson BuildRequires: google-guice -#BuildRequires: guava +BuildRequires: guava BuildRequires: hawtjni-runtime BuildRequires: httpcomponents-client BuildRequires: httpcomponents-core @@ -152,7 +152,7 @@ Requires: ecj Requires: glassfish-servlet-api Requires: google-gson Requires: google-guice -#Requires: guava +Requires: guava Requires: hawtjni-runtime Requires: httpcomponents-client Requires: httpcomponents-core From d3d28594384138a8f4c815a06dac05cb08a7383f07b671332f181756ebc670c0 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 12 May 2021 08:10:56 +0000 Subject: [PATCH 6/6] OBS-URL: https://build.opensuse.org/package/show/Java:packages/gradle-bootstrap?expand=0&rev=25 --- gpars.jar | 2 +- gradle-4.4.1-built.tar.xz | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gpars.jar b/gpars.jar index 4dc276e..8de45d1 100644 --- a/gpars.jar +++ b/gpars.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:36fb5ab16df5dfe1c673de236c8bdac616bc6aa73dd4f657d09925daf3dad9dc +oid sha256:9d78b876378f4da254167bf841c1d2a7943c61e96bca0d2be21dd9ed67114db4 size 634129 diff --git a/gradle-4.4.1-built.tar.xz b/gradle-4.4.1-built.tar.xz index 36ac904..eb98a19 100644 --- a/gradle-4.4.1-built.tar.xz +++ b/gradle-4.4.1-built.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e3128c8e96b1c5ba869ebc645d48bd40ab36d97e49807216d3db6bd8791e3eaa -size 51327440 +oid sha256:11ead058cdf2ebeeece5ad5baddd3953d2ba4777bd93b13cafeb6d2844440e2c +size 51330016