.byte-buddy.metadata

@@ -1 +1 @@
-501e1b68b4feb5e101f1978af3818eb897dac3e6 SOURCES/byte-buddy-1.10.20.tar.gz
+f22989caeb364be1c4cdccfe48682a63c4147d23 SOURCES/byte-buddy-1.10.1.tar.gz

.gitignore

@@ -1 +1 @@
-SOURCES/byte-buddy-1.10.20.tar.gz
+SOURCES/byte-buddy-1.10.1.tar.gz

SOURCES/0001-Remove-dependency-on-jna.patch

@@ -1,17 +1,17 @@
-From 4dcae48a47d1c2123d5ec86f3e2d6ef1adab8a83 Mon Sep 17 00:00:00 2001
+From 9f9ca4a15ef217284557d1fa88dfed8551a365ae Mon Sep 17 00:00:00 2001
 From: Marian Koncek <mkoncek@redhat.com>
-Date: Wed, 30 Sep 2020 13:04:45 +0200
+Date: Thu, 12 Sep 2019 11:18:51 +0200
 Subject: [PATCH] Remove dependency on jna
 
 ---
- .../net/bytebuddy/agent/VirtualMachine.java   | 2275 +++--------------
+ .../net/bytebuddy/agent/VirtualMachine.java   | 2234 +++--------------
- 1 file changed, 357 insertions(+), 1918 deletions(-)
+ 1 file changed, 357 insertions(+), 1877 deletions(-)
 
 diff --git a/byte-buddy-agent/src/main/java/net/bytebuddy/agent/VirtualMachine.java b/byte-buddy-agent/src/main/java/net/bytebuddy/agent/VirtualMachine.java
-index 245581d..80cab63 100644
+index 6e16424..e2138c1 100644
 --- a/byte-buddy-agent/src/main/java/net/bytebuddy/agent/VirtualMachine.java
 +++ b/byte-buddy-agent/src/main/java/net/bytebuddy/agent/VirtualMachine.java
-@@ -15,13 +15,6 @@
+@@ -15,11 +15,6 @@
   */
  package net.bytebuddy.agent;
  
@@ -20,12 +20,22 @@ index 245581d..80cab63 100644
 -import com.sun.jna.ptr.IntByReference;
 -import com.sun.jna.win32.StdCallLibrary;
 -import com.sun.jna.win32.W32APIOptions;
--import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
--
+ 
  import java.io.*;
