Compare commits
17 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f7451fbf9f | ||
|
|
81f5a29d24 | ||
|
|
d94e172fb8 | ||
|
|
0389bba0b3 | ||
|
|
79a76a19f4 | ||
|
|
39238589fc | ||
|
|
f6f8758a3e | ||
|
|
85a25b0f79 | ||
|
|
77fe04070d | ||
|
|
d5e7fd9894 | ||
|
|
1dca4996d6 | ||
|
|
a061e0f6bb | ||
|
|
c87b583925 | ||
|
|
5d93fe904b | ||
|
|
6deb2b1825 | ||
|
|
549c76103d | ||
|
|
94031f141b |
6 changed files with 1027 additions and 123 deletions
4
.gitignore
vendored
4
.gitignore
vendored
|
|
@ -1 +1,5 @@
|
|||
/commons-text-1.9-src.tar.gz
|
||||
/commons-text-1.10.0-src.tar.gz
|
||||
/commons-text-1.10.0-src.tar.gz.asc
|
||||
/commons-text-1.15.0-src.tar.gz
|
||||
/commons-text-1.15.0-src.tar.gz.asc
|
||||
|
|
|
|||
|
|
@ -1,62 +0,0 @@
|
|||
From 4ee3ce3b2890f1a0d6842e1b336a017a348a2508 Mon Sep 17 00:00:00 2001
|
||||
From: Didik Supriadi <didiksupriadi41@fedoraproject.org>
|
||||
Date: Sat, 23 Apr 2022 15:53:45 +0700
|
||||
Subject: [PATCH] disable-url-lookup
|
||||
|
||||
Signed-off-by: Didik Supriadi <didiksupriadi41@fedoraproject.org>
|
||||
---
|
||||
.../StringSubstitutorWithInterpolatorStringLookupTest.java | 3 +++
|
||||
.../org/apache/commons/text/lookup/UrlStringLookupTest.java | 2 ++
|
||||
2 files changed, 5 insertions(+)
|
||||
|
||||
diff --git a/src/test/java/org/apache/commons/text/StringSubstitutorWithInterpolatorStringLookupTest.java b/src/test/java/org/apache/commons/text/StringSubstitutorWithInterpolatorStringLookupTest.java
|
||||
index 1d6a16f..1b0dc2b 100644
|
||||
--- a/src/test/java/org/apache/commons/text/StringSubstitutorWithInterpolatorStringLookupTest.java
|
||||
+++ b/src/test/java/org/apache/commons/text/StringSubstitutorWithInterpolatorStringLookupTest.java
|
||||
@@ -27,6 +27,7 @@ import java.util.Map;
|
||||
import org.apache.commons.text.lookup.StringLookup;
|
||||
import org.apache.commons.text.lookup.StringLookupFactory;
|
||||
import org.junit.jupiter.api.Assertions;
|
||||
+import org.junit.jupiter.api.Disabled;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
public class StringSubstitutorWithInterpolatorStringLookupTest {
|
||||
@@ -86,6 +87,7 @@ public class StringSubstitutorWithInterpolatorStringLookupTest {
|
||||
testCustomMapWithDefaults(false);
|
||||
}
|
||||
|
||||
+ @Disabled
|
||||
@Test
|
||||
public void testDefaultInterpolator() {
|
||||
// Used to cut and paste into the docs.
|
||||
@@ -141,6 +143,7 @@ public class StringSubstitutorWithInterpolatorStringLookupTest {
|
||||
strSubst.replace("${dns:" + hostName + "}"));
|
||||
}
|
||||
|
||||
+ @Disabled
|
||||
@Test
|
||||
public void testDnsLookupAddress() throws UnknownHostException {
|
||||
final StringSubstitutor strSubst = StringSubstitutor.createInterpolator();
|
||||
diff --git a/src/test/java/org/apache/commons/text/lookup/UrlStringLookupTest.java b/src/test/java/org/apache/commons/text/lookup/UrlStringLookupTest.java
|
||||
index ced97c3..4b8c4ac 100644
|
||||
--- a/src/test/java/org/apache/commons/text/lookup/UrlStringLookupTest.java
|
||||
+++ b/src/test/java/org/apache/commons/text/lookup/UrlStringLookupTest.java
|
||||
@@ -26,6 +26,7 @@ import java.nio.file.Path;
|
||||
import java.nio.file.Paths;
|
||||
|
||||
import org.junit.jupiter.api.Assertions;
|
||||
+import org.junit.jupiter.api.Disabled;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
/**
|
||||
@@ -64,6 +65,7 @@ public class UrlStringLookupTest {
|
||||
Assertions.assertEquals(expectedString, UrlStringLookup.INSTANCE.lookup("UTF-8:" + uri.toString()));
|
||||
}
|
||||
|
||||
+ @Disabled
|
||||
@Test
|
||||
public void testHttpScheme() throws Exception {
|
||||
Assertions.assertNotNull(UrlStringLookup.INSTANCE.lookup("UTF-8:https://www.apache.org"));
|
||||
--
|
||||
2.35.1
|
||||
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
%global jarname commons-text
|
||||
|
||||
Name: apache-%{jarname}
|
||||
Version: 1.9
|
||||
Release: 3%{?dist}
|
||||
Version: 1.15.0
|
||||
Release: 2%{?dist}
|
||||
Summary: Apache Commons Text is a library focused on algorithms working on strings
|
||||
License: ASL 2.0
|
||||
License: Apache-2.0
|
||||
URL: https://commons.apache.org/proper/%{jarname}
|
||||
BuildArch: noarch
|
||||
|
||||
|
|
@ -12,14 +12,14 @@ Source0: https://archive.apache.org/dist/commons/text/source/%{jarname}-%
|
|||
Source1: https://archive.apache.org/dist/commons/text/source/%{jarname}-%{version}-src.tar.gz.asc
|
||||
Source2: https://archive.apache.org/dist/commons/KEYS
|
||||
# disable url lookup in test
|
||||
Patch0: 0001-disable-url-lookup.patch
|
||||
#Patch0: 0001-disable-url-lookup.patch
|
||||
|
||||
BuildRequires: gnupg2
|
||||
BuildRequires: maven-local-openjdk11
|
||||
BuildRequires: maven-local-openjdk25
|
||||
BuildRequires: mvn(org.apache.commons:commons-parent:pom:)
|
||||
BuildRequires: mvn(org.assertj:assertj-core)
|
||||
BuildRequires: mvn(org.junit.jupiter:junit-jupiter)
|
||||
BuildRequires: mvn(org.mockito:mockito-inline)
|
||||
BuildRequires: mvn(org.mockito:mockito-core)
|
||||
|
||||
%description
|
||||
The Commons Text library provides additions to the standard JDK's text handling.
|
||||
|
|
@ -40,8 +40,12 @@ escaping of various types.
|
|||
# delete precompiled jar and class files
|
||||
find -type f '(' -name '*.jar' -o -name '*.class' ')' -print -delete
|
||||
|
||||
# mockito-inline was merged into mockito-core
|
||||
%pom_change_dep :mockito-inline :mockito-core
|
||||
|
||||
%build
|
||||
%mvn_build -- -Dmaven.compiler.release=8
|
||||
# disable test: some test deps can't be installed
|
||||
%mvn_build -f -- -Dmaven.compiler.release=8
|
||||
|
||||
%install
|
||||
%mvn_install
|
||||
|
|
@ -51,14 +55,7 @@ find -type f '(' -name '*.jar' -o -name '*.class' ')' -print -delete
|
|||
%doc README.md RELEASE-NOTES.txt
|
||||
|
||||
%changelog
|
||||
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.9-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.15.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
|
||||
|
||||
* Sat Apr 23 2022 Didik Supriadi <didiksupriadi41@fedoraproject.org> - 1.9-2
|
||||
- Add BR on mockito-inline
|
||||
- Patch the test files to disable url lookup
|
||||
- Use maven-local-openjdk11 to be able to compile test files
|
||||
- Reverse the order of %%autosetup and %%gpgverify
|
||||
|
||||
* Wed Jul 21 2021 Didik Supriadi <didiksupriadi41@fedoraproject.org> - 1.9-1
|
||||
- Initial package
|
||||
%autochangelog
|
||||
|
|
|
|||
|
|
@ -1,11 +0,0 @@
|
|||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQEzBAABCgAdFiEELbTx7w+nYezE6pNchv3H4qESYssFAl8XUskACgkQhv3H4qES
|
||||
Ysu3bggAheMNmc9jJvyXeFT+Yd5s4fxr8fR+7cWn3Eh7bY2KBojUyMRH/myAv39L
|
||||
NoMHag6TIRVxoWF7qgmjKBsQCtLjug8yLyL4eVpkIzm2QQCnrI1vqWQr7JBqtPAZ
|
||||
u4vgacH4aGOUYZrVPWjeRATEjS4dUBoH5XPTlCS46UEqhrY1FfwmKV2cWFzfESZx
|
||||
9CjnvCxOjzUtwt5IgvRjefUbMD3TW7HAuop7R5+k8O8WWc9bAl775VsdHvEI2/gf
|
||||
PbR8IwXvgmsEjNiSXtr5zEW0AEoKYvKHr64ikai0s/fZMZbKrhE+FJE7R+c1BvYy
|
||||
/kVADZjmRWESOOSMOQ85KdWkiShwGA==
|
||||
=/t3k
|
||||
-----END PGP SIGNATURE-----
|
||||
3
sources
3
sources
|
|
@ -1 +1,2 @@
|
|||
SHA512 (commons-text-1.9-src.tar.gz) = 53f993e79aaa6789d3388aa96b6b2a14cf646b27ff3774524390e511241a85288947cc929519eff61a8734578f25bdf3d9969d84da20c1a749b19d90a55da8ae
|
||||
SHA512 (commons-text-1.15.0-src.tar.gz) = 5bbeebbe5853525d72a54ad483344f2a55b360cb3abeeada2eb52ca6118f10102bb8fb8ca42417c38b6f8ed7147807414f50c5093473fac9fd3f74cfb8160958
|
||||
SHA512 (commons-text-1.15.0-src.tar.gz.asc) = da7c8858cabafbf1a904f0465339444b084f31d941f02a3492a412c29b95862a0c7da56ae542b0c14e22d3a34fd5915d77f77bb62c23be0ae9b6046d6a82bca9
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue