From b20cb70ed76378f33dc80e4b8e2042a5cd6bb8cb Mon Sep 17 00:00:00 2001 From: Kevin Lockwood Date: Mon, 10 Feb 2025 16:55:01 -0800 Subject: [PATCH] Remove guava20 from SPECS-EXTENDED --- LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md | 2 +- LICENSES-AND-NOTICES/SPECS/data/licenses.json | 1 - .../guava20/0001-Avoid-presizing-arrays.patch | 49 ---- .../guava20/guava20-java8compat.patch | 259 ------------------ .../guava20/guava20.signatures.json | 6 - SPECS-EXTENDED/guava20/guava20.spec | 182 ------------ SPECS-EXTENDED/guava20/osgi-manifest.txt | 27 -- cgmanifest.json | 10 - 8 files changed, 1 insertion(+), 535 deletions(-) delete mode 100644 SPECS-EXTENDED/guava20/0001-Avoid-presizing-arrays.patch delete mode 100644 SPECS-EXTENDED/guava20/guava20-java8compat.patch delete mode 100644 SPECS-EXTENDED/guava20/guava20.signatures.json delete mode 100644 SPECS-EXTENDED/guava20/guava20.spec delete mode 100644 SPECS-EXTENDED/guava20/osgi-manifest.txt diff --git a/LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md b/LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md index 83b5609b677..4a88639947b 100644 --- a/LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md +++ b/LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md @@ -16,7 +16,7 @@ The Azure Linux SPEC files originated from a variety of sources with varying lic | NVIDIA (BSD) | [BSD](https://github.com/Mellanox/sockperf/blob/sockperf_v2/copying) | sockperf | | OpenEuler | [BSD-3 License](https://github.com/pytorch/pytorch/blob/master/LICENSE) | pytorch | | OpenMamba | [Openmamba GPLv2 License](https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt) | bash-completion | -| OpenSUSE | Following [openSUSE guidelines](https://en.opensuse.org/openSUSE:Specfile_guidelines#Specfile_Licensing) | ant
ant-junit
antlr
aopalliance
apache-commons-beanutils
apache-commons-cli
apache-commons-codec
apache-commons-collections
apache-commons-collections4
apache-commons-compress
apache-commons-daemon
apache-commons-dbcp
apache-commons-digester
apache-commons-httpclient
apache-commons-io
apache-commons-jexl
apache-commons-lang
apache-commons-lang3
apache-commons-logging
apache-commons-net
apache-commons-pool
apache-commons-pool2
apache-commons-validator
apache-commons-vfs2
apache-parent
args4j
atinject
base64coder
bcel
bea-stax
beust-jcommander
bsf
byaccj
cal10n
cdparanoia
cglib
cni
containerized-data-importer
cpulimit
cri-o
ecj
fillup
flux
gd
geronimo-specs
glassfish-annotation-api
gnu-getopt
gnu-regexp
golang-packaging
guava
guava20
hamcrest
hawtjni-runtime
httpcomponents-core
influx-cli
influxdb
jakarta-taglibs-standard
jansi
jarjar
java-cup
java-cup-bootstrap
javacc
javacc-bootstrap
javassist
jboss-interceptors-1.2-api
jdepend
jflex
jflex-bootstrap
jlex
jline
jna
jsch
jsoup
jsr-305
jtidy
junit
junitperf
jzlib
kubevirt
kured
libcontainers-common
libtheora
libva
libvdpau
lynx
maven-parent
multus
objectweb-anttask
objectweb-asm
objenesis
oro
osgi-annotation
osgi-compendium
osgi-core
patterns-ceph-containers
plexus-classworlds
plexus-interpolation
plexus-pom
plexus-utils
proj
psl-make-dafsa
publicsuffix
qdox
regexp
relaxngDatatype
rhino
ripgrep
servletapi4
servletapi5
shapelib
slf4j
trilead-ssh2
virtiofsd
xalan-j2
xbean
xcursor-themes
xerces-j2
xml-commons-apis
xml-commons-resolver
xmldb-api
xmlrpc-c
xmlunit
xpp2
xpp3
xz-java | +| OpenSUSE | Following [openSUSE guidelines](https://en.opensuse.org/openSUSE:Specfile_guidelines#Specfile_Licensing) | ant
ant-junit
antlr
aopalliance
apache-commons-beanutils
apache-commons-cli
apache-commons-codec
apache-commons-collections
apache-commons-collections4
apache-commons-compress
apache-commons-daemon
apache-commons-dbcp
apache-commons-digester
apache-commons-httpclient
apache-commons-io
apache-commons-jexl
apache-commons-lang
apache-commons-lang3
apache-commons-logging
apache-commons-net
apache-commons-pool
apache-commons-pool2
apache-commons-validator
apache-commons-vfs2
apache-parent
args4j
atinject
base64coder
bcel
bea-stax
beust-jcommander
bsf
byaccj
cal10n
cdparanoia
cglib
cni
containerized-data-importer
cpulimit
cri-o
ecj
fillup
flux
gd
geronimo-specs
glassfish-annotation-api
gnu-getopt
gnu-regexp
golang-packaging
guava
hamcrest
hawtjni-runtime
httpcomponents-core
influx-cli
influxdb
jakarta-taglibs-standard
jansi
jarjar
java-cup
java-cup-bootstrap
javacc
javacc-bootstrap
javassist
jboss-interceptors-1.2-api
jdepend
jflex
jflex-bootstrap
jlex
jline
jna
jsch
jsoup
jsr-305
jtidy
junit
junitperf
jzlib
kubevirt
kured
libcontainers-common
libtheora
libva
libvdpau
lynx
maven-parent
multus
objectweb-anttask
objectweb-asm
objenesis
oro
osgi-annotation
osgi-compendium
osgi-core
patterns-ceph-containers
plexus-classworlds
plexus-interpolation
plexus-pom
plexus-utils
proj
psl-make-dafsa
publicsuffix
qdox
regexp
relaxngDatatype
rhino
ripgrep
servletapi4
servletapi5
shapelib
slf4j
trilead-ssh2
virtiofsd
xalan-j2
xbean
xcursor-themes
xerces-j2
xml-commons-apis
xml-commons-resolver
xmldb-api
xmlrpc-c
xmlunit
xpp2
xpp3
xz-java | | Photon | [Photon License](LICENSE-PHOTON.md) and [Photon Notice](NOTICE.APACHE2).
Also see [LICENSE-EXCEPTIONS.PHOTON](LICENSE-EXCEPTIONS.PHOTON). | acl
alsa-lib
alsa-utils
ansible
apr
apr-util
asciidoc
atftp
audit
autoconf
autoconf-archive
autofs
autogen
automake
babel
bash
bc
bcc
bind
binutils
bison
blktrace
boost
btrfs-progs
bubblewrap
build-essential
bzip2
c-ares
cairo
cassandra
cdrkit
check
chkconfig
chrpath
cifs-utils
clang
cloud-init
cloud-utils-growpart
cmake
cni-plugins
core-packages
coreutils
cpio
cppunit
cracklib
crash
crash-gcore-command
createrepo_c
cri-tools
cronie
curl
cyrus-sasl
cyrus-sasl-bootstrap
dbus
dbus-glib
dejagnu
device-mapper-multipath
dialog
diffutils
dkms
dmidecode
dnsmasq
docbook-dtd-xml
docbook-style-xsl
dosfstools
dracut
dstat
e2fsprogs
ed
efibootmgr
efivar
elfutils
emacs
erlang
etcd
ethtool
expat
expect
fcgi
file
filesystem
findutils
flex
fontconfig
fping
freetype
fuse
gawk
gc
gcc
gdb
gdbm
gettext
git
git-lfs
glib
glib-networking
glibc
glibmm
gmp
gnome-common
gnupg2
gnuplot
gnutls
gobject-introspection
golang
golang-1.22
gperf
gperftools
gpgme
gptfdisk
grep
groff
grub2
gtest
gtk-doc
guile
gzip
haproxy
harfbuzz
haveged
hdparm
http-parser
httpd
i2c-tools
iana-etc
icu
initramfs
initscripts
inotify-tools
intltool
iotop
iperf3
iproute
ipset
iptables
iputils
ipvsadm
ipxe
irqbalance
itstool
jansson
jq
json-c
json-glib
kbd
keepalived
kernel
kernel-64k
kernel-headers
kernel-mshv
kernel-rt
kernel-uvm
keyutils
kmod
krb5
less
libaio
libarchive
libassuan
libatomic_ops
libcap
libcap-ng
libconfig
libdb
libdnet
libedit
libestr
libevent
libfastjson
libffi
libgcrypt
libgpg-error
libgssglue
libgudev
libjpeg-turbo
libksba
liblogging
libmbim
libmnl
libmodulemd
libmpc
libmspack
libndp
libnetfilter_conntrack
libnetfilter_cthelper
libnetfilter_cttimeout
libnetfilter_queue
libnfnetlink
libnftnl
libnl3
libnsl2
libpcap
libpipeline
libpng
libpsl
libqmi
librelp
librepo
librsync
libseccomp
libselinux
libsepol
libserf
libsigc++30
libsolv
libsoup
libssh2
libtalloc
libtar
libtasn1
libtiff
libtirpc
libtool
libunistring
libunwind
libusb
libvirt
libwebp
libxml2
libxslt
libyaml
linux-firmware
lldb
lldpad
llvm
lm-sensors
lmdb
log4cpp
logrotate
lshw
lsof
lsscsi
ltrace
lttng-tools
lttng-ust
lvm2
lz4
lzo
m2crypto
m4
make
man-db
man-pages
mariadb
maven
mc
mercurial
meson
mlocate
ModemManager
mpfr
msr-tools
mysql
nano
nasm
ncurses
ndctl
net-snmp
net-tools
nettle
newt
nfs-utils
nghttp2
nginx
ninja-build
nodejs
npth
nspr
nss
nss-altfiles
ntp
numactl
nvme-cli
oniguruma
OpenIPMI
openldap
openscap
openssh
openvswitch
ostree
pam
pango
parted
patch
pciutils
perl-Canary-Stability
perl-CGI
perl-common-sense
perl-Crypt-SSLeay
perl-DBD-SQLite
perl-DBI
perl-DBIx-Simple
perl-Exporter-Tiny
perl-File-HomeDir
perl-File-Which
perl-IO-Socket-SSL
perl-JSON-Any
perl-JSON-XS
perl-libintl-perl
perl-List-MoreUtils
perl-Module-Build
perl-Module-Install
perl-Module-ScanDeps
perl-Net-SSLeay
perl-NetAddr-IP
perl-Object-Accessor
perl-Path-Class
perl-Try-Tiny
perl-Types-Serialiser
perl-WWW-Curl
perl-XML-Parser
perl-YAML
perl-YAML-Tiny
pgbouncer
pinentry
polkit
popt
postgresql
procps-ng
protobuf
protobuf-c
psmisc
pth
pyasn1-modules
pyOpenSSL
pyparsing
pytest
python-appdirs
python-asn1crypto
python-atomicwrites
python-attrs
python-bcrypt
python-certifi
python-cffi
python-chardet
python-configobj
python-constantly
python-coverage
python-cryptography
python-daemon
python-dateutil
python-defusedxml
python-distro
python-docopt
python-docutils
python-ecdsa
python-gevent
python-hyperlink
python-hypothesis
python-idna
python-imagesize
python-incremental
python-iniparse
python-ipaddr
python-jinja2
python-jmespath
python-jsonpatch
python-jsonpointer
python-jsonschema
python-lockfile
python-lxml
python-mako
python-markupsafe
python-mistune
python-msgpack
python-netaddr
python-netifaces
python-ntplib
python-oauthlib
python-packaging
python-pam
python-pbr
python-ply
python-prettytable
python-psutil
python-psycopg2
python-py
python-pyasn1
python-pycodestyle
python-pycparser
python-pycurl
python-pygments
python-pynacl
python-requests
python-setuptools_scm
python-simplejson
python-six
python-snowballstemmer
python-sphinx-theme-alabaster
python-twisted
python-urllib3
python-vcversioner
python-virtualenv
python-wcwidth
python-webob
python-websocket-client
python-werkzeug
python-zope-event
python-zope-interface
python3
pytz
PyYAML
rapidjson
readline
rng-tools
rpcbind
rpcsvc-proto
rpm
rpm-ostree
rrdtool
rsync
rsyslog
ruby
rust
scons
sed
sg3_utils
shadow-utils
slang
snappy
socat
sqlite
sshpass
strace
strongswan
subversion
sudo
swig
syslinux
syslog-ng
sysstat
systemd-bootstrap
systemtap
tar
tboot
tcl
tcpdump
tcsh
tdnf
telegraf
texinfo
tmux
tpm2-abrmd
tpm2-pkcs11
tpm2-pytss
tpm2-tools
tpm2-tss
traceroute
tree
tzdata
unbound
unixODBC
unzip
usbutils
userspace-rcu
utf8proc
util-linux
valgrind
vim
vsftpd
WALinuxAgent
which
wpa_supplicant
xfsprogs
xinetd
xmlsec1
xmlto
xz
zchunk
zeromq
zip
zlib
zsh | | RPM software management source | [GPLv2+ License](https://github.com/rpm-software-management/dnf5/blob/main/COPYING.md) | dnf5 | | Source project | Same as the source project. | python-nocaselist | diff --git a/LICENSES-AND-NOTICES/SPECS/data/licenses.json b/LICENSES-AND-NOTICES/SPECS/data/licenses.json index e55483b8803..d68a41a8acd 100644 --- a/LICENSES-AND-NOTICES/SPECS/data/licenses.json +++ b/LICENSES-AND-NOTICES/SPECS/data/licenses.json @@ -2559,7 +2559,6 @@ "gnu-regexp", "golang-packaging", "guava", - "guava20", "hamcrest", "hawtjni-runtime", "httpcomponents-core", diff --git a/SPECS-EXTENDED/guava20/0001-Avoid-presizing-arrays.patch b/SPECS-EXTENDED/guava20/0001-Avoid-presizing-arrays.patch deleted file mode 100644 index b7b18a3e8a2..00000000000 --- a/SPECS-EXTENDED/guava20/0001-Avoid-presizing-arrays.patch +++ /dev/null @@ -1,49 +0,0 @@ -From c6497b79ee766206ba27c6b33391e1d5e572e662 Mon Sep 17 00:00:00 2001 -From: Michael Simacek -Date: Wed, 2 May 2018 15:22:08 +0200 -Subject: [PATCH] Avoid presizing arrays - -Backported version of: -https://github.com/google/guava/commit/f89ece5721b2f637fe754937ff1f3c86d80bb196 - -Ignoring GWT, as we don't ship it. Using ArrayList, because -ImmutableLongArray is not available. ---- - .../common/util/concurrent/AtomicDoubleArray.java | 11 ++++++----- - 1 file changed, 6 insertions(+), 5 deletions(-) - -diff --git a/guava/src/com/google/common/util/concurrent/AtomicDoubleArray.java b/guava/src/com/google/common/util/concurrent/AtomicDoubleArray.java -index e939672..23a2535 100644 ---- a/guava/src/com/google/common/util/concurrent/AtomicDoubleArray.java -+++ b/guava/src/com/google/common/util/concurrent/AtomicDoubleArray.java -@@ -17,7 +17,10 @@ import static java.lang.Double.doubleToRawLongBits; - import static java.lang.Double.longBitsToDouble; - - import com.google.common.annotations.GwtIncompatible; -+import com.google.common.primitives.Longs; - import com.google.errorprone.annotations.CanIgnoreReturnValue; -+import java.util.ArrayList; -+import java.util.List; - import java.util.concurrent.atomic.AtomicLongArray; - - /** -@@ -261,13 +264,11 @@ public class AtomicDoubleArray implements java.io.Serializable { - throws java.io.IOException, ClassNotFoundException { - s.defaultReadObject(); - -- // Read in array length and allocate array - int length = s.readInt(); -- this.longs = new AtomicLongArray(length); -- -- // Read in all elements in the proper order. -+ List builder = new ArrayList(); - for (int i = 0; i < length; i++) { -- set(i, s.readDouble()); -+ builder.add(doubleToRawLongBits(s.readDouble())); - } -+ this.longs = new AtomicLongArray(Longs.toArray(builder)); - } - } --- -2.17.0 - diff --git a/SPECS-EXTENDED/guava20/guava20-java8compat.patch b/SPECS-EXTENDED/guava20/guava20-java8compat.patch deleted file mode 100644 index e613a5d214d..00000000000 --- a/SPECS-EXTENDED/guava20/guava20-java8compat.patch +++ /dev/null @@ -1,259 +0,0 @@ -diff -urEbwB guava-20.0/guava/src/com/google/common/hash/AbstractByteHasher.java guava-20.0.new/guava/src/com/google/common/hash/AbstractByteHasher.java ---- guava-20.0/guava/src/com/google/common/hash/AbstractByteHasher.java 2016-10-28 22:30:44.000000000 +0200 -+++ guava-20.0.new/guava/src/com/google/common/hash/AbstractByteHasher.java 2018-11-29 20:11:23.337123690 +0100 -@@ -22,6 +22,7 @@ - import com.google.common.primitives.Longs; - import com.google.common.primitives.Shorts; - import com.google.errorprone.annotations.CanIgnoreReturnValue; -+import java.nio.Buffer; - import java.nio.ByteBuffer; - import java.nio.ByteOrder; - -@@ -83,7 +84,7 @@ - try { - update(scratch.array(), 0, bytes); - } finally { -- scratch.clear(); -+ ((Buffer)scratch).clear(); - } - return this; - } -diff -urEbwB guava-20.0/guava/src/com/google/common/hash/AbstractStreamingHashFunction.java guava-20.0.new/guava/src/com/google/common/hash/AbstractStreamingHashFunction.java ---- guava-20.0/guava/src/com/google/common/hash/AbstractStreamingHashFunction.java 2016-10-28 22:30:44.000000000 +0200 -+++ guava-20.0.new/guava/src/com/google/common/hash/AbstractStreamingHashFunction.java 2018-11-29 20:09:55.808674786 +0100 -@@ -18,6 +18,7 @@ - - import com.google.common.base.Preconditions; - import com.google.errorprone.annotations.CanIgnoreReturnValue; -+import java.nio.Buffer; - import java.nio.ByteBuffer; - import java.nio.ByteOrder; - import java.nio.charset.Charset; -@@ -135,13 +136,13 @@ - *

This implementation simply pads with zeros and delegates to {@link #process(ByteBuffer)}. - */ - protected void processRemaining(ByteBuffer bb) { -- bb.position(bb.limit()); // move at the end -- bb.limit(chunkSize + 7); // get ready to pad with longs -+ ((Buffer)bb).position(bb.limit()); // move at the end -+ ((Buffer)bb).limit(chunkSize + 7); // get ready to pad with longs - while (bb.position() < chunkSize) { - bb.putLong(0); - } -- bb.limit(chunkSize); -- bb.flip(); -+ ((Buffer)bb).limit(chunkSize); -+ ((Buffer)bb).flip(); - process(bb); - } - -@@ -242,7 +243,7 @@ - @Override - public final HashCode hash() { - munch(); -- buffer.flip(); -+ ((Buffer)buffer).flip(); - if (buffer.remaining() > 0) { - processRemaining(buffer); - } -@@ -260,7 +261,7 @@ - } - - private void munch() { -- buffer.flip(); -+ ((Buffer)buffer).flip(); - while (buffer.remaining() >= chunkSize) { - // we could limit the buffer to ensure process() does not read more than - // chunkSize number of bytes, but we trust the implementations -diff -urEbwB guava-20.0/guava/src/com/google/common/io/ByteStreams.java guava-20.0.new/guava/src/com/google/common/io/ByteStreams.java ---- guava-20.0/guava/src/com/google/common/io/ByteStreams.java 2016-10-28 22:30:44.000000000 +0200 -+++ guava-20.0.new/guava/src/com/google/common/io/ByteStreams.java 2018-11-29 20:07:12.499837268 +0100 -@@ -32,6 +32,7 @@ - import java.io.IOException; - import java.io.InputStream; - import java.io.OutputStream; -+import java.nio.Buffer; - import java.nio.ByteBuffer; - import java.nio.channels.FileChannel; - import java.nio.channels.ReadableByteChannel; -@@ -142,11 +143,11 @@ - ByteBuffer buf = ByteBuffer.wrap(createBuffer()); - long total = 0; - while (from.read(buf) != -1) { -- buf.flip(); -+ ((Buffer)buf).flip(); - while (buf.hasRemaining()) { - total += to.write(buf); - } -- buf.clear(); -+ ((Buffer)buf).clear(); - } - return total; - } -diff -urEbwB guava-20.0/guava/src/com/google/common/io/CharStreams.java guava-20.0.new/guava/src/com/google/common/io/CharStreams.java ---- guava-20.0/guava/src/com/google/common/io/CharStreams.java 2016-10-28 22:30:44.000000000 +0200 -+++ guava-20.0.new/guava/src/com/google/common/io/CharStreams.java 2018-11-29 20:23:17.520747451 +0100 -@@ -25,6 +25,7 @@ - import java.io.IOException; - import java.io.Reader; - import java.io.Writer; -+import java.nio.Buffer; - import java.nio.CharBuffer; - import java.util.ArrayList; - import java.util.List; -@@ -72,10 +73,10 @@ - CharBuffer buf = createBuffer(); - long total = 0; - while (from.read(buf) != -1) { -- buf.flip(); -+ ((Buffer)buf).flip(); - to.append(buf); - total += buf.remaining(); -- buf.clear(); -+ ((Buffer)buf).clear(); - } - return total; - } -@@ -164,7 +165,7 @@ - CharBuffer buf = createBuffer(); - while ((read = readable.read(buf)) != -1) { - total += read; -- buf.clear(); -+ ((Buffer)buf).clear(); - } - return total; - } -diff -urEbwB guava-20.0/guava/src/com/google/common/io/LineReader.java guava-20.0.new/guava/src/com/google/common/io/LineReader.java ---- guava-20.0/guava/src/com/google/common/io/LineReader.java 2016-10-28 22:30:44.000000000 +0200 -+++ guava-20.0.new/guava/src/com/google/common/io/LineReader.java 2018-11-29 20:24:02.056973124 +0100 -@@ -22,6 +22,7 @@ - import com.google.errorprone.annotations.CanIgnoreReturnValue; - import java.io.IOException; - import java.io.Reader; -+import java.nio.Buffer; - import java.nio.CharBuffer; - import java.util.LinkedList; - import java.util.Queue; -@@ -71,7 +72,7 @@ - @CanIgnoreReturnValue // to skip a line - public String readLine() throws IOException { - while (lines.peek() == null) { -- cbuf.clear(); -+ ((Buffer)cbuf).clear(); - // The default implementation of Reader#read(CharBuffer) allocates a - // temporary char[], so we call Reader#read(char[], int, int) instead. - int read = (reader != null) -diff -urEbwB guava-20.0/guava/src/com/google/common/io/ReaderInputStream.java guava-20.0.new/guava/src/com/google/common/io/ReaderInputStream.java ---- guava-20.0/guava/src/com/google/common/io/ReaderInputStream.java 2016-10-28 22:30:44.000000000 +0200 -+++ guava-20.0.new/guava/src/com/google/common/io/ReaderInputStream.java 2018-11-29 20:28:48.770431203 +0100 -@@ -104,7 +104,7 @@ - encoder.reset(); - - charBuffer = CharBuffer.allocate(bufferSize); -- charBuffer.flip(); -+ ((Buffer)charBuffer).flip(); - - byteBuffer = ByteBuffer.allocate(bufferSize); - } -@@ -143,7 +143,7 @@ - return (totalBytesRead > 0) ? totalBytesRead : -1; - } - draining = false; -- byteBuffer.clear(); -+ ((Buffer)byteBuffer).clear(); - } - - while (true) { -@@ -189,8 +189,8 @@ - private static CharBuffer grow(CharBuffer buf) { - char[] copy = Arrays.copyOf(buf.array(), buf.capacity() * 2); - CharBuffer bigger = CharBuffer.wrap(copy); -- bigger.position(buf.position()); -- bigger.limit(buf.limit()); -+ ((Buffer)bigger).position(buf.position()); -+ ((Buffer)bigger).limit(buf.limit()); - return bigger; - } - -@@ -207,7 +207,7 @@ - if (availableCapacity(charBuffer) == 0) { - if (charBuffer.position() > 0) { - // (2) There is room in the buffer. Move existing bytes to the beginning. -- charBuffer.compact().flip(); -+ ((Buffer)(charBuffer.compact())).flip(); - } else { - // (3) Entire buffer is full, need bigger buffer. - charBuffer = grow(charBuffer); -@@ -220,7 +220,7 @@ - if (numChars == -1) { - endOfInput = true; - } else { -- charBuffer.limit(limit + numChars); -+ ((Buffer)charBuffer).limit(limit + numChars); - } - } - -@@ -235,7 +235,7 @@ - * overflow must be due to a small output buffer. - */ - private void startDraining(boolean overflow) { -- byteBuffer.flip(); -+ ((Buffer)byteBuffer).flip(); - if (overflow && byteBuffer.remaining() == 0) { - byteBuffer = ByteBuffer.allocate(byteBuffer.capacity() * 2); - } else { -diff -urEbwB guava-20.0/guava-tests/test/com/google/common/io/CharSequenceReaderTest.java guava-20.0.new/guava-tests/test/com/google/common/io/CharSequenceReaderTest.java ---- guava-20.0/guava-tests/test/com/google/common/io/CharSequenceReaderTest.java 2016-10-28 22:30:44.000000000 +0200 -+++ guava-20.0.new/guava-tests/test/com/google/common/io/CharSequenceReaderTest.java 2018-11-29 20:16:05.574558776 +0100 -@@ -17,6 +17,7 @@ - package com.google.common.io; - - import java.io.IOException; -+import java.nio.Buffer; - import java.nio.CharBuffer; - import junit.framework.TestCase; - -@@ -210,7 +211,7 @@ - reader = new CharSequenceReader(charSequence); - CharBuffer buf2 = CharBuffer.allocate(expected.length()); - assertEquals(expected.length() == 0 ? -1 : expected.length(), reader.read(buf2)); -- buf2.flip(); -+ ((Buffer)buf2).flip(); - assertEquals(expected, buf2.toString()); - assertFullyRead(reader); - -@@ -219,9 +220,9 @@ - buf2 = CharBuffer.allocate(5); - builder = new StringBuilder(); - while (reader.read(buf2) != -1) { -- buf2.flip(); -+ ((Buffer)buf2).flip(); - builder.append(buf2); -- buf2.clear(); -+ ((Buffer)buf2).clear(); - } - assertEquals(expected, builder.toString()); - assertFullyRead(reader); -diff -urEbwB guava-20.0/guava-tests/test/com/google/common/io/SourceSinkFactories.java guava-20.0.new/guava-tests/test/com/google/common/io/SourceSinkFactories.java ---- guava-20.0/guava-tests/test/com/google/common/io/SourceSinkFactories.java 2016-10-28 22:30:44.000000000 +0200 -+++ guava-20.0.new/guava-tests/test/com/google/common/io/SourceSinkFactories.java 2018-11-29 20:16:54.126804793 +0100 -@@ -34,6 +34,7 @@ - import java.io.OutputStreamWriter; - import java.io.Reader; - import java.io.Writer; -+import java.nio.Buffer; - import java.nio.CharBuffer; - import java.util.Arrays; - import java.util.logging.Logger; -@@ -415,9 +416,9 @@ - StringBuilder builder = new StringBuilder(); - CharBuffer buffer = CharBuffer.allocate(100); - while (reader.read(buffer) != -1) { -- buffer.flip(); -+ ((Buffer)buffer).flip(); - builder.append(buffer); -- buffer.clear(); -+ ((Buffer)buffer).clear(); - } - return builder.toString(); - } diff --git a/SPECS-EXTENDED/guava20/guava20.signatures.json b/SPECS-EXTENDED/guava20/guava20.signatures.json deleted file mode 100644 index 5e5a181a2cd..00000000000 --- a/SPECS-EXTENDED/guava20/guava20.signatures.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "Signatures": { - "guava20-20.0.tar.gz": "51a935a0ac68d479a0b52621d60e1792ae16fb6222b628fdbb2f962072d0f7ab", - "osgi-manifest.txt": "94c6fc02d41de6947abdce29e142293ae57b2cc0670d498230ee04c3423ea390" - } -} diff --git a/SPECS-EXTENDED/guava20/guava20.spec b/SPECS-EXTENDED/guava20/guava20.spec deleted file mode 100644 index 1311ceea3bf..00000000000 --- a/SPECS-EXTENDED/guava20/guava20.spec +++ /dev/null @@ -1,182 +0,0 @@ -Vendor: Microsoft Corporation -Distribution: Azure Linux -# -# spec file for package guava20 -# -# Copyright (c) 2020 SUSE LLC -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. - -# Please submit bugfixes or comments via https://bugs.opensuse.org/ -# - - -%global guava_compat_version 20.0,19.0,18.0,17.0,16.0.1,16.0,15.0,14.0.1,14.0,13.0.1,13.0,12.0.1,12.0,11.0.2,11.0.1,11.0,10.0.1,10.0 -%global guava_alias com.google.collections:google-collections,com.google.guava:guava-jdk5 -Name: guava20 -Version: 20.0 -Release: 5%{?dist} -Summary: Google Core Libraries for Java -# Most of the code is under ASL 2.0 -# Few classes are under CC0, grep for creativecommons -License: Apache-2.0 AND CC0-1.0 -Group: Development/Libraries/Java -URL: https://github.com/google/guava -Source0: https://github.com/google/guava/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz -Source1: osgi-manifest.txt -Patch0: 0001-Avoid-presizing-arrays.patch -Patch1: guava20-java8compat.patch -BuildRequires: fdupes -BuildRequires: java-devel -BuildRequires: javapackages-local-bootstrap -BuildRequires: jsr-305 -BuildRequires: junit -BuildArch: noarch - -%description -Guava is a suite of core and expanded libraries that include -utility classes, Google's collections, io classes, and much -much more. -This project is a complete packaging of all the Guava libraries -into a single jar. Individual portions of Guava can be used -by downloading the appropriate module and its dependencies. - -%package javadoc -Summary: Javadoc for %{name} -Group: Documentation/HTML - -%description javadoc -API documentation for %{name}. - -%package testlib -Summary: The guava-testlib artifact -Group: Development/Libraries/Java -Requires: %{name} = %{version} -Requires: jsr-305 -Requires: junit - -%description testlib -guava-testlib provides additional functionality for conveninent unit testing - -%prep -%setup -q -n guava-%{version} -cat %{SOURCE1} | sed 's#@BNDVRSN@#%{version}.0#g' >manifest.txt - -%patch 0 -p1 -%patch 1 -p1 - -find . -name '*.jar' -delete - -%pom_disable_module guava-gwt -%pom_remove_plugin -r :animal-sniffer-maven-plugin -%pom_remove_plugin :maven-gpg-plugin -%pom_remove_dep jdk:srczip guava -%pom_remove_dep :caliper guava-tests - -# javadoc generation fails due to strict doclint in JDK 1.8.0_45 -%pom_remove_plugin -r :maven-javadoc-plugin - -%pom_xpath_inject /pom:project/pom:build/pom:plugins/pom:plugin/pom:configuration/pom:instructions "<_nouses>true" guava/pom.xml - -%pom_remove_dep -r :animal-sniffer-annotations -%pom_remove_dep -r :error_prone_annotations -%pom_remove_dep -r :j2objc-annotations - -annotations=$( - grep -F -hr -e com.google.j2objc.annotations \ - -e com.google.errorprone.annotation -e org.codehaus.mojo.animal_sniffer \ - | sort -u \ - | sed 's/.*\.\([^.]*\);/\1/' \ - | paste -sd\| -) -# guava started using quite a few annotation libraries for code quality, which -# we don't have. This ugly regex is supposed to remove their usage from the code -find -name '*.java' | xargs sed -ri \ - "s/^import .*\.($annotations);//;s/@($annotations)"'\>\s*(\((("[^"]*")|([^)]*))\))?//' - -for mod in guava guava-gwt guava-testlib guava-tests; do - %pom_remove_parent ${mod} - %pom_xpath_inject "pom:project" " - com.google.guava - %{version}" ${mod} -done - -%build -mkdir -p guava/build/classes -javac -d guava/build/classes \ - -cp $(build-classpath jsr-305) \ - -source 6 -target 6 -encoding utf8 \ - $(find guava/src/ -name \*.java | xargs) -jar cfm guava/build/guava-%{version}.jar manifest.txt -C guava/build/classes . - -mkdir -p guava-testlib/build/classes -javac \ - -d guava-testlib/build/classes \ - -cp $(build-classpath jsr-305 junit):guava/build/classes \ - -source 6 -target 6 -encoding utf8 \ - $(find guava-testlib/src/ -name \*.java | xargs) -jar cf guava-testlib/build/guava-testlib-%{version}.jar -C guava-testlib/build/classes . - -mkdir -p build/apidoc -javadoc \ - -d build/apidoc \ - -Xdoclint:none \ - -classpath $(build-classpath jsr-305 junit):guava/build/classes \ - -source 6 -encoding utf8 -notimestamp \ - $(find {guava,guava-testlib}/src/ -name \*.java | xargs) - -%install -# jars -install -dm 755 %{buildroot}%{_javadir}/%{name} -install -m 0644 guava/build/guava-%{version}.jar %{buildroot}%{_javadir}/%{name}/guava.jar -install -m 0644 guava-testlib/build/guava-testlib-%{version}.jar %{buildroot}%{_javadir}/%{name}/guava-testlib.jar - -# poms -install -dm 755 %{buildroot}%{_mavenpomdir}/%{name} -install -m 0644 guava/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/guava.pom -%add_maven_depmap %{name}/guava.pom %{name}/guava.jar -v %{guava_compat_version} -a %{guava_alias} - -install -m 0644 guava-testlib/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/guava-testlib.pom -%add_maven_depmap %{name}/guava-testlib.pom %{name}/guava-testlib.jar -v %{guava_compat_version} -f testlib - -# javadoc -install -dm 755 %{buildroot}%{_javadocdir}/%{name} -cp -a build/apidoc/* %{buildroot}%{_javadocdir}/%{name} -%fdupes -s %{buildroot}%{_javadocdir}/%{name} - -%files -f .mfiles -%doc CONTRIBUTORS README* -%license COPYING - -%files javadoc -%license COPYING -%{_javadocdir}/%{name} - -%files testlib -f .mfiles-testlib - -%changelog -* Thu Oct 14 2021 Pawel Winogrodzki - 20.0-5 -- Converting the 'Release' tag to the '[number].[distribution]' format. - -* Mon Nov 16 2020 Ruying Chen - 20.0-4.4 -- Initial CBL-Mariner import from openSUSE Tumbleweed (license: same as "License" tag). -- Use javapackages-local-bootstrap to avoid build cycle. -- Set javadoc Xdoclint:none. - -* Mon Mar 23 2020 Fridrich Strba -- Add bundle manifest to the guava jar so that it might be usable - from eclipse -* Fri Oct 4 2019 Fridrich Strba -- Remove references to parents from all installed pom files -* Mon Apr 8 2019 Fridrich Strba -- Do not depend on the parent pom, since we are not building using - Maven. -* Thu Oct 25 2018 Fridrich Strba -- Initial packaging of guava20 20.0 diff --git a/SPECS-EXTENDED/guava20/osgi-manifest.txt b/SPECS-EXTENDED/guava20/osgi-manifest.txt deleted file mode 100644 index 7fdb8e610bf..00000000000 --- a/SPECS-EXTENDED/guava20/osgi-manifest.txt +++ /dev/null @@ -1,27 +0,0 @@ -Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt -Bundle-ManifestVersion: 2 -Bundle-Name: Guava: Google Core Libraries for Java -Bundle-SymbolicName: com.google.guava -Bundle-Version: @BNDVRSN@ -Export-Package: com.google.common.annotations;version="@BNDVRSN@", - com.google.common.base;version="@BNDVRSN@", - com.google.common.cache;version="@BNDVRSN@", - com.google.common.collect;version="@BNDVRSN@", - com.google.common.escape;version="@BNDVRSN@", - com.google.common.eventbus;version="@BNDVRSN@", - com.google.common.graph;version="@BNDVRSN@", - com.google.common.hash;version="@BNDVRSN@", - com.google.common.html;version="@BNDVRSN@", - com.google.common.io;version="@BNDVRSN@", - com.google.common.math;version="@BNDVRSN@", - com.google.common.net;version="@BNDVRSN@", - com.google.common.primitives;version="@BNDVRSN@", - com.google.common.reflect;version="@BNDVRSN@", - com.google.common.util.concurrent;version="@BNDVRSN@", - com.google.common.xml;version="@BNDVRSN@" -Import-Package: javax.annotation;resolution:=optional, - javax.crypto;resolution:=optional, - javax.crypto.spec;resolution:=optional, - sun.misc;resolution:=optional -Require-Capability: osgi.ee; - filter:="(&(osgi.ee=JavaSE)(version=1.6))" diff --git a/cgmanifest.json b/cgmanifest.json index 4677d2e58ba..f3bdf2e1984 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -5045,16 +5045,6 @@ } } }, - { - "component": { - "type": "other", - "other": { - "name": "guava20", - "version": "20.0", - "downloadUrl": "https://github.com/google/guava/archive/v20.0.tar.gz" - } - } - }, { "component": { "type": "other",