- import java.net.ServerSocket;
+@@ -149,11 +144,6 @@ public interface VirtualMachine {
- import java.net.Socket;
+          * {@inheritDoc}
-@@ -227,23 +220,6 @@ public interface VirtualMachine {
+          */
+         public Class<? extends VirtualMachine> run() {
+-            try {
+-                Class.forName("com.sun.jna.Platform");
+-            } catch (ClassNotFoundException exception) {
+-                throw new IllegalStateException("Optional JNA dependency is not available", exception);
+-            }
+             return System.getProperty("java.vm.vendor").toUpperCase(Locale.US).contains("J9")
+                     ? ForOpenJ9.class
+                     : ForHotSpot.class;
+@@ -227,23 +217,6 @@ public interface VirtualMachine {
              this.connection = connection;
          }
  
@@ -49,15 +59,7 @@ index 245581d..80cab63 100644
          /**
           * Attaches to the supplied process id using the supplied connection factory.
           *
-@@ -515,7 +491,6 @@ public interface VirtualMachine {
+@@ -679,1905 +652,412 @@ public interface VirtualMachine {
-                     /**
-                      * {@inheritDoc}
-                      */
--                    @SuppressFBWarnings(value = "DMI_HARDCODED_ABSOLUTE_FILENAME", justification = "File name convention is specified.")
-                     public Connection connect(String processId) throws IOException {
-                         File socket = new File(temporaryDirectory, SOCKET_FILE_PREFIX + processId);
-                         if (!socket.exists()) {
-@@ -679,1949 +654,413 @@ public interface VirtualMachine {
                   */
                  protected abstract int read(T connection, byte[] buffer) throws IOException;
              }
@@ -138,7 +140,7 @@ index 245581d..80cab63 100644
 -                            library.connect(handle, address, address.size());
 -                            return handle;
 -                        } finally {
--                            address = null;
+-                            address.clear();
 -                        }
 -                    } catch (RuntimeException exception) {
 -                        library.close(handle);
@@ -311,18 +313,12 @@ index 245581d..80cab63 100644
 -                     * @param timeUnit The time unit of the pause time.
 -                     * @return An appropriate connection factory.
 -                     */
--                    @SuppressWarnings("deprecation")
 -                    public static Connection.Factory withDefaultTemporaryFolder(int attempts, long pause, TimeUnit timeUnit) {
 -                        String temporaryDirectory;
 -                        if (Platform.isMac()) {
--                            MacLibrary library = Native.loadLibrary("c", MacLibrary.class);
+-                            temporaryDirectory = System.getenv("TMPDIR");
--                            Memory memory = new Memory(4096);
+-                            if (temporaryDirectory == null) {
--                            try {
+-                                temporaryDirectory = "/tmp";
--                                long length = library.confstr(MacLibrary.CS_DARWIN_USER_TEMP_DIR, memory, memory.size());
--                                if (length == 0 || length > 4096) {
--                                    temporaryDirectory = "/tmp";
--                                } else {
--                                    temporaryDirectory = memory.getString(0);
 +                            long userId = dispatcher.userId();
 +                            virtualMachines = new ArrayList<Properties>();
 +                            for (File aVmFolder : vmFolder) {
@@ -362,9 +358,7 @@ index 245581d..80cab63 100644
 +                                            }
 +                                        }
 +                                    }
-                                 }
++                                }
--                            } finally {
--                                memory = null;
                              }
 -                        } else {
 -                            temporaryDirectory = "/tmp";
@@ -382,27 +376,6 @@ index 245581d..80cab63 100644
 -                    @Override
 -                    public Connection doConnect(File socket) {
 -                        return new Connection.ForJnaPosixSocket(library, socket);
--                    }
--
--                    /**
--                     * A library for reading a Mac user's temporary directory.
--                     */
--                    public interface MacLibrary extends Library {
--
--                        /**
--                         * The temporary directory.
--                         */
--                        int CS_DARWIN_USER_TEMP_DIR = 65537;
--
--                        /**
--                         * Reads a configuration dependant variable into a memory segment.
--                         *
--                         * @param name The name of the variable.
--                         * @param buffer The buffer to read the variable into.
--                         * @param length The length of the buffer.
--                         * @return The amount of bytes written to the buffer.
--                         */
--                        long confstr(int name, Pointer buffer, long length);
 +                    } finally {
 +                        master.close();
                      }
@@ -729,12 +702,6 @@ index 245581d..80cab63 100644
 -                public static class Factory implements Connection.Factory {
 -
 -                    /**
--                     * The name of the native code library that is included in this artifact to support Windows attachment.
--                     * This property can be set by other libraries that shade Byte Buddy agent and relocates the library.
--                     */
--                    public static final String LIBRARY_NAME = "net.bytebuddy.library.name";
--
--                    /**
 -                     * The library to use for communicating with Windows native functions.
 -                     */
 -                    private final WindowsLibrary library;
@@ -750,7 +717,7 @@ index 245581d..80cab63 100644
 -                    @SuppressWarnings("deprecation")
 -                    public Factory() {
 -                        library = Native.loadLibrary("kernel32", WindowsLibrary.class, W32APIOptions.DEFAULT_OPTIONS);
--                        attachLibrary = Native.loadLibrary(System.getProperty(LIBRARY_NAME, "attach_hotspot_windows"), WindowsAttachLibrary.class);
+-                        attachLibrary = Native.loadLibrary("attach_hotspot_windows", WindowsAttachLibrary.class);
 -                    }
 -
 -                    /**
@@ -843,13 +810,13 @@ index 245581d..80cab63 100644
 -                                        return new Response(library, door.descriptorPointer.getInt(4));
 -                                    }
 -                                } finally {
--                                    result = null;
+-                                    result.clear();
 -                                }
 -                            } finally {
--                                dataPointer = null;
+-                                dataPointer.clear();
 -                            }
 -                        } finally {
--                            door = null;
+-                            door.clear();
 -                        }
 -                    } finally {
 -                        library.close(handle);
@@ -1218,7 +1185,6 @@ index 245581d..80cab63 100644
 -                                    if (answer.contains(' ' + key + ' ')) {
 -                                        return new ForOpenJ9(socket);
 -                                    } else {
--                                        socket.close();
 -                                        throw new IllegalStateException("Unexpected answered to attachment: " + answer);
 -                                    }
 -                                } finally {
@@ -1539,8 +1505,7 @@ index 245581d..80cab63 100644
 -                    try {
 -                        // The binding for 'stat' is very platform dependant. To avoid the complexity of binding the correct method,
 -                        // stat is called as a separate command. This is less efficient but more portable.
--                        String statUserSwitch = Platform.isMac() ? "-f" : "-c";
+-                        Process process = Runtime.getRuntime().exec("stat -c=%u " + file.getAbsolutePath());
--                        Process process = Runtime.getRuntime().exec("stat " + statUserSwitch + " %u " + file.getAbsolutePath());
 -                        int attempts = this.attempts;
 -                        boolean exited = false;
 -                        String line = new BufferedReader(new InputStreamReader(process.getInputStream(), "UTF-8")).readLine();
@@ -1557,7 +1522,7 @@ index 245581d..80cab63 100644
 -                                    Thread.sleep(timeUnit.toMillis(pause));
 -                                } catch (InterruptedException exception) {
 -                                    Thread.currentThread().interrupt();
--                                    throw new IllegalStateException(exception);
+-                                    throw new IllegalStateException("Interrupted while waiting for stat", exception);
 +                                String pid = Long.toString(dispatcher.pid());
 +                                for (Properties virtualMachine : virtualMachines) {
 +                                    if (!virtualMachine.getProperty("processId").equalsIgnoreCase(pid)) {
@@ -1578,7 +1543,7 @@ index 245581d..80cab63 100644
 -                            process.destroy();
 -                            throw new IllegalStateException("Command for stat did not exit in time");
 -                        }
--                        return Integer.parseInt(line);
+-                        return Integer.parseInt(line.substring(1));
 -                    } catch (IOException exception) {
 -                        throw new IllegalStateException("Unable to execute stat command", exception);
 -                    }
@@ -1626,8 +1591,7 @@ index 245581d..80cab63 100644
 -                            try {
 -                                library.semop(semaphore, target, 1);
 -                            } catch (LastErrorException exception) {
--                                if (acceptUnavailable && (Native.getLastError() == PosixLibrary.EAGAIN
+-                                if (acceptUnavailable && Native.getLastError() == PosixLibrary.EAGAIN) {
--                                    || Native.getLastError() == PosixLibrary.EDEADLK)) {
 -                                    break;
 -                                } else {
 -                                    throw exception;
@@ -1647,7 +1611,7 @@ index 245581d..80cab63 100644
 -                            }
 -                        }
 -                    } finally {
--                        target = null;
+-                        target.clear();
 -                    }
 -                }
 -
@@ -1672,11 +1636,6 @@ index 245581d..80cab63 100644
 -                    int EAGAIN = 11;
 -
 -                    /**
--                     * Indicates a dead lock on a resource.
--                     */
--                    int EDEADLK = 35;
--
--                    /**
 -                     * Indicates that a semaphore's operations should be undone at process shutdown.
 -                     */
 -                    short SEM_UNDO = 0x1000;
@@ -1941,7 +1900,6 @@ index 245581d..80cab63 100644
 +                                    if (answer.contains(' ' + key + ' ')) {
 +                                        return new ForOpenJ9(socket);
 +                                    } else {
-+                                        socket.close();
 +                                        throw new IllegalStateException("Unexpected answered to attachment: " + answer);
                                      }
 -                                } else {
@@ -1994,13 +1952,13 @@ index 245581d..80cab63 100644
 +                                }
                              }
                          } finally {
--                            securityAttributes = null;
+-                            securityAttributes.clear();
 +                            if (!reply.delete()) {
 +                                reply.deleteOnExit();
 +                            }
                          }
                      } finally {
--                        securityDescriptor = null;
+-                        securityDescriptor.clear();
 +                        serverSocket.close();
                      }
 +                } finally {
@@ -2365,5 +2323,5 @@ index 245581d..80cab63 100644
      }
  }
 -- 
