Port to apache-commons-parent 65
- Remove cruft from the jakarta-servlet 5 patch
This commit is contained in:
parent
8a7b99950e
commit
5182ced99a
2 changed files with 4 additions and 26 deletions
|
|
@ -1,28 +1,6 @@
|
|||
--- commons-configuration2-2.9.0-src/src/test/java/org/apache/commons/configuration2/web/TestServletFilterConfiguration.java.orig 2022-12-30 09:12:53.000000000 -0700
|
||||
+++ commons-configuration2-2.9.0-src/src/test/java/org/apache/commons/configuration2/web/TestServletFilterConfiguration.java 2024-01-12 11:23:03.805577798 -0700
|
||||
@@ -30,10 +30,46 @@ import org.apache.commons.configuration2
|
||||
import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
+class EnumerationConverter implements Enumeration<String> {
|
||||
+ private Enumeration<?> inner;
|
||||
+
|
||||
+ public EnumerationConverter(Enumeration<?> inner) {
|
||||
+ this.inner = inner;
|
||||
+ }
|
||||
+
|
||||
+ @Override
|
||||
+ public boolean hasMoreElements() {
|
||||
+ return inner.hasMoreElements();
|
||||
+ }
|
||||
+
|
||||
+ @Override
|
||||
+ public String nextElement() {
|
||||
+ return inner.nextElement().toString();
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
/**
|
||||
+++ commons-configuration2-2.9.0-src/src/test/java/org/apache/commons/configuration2/web/TestServletFilterConfiguration.java 2024-01-31 11:38:58.281143803 -0700
|
||||
@@ -34,6 +34,24 @@ import org.junit.jupiter.api.Test;
|
||||
* Test case for the {@link ServletFilterConfiguration} class.
|
||||
*/
|
||||
public class TestServletFilterConfiguration extends TestAbstractConfiguration {
|
||||
|
|
@ -47,7 +25,7 @@
|
|||
private static class MockFilterConfig implements FilterConfig {
|
||||
private final Properties parameters = new Properties();
|
||||
|
||||
@@ -48,8 +84,8 @@ public class TestServletFilterConfigurat
|
||||
@@ -48,8 +66,8 @@ public class TestServletFilterConfigurat
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -139,7 +139,7 @@ for f in \
|
|||
done
|
||||
|
||||
%build
|
||||
%mvn_build
|
||||
%mvn_build -- -Dcommons.packageId=configuration
|
||||
|
||||
%install
|
||||
%mvn_install
|
||||
|
|
|
|||
Reference in a new issue