Rebase to latest upstream 2.2.0
This is the latest rebase to match upstream version 2.2.0. See also re-review request: BZ#1758293 See also Pagure unretire/unorphan request: https://pagure.io/releng/issue/8859 Signed-off-by: Dinesh Prasanth M K <dmoluguw@redhat.com>
This commit is contained in:
parent
3d6b3a32c1
commit
b588553f0c
1
.gitignore
vendored
1
.gitignore
vendored
@ -5,3 +5,4 @@
|
||||
/jboss-logging-tools-1.1.0.Final.tar.xz
|
||||
/1.2.0.Beta1.tar.gz
|
||||
/2.0.1.Final.tar.gz
|
||||
/jboss-logging-tools-2.2.0.Final.tar.gz
|
||||
|
@ -2,25 +2,24 @@
|
||||
%global namedversion %{version}%{?namedreltag}
|
||||
|
||||
Name: jboss-logging-tools
|
||||
Version: 2.0.1
|
||||
Release: 8%{?dist}
|
||||
Version: 2.2.0
|
||||
Release: 1%{?dist}
|
||||
Summary: JBoss Logging I18n Annotation Processor
|
||||
# Not available license file https://issues.jboss.org/browse/LOGTOOL-107
|
||||
# ./annotations/src/main/java/org/jboss/logging/annotations/*.java: Apache (v2.0)
|
||||
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
|
||||
Source0: %{url}/archive/%{namedversion}/%{name}-%{namedversion}.tar.gz
|
||||
Source1: http://www.apache.org/licenses/LICENSE-2.0.txt
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
BuildRequires: maven-local
|
||||
BuildRequires: mvn(org.apache.maven.surefire:surefire-testng)
|
||||
BuildRequires: mvn(junit:junit)
|
||||
BuildRequires: mvn(org.jboss:jboss-parent:pom:)
|
||||
BuildRequires: mvn(org.jboss.jdeparser:jdeparser)
|
||||
BuildRequires: mvn(org.jboss.logging:jboss-logging)
|
||||
BuildRequires: mvn(org.jboss.logmanager:jboss-logmanager)
|
||||
BuildRequires: mvn(org.testng:testng)
|
||||
|
||||
|
||||
%description
|
||||
This pacakge contains JBoss Logging I18n Annotation Processor
|
||||
@ -32,21 +31,38 @@ Summary: Javadoc for %{name}
|
||||
This package contains the API documentation for %{name}.
|
||||
|
||||
%prep
|
||||
%setup -q -n jboss-logging-tools-%{namedversion}
|
||||
%setup -q -n %{name}-%{namedversion}
|
||||
|
||||
%pom_disable_module processor-tests
|
||||
cp %{SOURCE1} .
|
||||
|
||||
# roaster is not packaged for Fedora, so:
|
||||
# - Remove the dependency
|
||||
# - Remove the test that requires it
|
||||
%pom_remove_dep -r org.jboss.forge.roaster:
|
||||
rm processor/src/test/java/org/jboss/logging/processor/generated/GeneratedSourceAnalysisTest.java
|
||||
|
||||
# Skip docs module
|
||||
%pom_disable_module docs
|
||||
|
||||
%build
|
||||
# @ random java.lang.ArrayIndexOutOfBoundsException: 0
|
||||
%mvn_build -- -Dmaven.test.failure.ignore=true
|
||||
%mvn_build
|
||||
|
||||
%install
|
||||
%mvn_install
|
||||
|
||||
%files -f .mfiles
|
||||
%license LICENSE-2.0.txt
|
||||
%doc README.adoc
|
||||
|
||||
%files javadoc -f .mfiles-javadoc
|
||||
%license LICENSE-2.0.txt
|
||||
%doc README.adoc
|
||||
|
||||
%changelog
|
||||
* Tue Oct 08 2019 Dogtag PKI Team <pki-devel@redhat.com> - 2.2.0-1
|
||||
- Rebuilt as part of revival process
|
||||
- BZ#1758293
|
||||
|
||||
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.1-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user