-2.26.2
+2.21.0
 

SOURCES/0003-Remove-Java-14-tests.patch

@@ -1,43 +0,0 @@
-From 9763d7d30bcbb8bf56a6682bb7362f3de33a0802 Mon Sep 17 00:00:00 2001
-From: Marian Koncek <mkoncek@redhat.com>
-Date: Thu, 4 Feb 2021 15:17:13 +0100
-Subject: [PATCH] Remove Java 14 tests
-
----
- .../test/precompiled/SampleRecord.java        | 24 -------------------
- 1 file changed, 24 deletions(-)
- delete mode 100644 byte-buddy-dep/src/precompiled/java/net/bytebuddy/test/precompiled/SampleRecord.java
-
-diff --git a/byte-buddy-dep/src/precompiled/java/net/bytebuddy/test/precompiled/SampleRecord.java b/byte-buddy-dep/src/precompiled/java/net/bytebuddy/test/precompiled/SampleRecord.java
-deleted file mode 100644
-index 522eefa..0000000
---- a/byte-buddy-dep/src/precompiled/java/net/bytebuddy/test/precompiled/SampleRecord.java
-+++ /dev/null
-@@ -1,24 +0,0 @@
--/*
-- * Copyright 2014 - Present Rafael Winterhalter
-- *
-- * Licensed under the Apache License, Version 2.0 (the "License");
-- * you may not use this file except in compliance with the License.
-- * You may obtain a copy of the License at
-- *
-- *     http://www.apache.org/licenses/LICENSE-2.0
-- *
-- * Unless required by applicable law or agreed to in writing, software
-- * distributed under the License is distributed on an "AS IS" BASIS,
-- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-- * See the License for the specific language governing permissions and
-- * limitations under the License.
-- */
--package net.bytebuddy.test.precompiled;
--
--import net.bytebuddy.description.type.AbstractTypeDescriptionTest;
--
--import java.util.List;
--
--public record SampleRecord(@AbstractTypeDescriptionTest.SampleAnnotation @TypeAnnotation(42) List<@TypeAnnotation(84) String> foo) {
--    /* empty */
--}
--- 
-2.29.2
-

