diff --git a/fix-cannot-find-symbol.patch b/fix-cannot-find-symbol.patch deleted file mode 100644 index 18887b00723c7a0717a8072c017367911a1a797e..0000000000000000000000000000000000000000 --- a/fix-cannot-find-symbol.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 6fe8a1a0184e008fce51bc645d76527470d4eee0 Mon Sep 17 00:00:00 2001 -From: wu-leilei -Date: Wed, 16 Feb 2022 14:52:47 +0800 -Subject: [PATCH] fix test - ---- - .../logging/processor/generated/LegacyLogger.java | 12 ++++++------ - .../processor/generated/LegacyMessages.java | 14 +++++++------- - 2 files changed, 13 insertions(+), 13 deletions(-) - -diff --git a/processor/src/test/java/org/jboss/logging/processor/generated/LegacyLogger.java b/processor/src/test/java/org/jboss/logging/processor/generated/LegacyLogger.java -index daa0a3b..6be9db7 100755 ---- a/processor/src/test/java/org/jboss/logging/processor/generated/LegacyLogger.java -+++ b/processor/src/test/java/org/jboss/logging/processor/generated/LegacyLogger.java -@@ -30,14 +30,14 @@ import java.io.OutputStream; - import java.util.Formattable; - import java.util.Formatter; - --import org.jboss.logging.Cause; --import org.jboss.logging.FormatWith; --import org.jboss.logging.LogMessage; -+import org.jboss.logging.annotations.Cause; -+import org.jboss.logging.annotations.FormatWith; -+import org.jboss.logging.annotations.LogMessage; - import org.jboss.logging.Logger; - import org.jboss.logging.Logger.Level; --import org.jboss.logging.Message; --import org.jboss.logging.Message.Format; --import org.jboss.logging.MessageLogger; -+import org.jboss.logging.annotations.Message; -+import org.jboss.logging.annotations.Message.Format; -+import org.jboss.logging.annotations.MessageLogger; - - /** - * @author James R. Perkins Jr. (jrp) -diff --git a/processor/src/test/java/org/jboss/logging/processor/generated/LegacyMessages.java b/processor/src/test/java/org/jboss/logging/processor/generated/LegacyMessages.java -index 1ed40a5..40789e2 100644 ---- a/processor/src/test/java/org/jboss/logging/processor/generated/LegacyMessages.java -+++ b/processor/src/test/java/org/jboss/logging/processor/generated/LegacyMessages.java -@@ -22,14 +22,14 @@ - - package org.jboss.logging.processor.generated; - --import org.jboss.logging.Field; -+import org.jboss.logging.annotations.Field; - import org.jboss.logging.Messages; --import org.jboss.logging.Cause; --import org.jboss.logging.Message; --import org.jboss.logging.Message.Format; --import org.jboss.logging.MessageBundle; --import org.jboss.logging.Param; --import org.jboss.logging.Property; -+import org.jboss.logging.annotations.Cause; -+import org.jboss.logging.annotations.Message; -+import org.jboss.logging.annotations.Message.Format; -+import org.jboss.logging.annotations.MessageBundle; -+import org.jboss.logging.annotations.Param; -+import org.jboss.logging.annotations.Property; - - /** - * @author James R. Perkins --- -2.23.0 - diff --git a/jboss-logging-tools1.spec b/jboss-logging-tools1.spec index 062c18de920c080dfd18244c7571e1f8338e316e..8f71c22b380c22c701d05bfd2b5539474b79b4ed 100644 --- a/jboss-logging-tools1.spec +++ b/jboss-logging-tools1.spec @@ -2,13 +2,12 @@ %global namedversion %{version}%{?namedreltag} Name: jboss-logging-tools1 Version: 1.2.1 -Release: 2 +Release: 1 Summary: JBoss Logging I18n Annotation Processor License: ASL 2.0 and LGPLv2+ URL: https://github.com/jboss-logging/jboss-logging-tools Source0: https://github.com/jboss-logging/jboss-logging-tools/archive/%{namedversion}.tar.gz Patch0: https://github.com/jboss-logging/jboss-logging-tools/commit/9a07a05d8437948c353fd13ce3311d0c5c4c0a79.patch -Patch1: fix-cannot-find-symbol.patch BuildArch: noarch BuildRequires: maven-local mvn(org.apache.maven.surefire:surefire-testng) BuildRequires: mvn(org.jboss:jboss-parent:pom:) mvn(org.jboss.jdeparser:jdeparser:1) @@ -25,7 +24,6 @@ This package contains the API documentation for jboss-logging-tools1. %prep %setup -q -n jboss-logging-tools-%{namedversion} %patch0 -p1 -%patch1 -p1 cp -p annotations/src/main/resources/META-INF/LICENSE.txt LICENSE-ASL.txt cp -p processor/src/main/resources/META-INF/LICENSE.txt LICENSE-LGPL.txt %pom_disable_module processor-tests @@ -49,8 +47,5 @@ cp -p processor/src/main/resources/META-INF/LICENSE.txt LICENSE-LGPL.txt %license LICENSE-ASL.txt LICENSE-LGPL.txt %changelog -* Wed Feb 16 2022 wulei - 1.2.1-2 -- Fix cannot find symbol - * Fri Aug 21 2020 yaokai - 1.2.1-1 - Package init