SOURCES/avoid-bundling-asm.patch

@@ -1,14 +1,5 @@
-From ceca0b287ac211a968e84cee7f05cfd6c2a843ec Mon Sep 17 00:00:00 2001
-From: Marian Koncek <mkoncek@redhat.com>
-Date: Tue, 29 Sep 2020 14:46:16 +0200
-Subject: [PATCH] Avoid bundling asm
-
----
- byte-buddy/pom.xml | 70 ++++++++++------------------------------------
- 1 file changed, 15 insertions(+), 55 deletions(-)
-
 diff --git a/byte-buddy/pom.xml b/byte-buddy/pom.xml
-index 16388f3..c97b4d9 100644
+index 283da43..aca6bc5 100644
 --- a/byte-buddy/pom.xml
 +++ b/byte-buddy/pom.xml
 @@ -26,8 +26,6 @@
@@ -47,7 +38,7 @@ index 16388f3..c97b4d9 100644
      </dependencies>
  
      <build>
-@@ -105,44 +110,6 @@
+@@ -105,36 +110,6 @@
                              <createDependencyReducedPom>true</createDependencyReducedPom>
                              <createSourcesJar>${bytebuddy.extras}</createSourcesJar>
                              <shadeSourcesContent>true</shadeSourcesContent>
@@ -59,15 +50,8 @@ index 16388f3..c97b4d9 100644
 -                            </relocations>
 -                            <filters>
 -                                <filter>
--                                    <artifact>net.bytebuddy:byte-buddy-dep:*</artifact>
--                                    <excludes>
--                                        <exclude>META-INF/MANIFEST.MF</exclude>
--                                    </excludes>
--                                </filter>
--                                <filter>
 -                                    <artifact>org.ow2.asm:*</artifact>
 -                                    <excludes>
--                                        <exclude>META-INF/MANIFEST.MF</exclude>
 -                                        <exclude>**/module-info.class</exclude>
 -                                        <exclude>**/LICENSE</exclude>
 -                                        <exclude>**/NOTICE</exclude>
@@ -76,23 +60,22 @@ index 16388f3..c97b4d9 100644
 -                                <filter>
 -                                    <artifact>org.ow2.asm:asm-commons</artifact>
 -                                    <includes>
--                                        <include>org/objectweb/asm/commons/AnnotationRemapper.**</include>
+-                                        <include>org/objectweb/asm/commons/AnnotationRemapper.class</include>
--                                        <include>org/objectweb/asm/commons/ClassRemapper.**</include>
+-                                        <include>org/objectweb/asm/commons/ClassRemapper.class</include>
--                                        <include>org/objectweb/asm/commons/FieldRemapper.**</include>
+-                                        <include>org/objectweb/asm/commons/FieldRemapper.class</include>
--                                        <include>org/objectweb/asm/commons/MethodRemapper.**</include>
+-                                        <include>org/objectweb/asm/commons/MethodRemapper.class</include>
--                                        <include>org/objectweb/asm/commons/ModuleHashesAttribute.**</include>
+-                                        <include>org/objectweb/asm/commons/ModuleHashesAttribute.class</include>
--                                        <include>org/objectweb/asm/commons/ModuleRemapper.**</include>
+-                                        <include>org/objectweb/asm/commons/ModuleRemapper.class</include>
--                                        <include>org/objectweb/asm/commons/RecordComponentRemapper.**</include>
+-                                        <include>org/objectweb/asm/commons/Remapper.class</include>
--                                        <include>org/objectweb/asm/commons/Remapper.**</include>
+-                                        <include>org/objectweb/asm/commons/SignatureRemapper.class</include>
--                                        <include>org/objectweb/asm/commons/SignatureRemapper.**</include>
+-                                        <include>org/objectweb/asm/commons/SimpleRemapper.class</include>
--                                        <include>org/objectweb/asm/commons/SimpleRemapper.**</include>
 -                                    </includes>
 -                                </filter>
 -                            </filters>
                              <transformers>
                                  <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                                      <mainClass>net.bytebuddy.build.Plugin$Engine$Default</mainClass>
-@@ -151,21 +118,14 @@
+@@ -143,21 +118,14 @@
                                      <resource>META-INF/LICENSE</resource>
                                  </transformer>
                              </transformers>
@@ -119,6 +102,3 @@ index 16388f3..c97b4d9 100644
              </plugin>
              <!-- Disable pitest as it fails for empty modules -->
              <plugin>
--- 
-2.26.2
-

SPECS/byte-buddy.spec

@@ -1,26 +1,21 @@
-%bcond_with bootstrap
+Name:          byte-buddy
-
+Version:       1.10.1
-Name:           byte-buddy
+Release:       2%{?dist}
-Version:        1.10.20
+Summary:       Runtime code generation for the Java virtual machine
-Release:        5%{?dist}
+License:       ASL 2.0
-Summary:        Runtime code generation for the Java virtual machine
+URL:           http://bytebuddy.net/
-License:        ASL 2.0
-URL:            http://bytebuddy.net/
 # ./generate-tarball.sh
-Source0:        %{name}-%{version}.tar.gz
+Source0:       %{name}-%{version}.tar.gz
 
 # Patch the build to avoid bundling inside shaded jars
-Patch1:         0001-Avoid-bundling-asm.patch
+Patch1:         avoid-bundling-asm.patch
-Patch2:         0002-Remove-dependency-on-jna.patch
+Patch2:         0001-Remove-dependency-on-jna.patch
-Patch3:         0003-Remove-Java-14-tests.patch
 
 BuildRequires:  maven-local
-%if %{with bootstrap}
-BuildRequires:  javapackages-bootstrap
-%else
 BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(net.bytebuddy:byte-buddy)
 BuildRequires:  mvn(net.bytebuddy:byte-buddy-dep)
+BuildRequires:  mvn(net.bytebuddy:byte-buddy-maven-plugin)
 BuildRequires:  mvn(org.apache.maven:maven-compat)
 BuildRequires:  mvn(org.apache.maven.plugin-testing:maven-plugin-testing-harness)
 BuildRequires:  mvn(org.mockito:mockito-core)
@@ -36,9 +31,8 @@ BuildRequires:  mvn(org.eclipse.aether:aether-api)
 BuildRequires:  mvn(org.eclipse.aether:aether-util)
 BuildRequires:  mvn(org.ow2.asm:asm)
 BuildRequires:  mvn(org.ow2.asm:asm-commons)
-%endif
 
-BuildArch:      noarch
+BuildArch:     noarch
 
 %description
 Byte Buddy is a code generation library for creating Java classes during the
@@ -77,9 +71,6 @@ This package contains API documentation for %{name}.
 
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-
-rm byte-buddy-agent/src/test/java/net/bytebuddy/agent/VirtualMachineAttachmentTest.java
 
 # Cause pre-compiled stuff to be re-compiled
 mv byte-buddy-dep/src/precompiled/java/net/bytebuddy/build/*.java \
@@ -106,9 +97,6 @@ mv byte-buddy-dep/src/precompiled/java/net/bytebuddy/test/precompiled/*.java \
 %pom_remove_plugin :clirr-maven-plugin
 %pom_remove_plugin :maven-release-plugin
 
-# Avoid circural dependency
-%pom_remove_plugin :byte-buddy-maven-plugin byte-buddy-dep
-
 # Not interested in shading sources (causes NPE on old versions of shade plugin)
 %pom_xpath_set "pom:createSourcesJar" "false" byte-buddy
 
@@ -152,58 +140,12 @@ sed -i -e '/SuppressFBWarnings/d' $(grep -lr SuppressFBWarnings)
 %license LICENSE NOTICE
 
 %changelog
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.10.20-5
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.10.20-4
-- Rebuild to workaround DistroBaker issue
-
-* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.10.20-3
-- Bootstrap Maven for CentOS Stream 9
-
-* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.10.20-2
-- Bootstrap build
-- Non-bootstrap build
-
-* Thu Feb 04 2021 Marian Koncek <mkoncek@redhat.com> - 1.10.20-1
-- Update to upstream version 1.10.20
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.14-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Sep 29 2020 Marian Koncek <mkoncek@redhat.com> - 1.10.16-1
-- Update to upstram version 1.10.16
-
-* Fri Aug 14 2020 Jerry James <loganjerry@gmail.com> - 1.10.14-1
-- Version 1.10.14
-- Remove no longer needed no-unixsocket.patch
-- Add workaround for compiling tests with JDK 11
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.5-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 1.9.5-8
-- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.5-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Tue Jan 21 2020 Marian Koncek <mkoncek@redhat.com> - 1.10.7-1
-- Update to upstream version 1.10.7
-
-* Thu Nov 21 2019 Marian Koncek <mkoncek@redhat.com> - 1.10.3-1
-- Update to upstream version 1.10.3
-
 * Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.10.1-2
 - Mass rebuild for javapackages-tools 201902
 
 * Thu Sep 12 2019 Marian Koncek <mkoncek@redhat.com> - 1.10.1-1
 - Update to upstream version 1.10.1
 
-* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.5-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
 * Wed Jul 10 2019 Marian Koncek <mkoncek@redhat.com> - 1.9.13-2
 - Remove the dependency on maven-shade-plugin
 
@@ -213,9 +155,6 @@ sed -i -e '/SuppressFBWarnings/d' $(grep -lr SuppressFBWarnings)
 * Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.9.5-5
 - Mass rebuild for javapackages-tools 201901
 
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.5-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
 * Thu Dec 06 2018 Mat Booth <mat.booth@redhat.com> - 1.9.5-4
 - Prevent NPE in maven-shade-plugin