commons-csv git commit: Update tests from H2 database 1.4.182 to 1.4.196.

[ggregory]

Repository: commons-csv
Updated Branches:
  refs/heads/master 3dc0605e7 -> 0bdca58fc


Update tests from H2 database 1.4.182 to 1.4.196.

Project: http://git-wip-us.apache.org/repos/asf/commons-csv/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-csv/commit/0bdca58f
Tree: http://git-wip-us.apache.org/repos/asf/commons-csv/tree/0bdca58f
Diff: http://git-wip-us.apache.org/repos/asf/commons-csv/diff/0bdca58f

Branch: refs/heads/master
Commit: 0bdca58fc04f4a0d122fc3f3d25797d27f8a11d5
Parents: 3dc0605
Author: Gary Gregory 
Authored: Wed Jun 14 22:52:11 2017 -0700
Committer: Gary Gregory 
Committed: Wed Jun 14 22:52:11 2017 -0700

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/commons-csv/blob/0bdca58f/pom.xml
--
diff --git a/pom.xml b/pom.xml
index e319c5a..ab0bf9d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,7 +53,7 @@ CSV files of various types.
 
   com.h2database
   h2
-  1.4.182
+  1.4.196
   test
 
   

commons-csv git commit: Update Apache Commons Lang 3.4 to 3.6.

[ggregory]

Repository: commons-csv
Updated Branches:
  refs/heads/master 3522de82c -> 3dc0605e7


Update Apache Commons Lang 3.4 to 3.6.

Project: http://git-wip-us.apache.org/repos/asf/commons-csv/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-csv/commit/3dc0605e
Tree: http://git-wip-us.apache.org/repos/asf/commons-csv/tree/3dc0605e
Diff: http://git-wip-us.apache.org/repos/asf/commons-csv/diff/3dc0605e

Branch: refs/heads/master
Commit: 3dc0605e7ed923e08a317b0e6414dcacd46e2573
Parents: 3522de8
Author: Gary Gregory 
Authored: Wed Jun 14 22:51:02 2017 -0700
Committer: Gary Gregory 
Committed: Wed Jun 14 22:51:02 2017 -0700

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/commons-csv/blob/3dc0605e/pom.xml
--
diff --git a/pom.xml b/pom.xml
index fd116a1..e319c5a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,7 @@ CSV files of various types.
 
   org.apache.commons
   commons-lang3
-  3.4
+  3.6
   test
 
 

commons-csv git commit: Update Apache Commons Lang 3.4 to 3.6.

[ggregory]

Repository: commons-csv
Updated Branches:
  refs/heads/master e3c8d5fcc -> 3522de82c


Update Apache Commons Lang 3.4 to 3.6.

Project: http://git-wip-us.apache.org/repos/asf/commons-csv/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-csv/commit/3522de82
Tree: http://git-wip-us.apache.org/repos/asf/commons-csv/tree/3522de82
Diff: http://git-wip-us.apache.org/repos/asf/commons-csv/diff/3522de82

Branch: refs/heads/master
Commit: 3522de82cc0703c585a2476474dfc0cf61dd4a14
Parents: e3c8d5f
Author: Gary Gregory 
Authored: Wed Jun 14 22:44:09 2017 -0700
Committer: Gary Gregory 
Committed: Wed Jun 14 22:44:09 2017 -0700

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/commons-csv/blob/3522de82/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 6dfc151..fd116a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -450,7 +450,7 @@ CSV files of various types.
 
   org.apache.commons
   commons-lang3
-  3.4
+  3.6
 
   
 

[text] TEXT-92: Update commons-lang dependency to version 3.6

[pascalschumacher]

Repository: commons-text
Updated Branches:
  refs/heads/master 0029f139b -> 0914cb2cb


TEXT-92: Update commons-lang dependency to version 3.6


Project: http://git-wip-us.apache.org/repos/asf/commons-text/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-text/commit/0914cb2c
Tree: http://git-wip-us.apache.org/repos/asf/commons-text/tree/0914cb2c
Diff: http://git-wip-us.apache.org/repos/asf/commons-text/diff/0914cb2c

Branch: refs/heads/master
Commit: 0914cb2cb80ee74f5ba46184309ad11b34b981e9
Parents: 0029f13
Author: Pascal Schumacher 
Authored: Wed Jun 14 23:40:39 2017 +0200
Committer: Pascal Schumacher 
Committed: Wed Jun 14 23:40:39 2017 +0200

--
 pom.xml | 2 +-
 src/changes/changes.xml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/commons-text/blob/0914cb2c/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 809d105..0ce1864 100644
--- a/pom.xml
+++ b/pom.xml
@@ -101,7 +101,7 @@
 
   org.apache.commons
   commons-lang3
-  3.5
+  3.6
 
 
 

http://git-wip-us.apache.org/repos/asf/commons-text/blob/0914cb2c/src/changes/changes.xml
--
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 9d9971e..86abf92 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -46,6 +46,7 @@ The  type attribute can be add,update,fix,remove.
   
 
   
+Update 
commons-lang dependency to version 3.6
 Document that commons-csv should be used in preference to 
CsvTranslators
 NumericEntityUnescaper.options - fix TODO
 RandomStringGenerator 
claims to be immutable, but isn't

svn commit: r1798730 - in /commons/proper/jelly/trunk: build.properties.sample build.xml maven.xml parent-project.xml project.properties project.xml

[oheger]

Author: oheger
Date: Wed Jun 14 17:30:44 2017
New Revision: 1798730

URL: http://svn.apache.org/viewvc?rev=1798730=rev
Log:
Removed build files for ant and Maven 1.

Removed:
commons/proper/jelly/trunk/build.properties.sample
commons/proper/jelly/trunk/build.xml
commons/proper/jelly/trunk/maven.xml
commons/proper/jelly/trunk/parent-project.xml
commons/proper/jelly/trunk/project.properties
commons/proper/jelly/trunk/project.xml

svn commit: r1798729 - in /commons/proper/jelly/trunk/src: main/java/org/apache/commons/jelly/parser/ test/java/org/apache/commons/jelly/ test/java/org/apache/commons/jelly/core/ test/java/org/apache/

[oheger]

Author: oheger
Date: Wed Jun 14 17:30:30 2017
New Revision: 1798729

URL: http://svn.apache.org/viewvc?rev=1798729=rev
Log:
Fixed some test cases that were broken when moving source files.

Modified:

commons/proper/jelly/trunk/src/main/java/org/apache/commons/jelly/parser/XMLParser.java

commons/proper/jelly/trunk/src/test/java/org/apache/commons/jelly/TestCoreTags.java

commons/proper/jelly/trunk/src/test/java/org/apache/commons/jelly/core/TestIncludeTag.java

commons/proper/jelly/trunk/src/test/java/org/apache/commons/jelly/test/xml/TestCData.java

Modified: 
commons/proper/jelly/trunk/src/main/java/org/apache/commons/jelly/parser/XMLParser.java
URL: 
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/src/main/java/org/apache/commons/jelly/parser/XMLParser.java?rev=1798729=1798728=1798729=diff
==
--- 
commons/proper/jelly/trunk/src/main/java/org/apache/commons/jelly/parser/XMLParser.java
 (original)
+++ 
commons/proper/jelly/trunk/src/main/java/org/apache/commons/jelly/parser/XMLParser.java
 Wed Jun 14 17:30:30 2017
@@ -995,7 +995,7 @@ public class XMLParser extends DefaultHa
 
 InputStream in = null;
 URL url =
-
getClassLoader().getResource("src/main/resources/org/apache/commons/jelly/jelly.properties");
+
getClassLoader().getResource("org/apache/commons/jelly/jelly.properties");
 if (url != null) {
 log.debug("Loading Jelly default tag libraries from: " + url);
 try {

Modified: 
commons/proper/jelly/trunk/src/test/java/org/apache/commons/jelly/TestCoreTags.java
URL: 
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/src/test/java/org/apache/commons/jelly/TestCoreTags.java?rev=1798729=1798728=1798729=diff
==
--- 
commons/proper/jelly/trunk/src/test/java/org/apache/commons/jelly/TestCoreTags.java
 (original)
+++ 
commons/proper/jelly/trunk/src/test/java/org/apache/commons/jelly/TestCoreTags.java
 Wed Jun 14 17:30:30 2017
@@ -53,7 +53,7 @@ public class TestCoreTags extends TestCa
 }
 
 public void testArgs() throws Exception {
-InputStream in = new 
FileInputStream("src/test/org/apache/commons/jelly/test_args.jelly");
+InputStream in = new 
FileInputStream("src/test/resources/org/apache/commons/jelly/test_args.jelly");
 XMLParser parser = new XMLParser();
 Script script = parser.parse(in);
 script = script.compile();
@@ -109,7 +109,7 @@ public class TestCoreTags extends TestCa
 
 
 public void testStaticNamespacedAttributes() throws Exception {
-InputStream in = new 
FileInputStream("src/test/org/apache/commons/jelly/testStaticNamespacedAttributes.jelly");
+InputStream in = new 
FileInputStream("src/test/resources/org/apache/commons/jelly/testStaticNamespacedAttributes.jelly");
 XMLParser parser = new XMLParser();
 Script script = parser.parse(in);
 script = script.compile();

Modified: 
commons/proper/jelly/trunk/src/test/java/org/apache/commons/jelly/core/TestIncludeTag.java
URL: 
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/src/test/java/org/apache/commons/jelly/core/TestIncludeTag.java?rev=1798729=1798728=1798729=diff
==
--- 
commons/proper/jelly/trunk/src/test/java/org/apache/commons/jelly/core/TestIncludeTag.java
 (original)
+++ 
commons/proper/jelly/trunk/src/test/java/org/apache/commons/jelly/core/TestIncludeTag.java
 Wed Jun 14 17:30:30 2017
@@ -114,7 +114,7 @@ public class TestIncludeTag extends Test
  */
 public void testFileInclude() throws Exception {
 // testing outermost
-setUpFromURL(new 
URL("file:src/test/org/apache/commons/jelly/core/a.jelly"));
+setUpFromURL(new 
URL("file:src/test/resources/org/apache/commons/jelly/core/a.jelly"));
 Script script = jelly.compileScript();
 script.run(context,xmlOutput);
 assertTrue("should have set 'c' variable to 'true'",

Modified: 
commons/proper/jelly/trunk/src/test/java/org/apache/commons/jelly/test/xml/TestCData.java
URL: 
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/src/test/java/org/apache/commons/jelly/test/xml/TestCData.java?rev=1798729=1798728=1798729=diff
==
--- 
commons/proper/jelly/trunk/src/test/java/org/apache/commons/jelly/test/xml/TestCData.java
 (original)
+++ 
commons/proper/jelly/trunk/src/test/java/org/apache/commons/jelly/test/xml/TestCData.java
 Wed Jun 14 17:30:30 2017
@@ -45,7 +45,7 @@ public class TestCData extends TestCase
  */
 public void testCData() throws Exception {
 Jelly jelly = new Jelly();
-
jelly.setScript("file:src/test/org/apache/commons/jelly/test/xml/testCData.jelly");
+

svn commit: r1798728 [2/2] - in /commons/proper/jelly/trunk: ./ src/main/java/org/apache/commons/jelly/ src/main/java/org/apache/commons/jelly/parser/ src/main/java/org/apache/commons/jelly/tags/ src/

[oheger]

Copied: 
commons/proper/jelly/trunk/src/test/resources/org/apache/commons/jelly/core/testNamespacePrefixes.xml
 (from r1798721, 
commons/proper/jelly/trunk/src/test/org/apache/commons/jelly/core/testNamespacePrefixes.xml)
URL: 
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/src/test/resources/org/apache/commons/jelly/core/testNamespacePrefixes.xml?p2=commons/proper/jelly/trunk/src/test/resources/org/apache/commons/jelly/core/testNamespacePrefixes.xml=commons/proper/jelly/trunk/src/test/org/apache/commons/jelly/core/testNamespacePrefixes.xml=1798721=1798728=1798728=diff
==
(empty)

Copied: 
commons/proper/jelly/trunk/src/test/resources/org/apache/commons/jelly/core/testNestedExceptions.xml
 (from r1798721, 
commons/proper/jelly/trunk/src/test/org/apache/commons/jelly/core/testNestedExceptions.xml)
URL: 
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/src/test/resources/org/apache/commons/jelly/core/testNestedExceptions.xml?p2=commons/proper/jelly/trunk/src/test/resources/org/apache/commons/jelly/core/testNestedExceptions.xml=commons/proper/jelly/trunk/src/test/org/apache/commons/jelly/core/testNestedExceptions.xml=1798721=1798728=1798728=diff
==
(empty)

Copied: 
commons/proper/jelly/trunk/src/test/resources/org/apache/commons/jelly/core/testNewCatchTag.xml
 (from r1798721, 
commons/proper/jelly/trunk/src/test/org/apache/commons/jelly/core/testNewCatchTag.xml)
URL: 
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/src/test/resources/org/apache/commons/jelly/core/testNewCatchTag.xml?p2=commons/proper/jelly/trunk/src/test/resources/org/apache/commons/jelly/core/testNewCatchTag.xml=commons/proper/jelly/trunk/src/test/org/apache/commons/jelly/core/testNewCatchTag.xml=1798721=1798728=1798728=diff
==
(empty)

Copied: 
commons/proper/jelly/trunk/src/test/resources/org/apache/commons/jelly/core/testNewTag.jelly
 (from r1798721, 
commons/proper/jelly/trunk/src/test/org/apache/commons/jelly/core/testNewTag.jelly)
URL: 
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/src/test/resources/org/apache/commons/jelly/core/testNewTag.jelly?p2=commons/proper/jelly/trunk/src/test/resources/org/apache/commons/jelly/core/testNewTag.jelly=commons/proper/jelly/trunk/src/test/org/apache/commons/jelly/core/testNewTag.jelly=1798721=1798728=1798728=diff
==
(empty)

Copied: 
commons/proper/jelly/trunk/src/test/resources/org/apache/commons/jelly/core/testSeveralSwitchCall.jelly
 (from r1798721, 
commons/proper/jelly/trunk/src/test/org/apache/commons/jelly/core/testSeveralSwitchCall.jelly)
URL: 
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/src/test/resources/org/apache/commons/jelly/core/testSeveralSwitchCall.jelly?p2=commons/proper/jelly/trunk/src/test/resources/org/apache/commons/jelly/core/testSeveralSwitchCall.jelly=commons/proper/jelly/trunk/src/test/org/apache/commons/jelly/core/testSeveralSwitchCall.jelly=1798721=1798728=1798728=diff
==
(empty)

Copied: 
commons/proper/jelly/trunk/src/test/resources/org/apache/commons/jelly/core/testSwitchTag.jelly
 (from r1798721, 
commons/proper/jelly/trunk/src/test/org/apache/commons/jelly/core/testSwitchTag.jelly)
URL: 
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/src/test/resources/org/apache/commons/jelly/core/testSwitchTag.jelly?p2=commons/proper/jelly/trunk/src/test/resources/org/apache/commons/jelly/core/testSwitchTag.jelly=commons/proper/jelly/trunk/src/test/org/apache/commons/jelly/core/testSwitchTag.jelly=1798721=1798728=1798728=diff
==
(empty)

Copied: 
commons/proper/jelly/trunk/src/test/resources/org/apache/commons/jelly/core/testUnknownTags.xml
 (from r1798721, 
commons/proper/jelly/trunk/src/test/org/apache/commons/jelly/core/testUnknownTags.xml)
URL: 
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/src/test/resources/org/apache/commons/jelly/core/testUnknownTags.xml?p2=commons/proper/jelly/trunk/src/test/resources/org/apache/commons/jelly/core/testUnknownTags.xml=commons/proper/jelly/trunk/src/test/org/apache/commons/jelly/core/testUnknownTags.xml=1798721=1798728=1798728=diff
==
(empty)

Copied: 
commons/proper/jelly/trunk/src/test/resources/org/apache/commons/jelly/core/testUseBeanTag.jelly
 (from r1798721, 
commons/proper/jelly/trunk/src/test/org/apache/commons/jelly/core/testUseBeanTag.jelly)
URL: 

svn commit: r1798728 [1/2] - in /commons/proper/jelly/trunk: ./ src/main/java/org/apache/commons/jelly/ src/main/java/org/apache/commons/jelly/parser/ src/main/java/org/apache/commons/jelly/tags/ src/

[oheger]

Author: oheger
Date: Wed Jun 14 17:29:05 2017
New Revision: 1798728

URL: http://svn.apache.org/viewvc?rev=1798728=rev
Log:
Used default directory layout for test files and test resources.

Added:
commons/proper/jelly/trunk/src/main/resources/
commons/proper/jelly/trunk/src/main/resources/org/
commons/proper/jelly/trunk/src/main/resources/org/apache/
commons/proper/jelly/trunk/src/main/resources/org/apache/commons/
commons/proper/jelly/trunk/src/main/resources/org/apache/commons/jelly/

commons/proper/jelly/trunk/src/main/resources/org/apache/commons/jelly/jelly.properties
  - copied, changed from r1798721, 
commons/proper/jelly/trunk/src/main/java/org/apache/commons/jelly/jelly.properties
commons/proper/jelly/trunk/src/main/resources/org/apache/commons/jelly/tags/

commons/proper/jelly/trunk/src/main/resources/org/apache/commons/jelly/tags/Resources.properties
  - copied, changed from r1798721, 
commons/proper/jelly/trunk/src/main/java/org/apache/commons/jelly/tags/Resources.properties
commons/proper/jelly/trunk/src/test/java/
commons/proper/jelly/trunk/src/test/java/org/
commons/proper/jelly/trunk/src/test/java/org/apache/
commons/proper/jelly/trunk/src/test/java/org/apache/commons/
commons/proper/jelly/trunk/src/test/java/org/apache/commons/jelly/

commons/proper/jelly/trunk/src/test/java/org/apache/commons/jelly/TJEcho.java
  - copied, changed from r1798721, 
commons/proper/jelly/trunk/src/test/org/apache/commons/jelly/TJEcho.java

commons/proper/jelly/trunk/src/test/java/org/apache/commons/jelly/TJTagLibrary.java
  - copied, changed from r1798721, 
commons/proper/jelly/trunk/src/test/org/apache/commons/jelly/TJTagLibrary.java

commons/proper/jelly/trunk/src/test/java/org/apache/commons/jelly/TJTest.java
  - copied, changed from r1798721, 
commons/proper/jelly/trunk/src/test/org/apache/commons/jelly/TJTest.java

commons/proper/jelly/trunk/src/test/java/org/apache/commons/jelly/TestCoreTags.java
  - copied, changed from r1798721, 
commons/proper/jelly/trunk/src/test/org/apache/commons/jelly/TestCoreTags.java

commons/proper/jelly/trunk/src/test/java/org/apache/commons/jelly/TestJelly.java
  - copied, changed from r1798721, 
commons/proper/jelly/trunk/src/test/org/apache/commons/jelly/TestJelly.java

commons/proper/jelly/trunk/src/test/java/org/apache/commons/jelly/TestJellyContext.java
  - copied, changed from r1798721, 
commons/proper/jelly/trunk/src/test/org/apache/commons/jelly/TestJellyContext.java

commons/proper/jelly/trunk/src/test/java/org/apache/commons/jelly/TestTrim.java
  - copied, changed from r1798721, 
commons/proper/jelly/trunk/src/test/org/apache/commons/jelly/TestTrim.java

commons/proper/jelly/trunk/src/test/java/org/apache/commons/jelly/TestXMLOutput.java
  - copied, changed from r1798721, 
commons/proper/jelly/trunk/src/test/org/apache/commons/jelly/TestXMLOutput.java
commons/proper/jelly/trunk/src/test/java/org/apache/commons/jelly/core/

commons/proper/jelly/trunk/src/test/java/org/apache/commons/jelly/core/BaseMemoryLeakTest.java
  - copied, changed from r1798721, 
commons/proper/jelly/trunk/src/test/org/apache/commons/jelly/core/BaseMemoryLeakTest.java

commons/proper/jelly/trunk/src/test/java/org/apache/commons/jelly/core/Customer.java
  - copied, changed from r1798721, 
commons/proper/jelly/trunk/src/test/org/apache/commons/jelly/core/Customer.java

commons/proper/jelly/trunk/src/test/java/org/apache/commons/jelly/core/ExceptionBean.java
  - copied, changed from r1798721, 
commons/proper/jelly/trunk/src/test/org/apache/commons/jelly/core/ExceptionBean.java

commons/proper/jelly/trunk/src/test/java/org/apache/commons/jelly/core/ModularExceptionBean.java
  - copied, changed from r1798721, 
commons/proper/jelly/trunk/src/test/org/apache/commons/jelly/core/ModularExceptionBean.java

commons/proper/jelly/trunk/src/test/java/org/apache/commons/jelly/core/Order.java
  - copied, changed from r1798721, 
commons/proper/jelly/trunk/src/test/org/apache/commons/jelly/core/Order.java

commons/proper/jelly/trunk/src/test/java/org/apache/commons/jelly/core/Product.java
  - copied, changed from r1798721, 
commons/proper/jelly/trunk/src/test/org/apache/commons/jelly/core/Product.java

commons/proper/jelly/trunk/src/test/java/org/apache/commons/jelly/core/TestArgTag.java
  - copied, changed from r1798721, 
commons/proper/jelly/trunk/src/test/org/apache/commons/jelly/core/TestArgTag.java

commons/proper/jelly/trunk/src/test/java/org/apache/commons/jelly/core/TestBreakTag.java
  - copied, changed from r1798721, 
commons/proper/jelly/trunk/src/test/org/apache/commons/jelly/core/TestBreakTag.java

commons/proper/jelly/trunk/src/test/java/org/apache/commons/jelly/core/TestCatchTag.java
  - copied, changed from r1798721, 
commons/proper/jelly/trunk/src/test/org/apache/commons/jelly/core/TestCatchTag.java

svn commit: r1798721 [1/2] - in /commons/proper/jelly/trunk: ./ src/java/org/apache/commons/jelly/ src/java/org/apache/commons/jelly/expression/ src/java/org/apache/commons/jelly/expression/jexl/ src/

[oheger]

Author: oheger
Date: Wed Jun 14 17:21:23 2017
New Revision: 1798721

URL: http://svn.apache.org/viewvc?rev=1798721=rev
Log:
Used default directory layout for Java source files.

Added:
commons/proper/jelly/trunk/src/main/
commons/proper/jelly/trunk/src/main/java/
commons/proper/jelly/trunk/src/main/java/org/
commons/proper/jelly/trunk/src/main/java/org/apache/
commons/proper/jelly/trunk/src/main/java/org/apache/commons/
commons/proper/jelly/trunk/src/main/java/org/apache/commons/jelly/

commons/proper/jelly/trunk/src/main/java/org/apache/commons/jelly/CompilableTag.java
  - copied, changed from r1798719, 
commons/proper/jelly/trunk/src/java/org/apache/commons/jelly/CompilableTag.java

commons/proper/jelly/trunk/src/main/java/org/apache/commons/jelly/DynaBeanTagSupport.java
  - copied, changed from r1798719, 
commons/proper/jelly/trunk/src/java/org/apache/commons/jelly/DynaBeanTagSupport.java

commons/proper/jelly/trunk/src/main/java/org/apache/commons/jelly/DynaTag.java
  - copied, changed from r1798719, 
commons/proper/jelly/trunk/src/java/org/apache/commons/jelly/DynaTag.java

commons/proper/jelly/trunk/src/main/java/org/apache/commons/jelly/DynaTagSupport.java
  - copied, changed from r1798719, 
commons/proper/jelly/trunk/src/java/org/apache/commons/jelly/DynaTagSupport.java
commons/proper/jelly/trunk/src/main/java/org/apache/commons/jelly/Jelly.java
  - copied, changed from r1798719, 
commons/proper/jelly/trunk/src/java/org/apache/commons/jelly/Jelly.java

commons/proper/jelly/trunk/src/main/java/org/apache/commons/jelly/JellyContext.java
  - copied, changed from r1798719, 
commons/proper/jelly/trunk/src/java/org/apache/commons/jelly/JellyContext.java

commons/proper/jelly/trunk/src/main/java/org/apache/commons/jelly/JellyException.java
  - copied, changed from r1798719, 
commons/proper/jelly/trunk/src/java/org/apache/commons/jelly/JellyException.java

commons/proper/jelly/trunk/src/main/java/org/apache/commons/jelly/JellyTagException.java
  - copied, changed from r1798719, 
commons/proper/jelly/trunk/src/java/org/apache/commons/jelly/JellyTagException.java

commons/proper/jelly/trunk/src/main/java/org/apache/commons/jelly/LocationAware.java
  - copied, changed from r1798719, 
commons/proper/jelly/trunk/src/java/org/apache/commons/jelly/LocationAware.java

commons/proper/jelly/trunk/src/main/java/org/apache/commons/jelly/MapTagSupport.java
  - copied, changed from r1798719, 
commons/proper/jelly/trunk/src/java/org/apache/commons/jelly/MapTagSupport.java

commons/proper/jelly/trunk/src/main/java/org/apache/commons/jelly/MissingAttributeException.java
  - copied, changed from r1798719, 
commons/proper/jelly/trunk/src/java/org/apache/commons/jelly/MissingAttributeException.java

commons/proper/jelly/trunk/src/main/java/org/apache/commons/jelly/NamespaceAwareTag.java
  - copied, changed from r1798719, 
commons/proper/jelly/trunk/src/java/org/apache/commons/jelly/NamespaceAwareTag.java

commons/proper/jelly/trunk/src/main/java/org/apache/commons/jelly/Script.java
  - copied, changed from r1798719, 
commons/proper/jelly/trunk/src/java/org/apache/commons/jelly/Script.java
commons/proper/jelly/trunk/src/main/java/org/apache/commons/jelly/Tag.java
  - copied, changed from r1798719, 
commons/proper/jelly/trunk/src/java/org/apache/commons/jelly/Tag.java

commons/proper/jelly/trunk/src/main/java/org/apache/commons/jelly/TagLibrary.java
  - copied, changed from r1798719, 
commons/proper/jelly/trunk/src/java/org/apache/commons/jelly/TagLibrary.java

commons/proper/jelly/trunk/src/main/java/org/apache/commons/jelly/TagSupport.java
  - copied, changed from r1798719, 
commons/proper/jelly/trunk/src/java/org/apache/commons/jelly/TagSupport.java

commons/proper/jelly/trunk/src/main/java/org/apache/commons/jelly/XMLOutput.java
  - copied, changed from r1798719, 
commons/proper/jelly/trunk/src/java/org/apache/commons/jelly/XMLOutput.java

commons/proper/jelly/trunk/src/main/java/org/apache/commons/jelly/expression/

commons/proper/jelly/trunk/src/main/java/org/apache/commons/jelly/expression/CompositeExpression.java
  - copied, changed from r1798719, 
commons/proper/jelly/trunk/src/java/org/apache/commons/jelly/expression/CompositeExpression.java

commons/proper/jelly/trunk/src/main/java/org/apache/commons/jelly/expression/ConstantExpression.java
  - copied, changed from r1798719, 
commons/proper/jelly/trunk/src/java/org/apache/commons/jelly/expression/ConstantExpression.java

commons/proper/jelly/trunk/src/main/java/org/apache/commons/jelly/expression/Expression.java
  - copied, changed from r1798719, 
commons/proper/jelly/trunk/src/java/org/apache/commons/jelly/expression/Expression.java

commons/proper/jelly/trunk/src/main/java/org/apache/commons/jelly/expression/ExpressionFactory.java
  - copied, changed from r1798719, 

svn commit: r1798721 [2/2] - in /commons/proper/jelly/trunk: ./ src/java/org/apache/commons/jelly/ src/java/org/apache/commons/jelly/expression/ src/java/org/apache/commons/jelly/expression/jexl/ src/

[oheger]

Copied: 
commons/proper/jelly/trunk/src/main/java/org/apache/commons/jelly/tags/core/UseBeanTag.java
 (from r1798719, 
commons/proper/jelly/trunk/src/java/org/apache/commons/jelly/tags/core/UseBeanTag.java)
URL: 
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/src/main/java/org/apache/commons/jelly/tags/core/UseBeanTag.java?p2=commons/proper/jelly/trunk/src/main/java/org/apache/commons/jelly/tags/core/UseBeanTag.java=commons/proper/jelly/trunk/src/java/org/apache/commons/jelly/tags/core/UseBeanTag.java=1798719=1798721=1798721=diff
==
(empty)

Copied: 
commons/proper/jelly/trunk/src/main/java/org/apache/commons/jelly/tags/core/UseListTag.java
 (from r1798719, 
commons/proper/jelly/trunk/src/java/org/apache/commons/jelly/tags/core/UseListTag.java)
URL: 
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/src/main/java/org/apache/commons/jelly/tags/core/UseListTag.java?p2=commons/proper/jelly/trunk/src/main/java/org/apache/commons/jelly/tags/core/UseListTag.java=commons/proper/jelly/trunk/src/java/org/apache/commons/jelly/tags/core/UseListTag.java=1798719=1798721=1798721=diff
==
(empty)

Copied: 
commons/proper/jelly/trunk/src/main/java/org/apache/commons/jelly/tags/core/WhenTag.java
 (from r1798719, 
commons/proper/jelly/trunk/src/java/org/apache/commons/jelly/tags/core/WhenTag.java)
URL: 
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/src/main/java/org/apache/commons/jelly/tags/core/WhenTag.java?p2=commons/proper/jelly/trunk/src/main/java/org/apache/commons/jelly/tags/core/WhenTag.java=commons/proper/jelly/trunk/src/java/org/apache/commons/jelly/tags/core/WhenTag.java=1798719=1798721=1798721=diff
==
(empty)

Copied: 
commons/proper/jelly/trunk/src/main/java/org/apache/commons/jelly/tags/core/WhileTag.java
 (from r1798719, 
commons/proper/jelly/trunk/src/java/org/apache/commons/jelly/tags/core/WhileTag.java)
URL: 
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/src/main/java/org/apache/commons/jelly/tags/core/WhileTag.java?p2=commons/proper/jelly/trunk/src/main/java/org/apache/commons/jelly/tags/core/WhileTag.java=commons/proper/jelly/trunk/src/java/org/apache/commons/jelly/tags/core/WhileTag.java=1798719=1798721=1798721=diff
==
(empty)

Copied: 
commons/proper/jelly/trunk/src/main/java/org/apache/commons/jelly/tags/core/WhitespaceTag.java
 (from r1798719, 
commons/proper/jelly/trunk/src/java/org/apache/commons/jelly/tags/core/WhitespaceTag.java)
URL: 
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/src/main/java/org/apache/commons/jelly/tags/core/WhitespaceTag.java?p2=commons/proper/jelly/trunk/src/main/java/org/apache/commons/jelly/tags/core/WhitespaceTag.java=commons/proper/jelly/trunk/src/java/org/apache/commons/jelly/tags/core/WhitespaceTag.java=1798719=1798721=1798721=diff
==
(empty)

Copied: 
commons/proper/jelly/trunk/src/main/java/org/apache/commons/jelly/tags/core/package.html
 (from r1798719, 
commons/proper/jelly/trunk/src/java/org/apache/commons/jelly/tags/core/package.html)
URL: 
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/src/main/java/org/apache/commons/jelly/tags/core/package.html?p2=commons/proper/jelly/trunk/src/main/java/org/apache/commons/jelly/tags/core/package.html=commons/proper/jelly/trunk/src/java/org/apache/commons/jelly/tags/core/package.html=1798719=1798721=1798721=diff
==
(empty)

Copied: 
commons/proper/jelly/trunk/src/main/java/org/apache/commons/jelly/test/BaseJellyTest.java
 (from r1798719, 
commons/proper/jelly/trunk/src/java/org/apache/commons/jelly/test/BaseJellyTest.java)
URL: 
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/src/main/java/org/apache/commons/jelly/test/BaseJellyTest.java?p2=commons/proper/jelly/trunk/src/main/java/org/apache/commons/jelly/test/BaseJellyTest.java=commons/proper/jelly/trunk/src/java/org/apache/commons/jelly/test/BaseJellyTest.java=1798719=1798721=1798721=diff
==
(empty)

Copied: 
commons/proper/jelly/trunk/src/main/java/org/apache/commons/jelly/util/ClassLoaderUtils.java
 (from r1798719, 
commons/proper/jelly/trunk/src/java/org/apache/commons/jelly/util/ClassLoaderUtils.java)
URL: 
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/src/main/java/org/apache/commons/jelly/util/ClassLoaderUtils.java?p2=commons/proper/jelly/trunk/src/main/java/org/apache/commons/jelly/util/ClassLoaderUtils.java=commons/proper/jelly/trunk/src/java/org/apache/commons/jelly/util/ClassLoaderUtils.java=1798719=1798721=1798721=diff

svn commit: r1798719 - /commons/proper/jelly/trunk/.gitignore

[oheger]

Author: oheger
Date: Wed Jun 14 17:15:15 2017
New Revision: 1798719

URL: http://svn.apache.org/viewvc?rev=1798719=rev
Log:
Added basic .gitignore file.

Added:
commons/proper/jelly/trunk/.gitignore

Added: commons/proper/jelly/trunk/.gitignore
URL: 
http://svn.apache.org/viewvc/commons/proper/jelly/trunk/.gitignore?rev=1798719=auto
==
--- commons/proper/jelly/trunk/.gitignore (added)
+++ commons/proper/jelly/trunk/.gitignore Wed Jun 14 17:15:15 2017
@@ -0,0 +1,19 @@
+# Maven build files
+target
+*.log
+maven-eclipse.xml
+build.properties
+site-content
+*~
+
+# IntelliJ IDEA files
+.idea
+.iws
+*.iml
+*.ipr
+
+# Eclipse files
+.settings
+.classpath
+.project
+.externalToolBuilders

svn commit: r1798717 - /commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWaitFacade.java

[tv]

Author: tv
Date: Wed Jun 14 16:59:04 2017
New Revision: 1798717

URL: http://svn.apache.org/viewvc?rev=1798717=rev
Log:
Sometimes Eclipse just drives me mad...

Modified:

commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWaitFacade.java

Modified: 
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWaitFacade.java
URL: 
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWaitFacade.java?rev=1798717=1798716=1798717=diff
==
--- 
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWaitFacade.java
 (original)
+++ 
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWaitFacade.java
 Wed Jun 14 16:59:04 2017
@@ -1,5 +1,24 @@
 package org.apache.commons.jcs.auxiliary.remote;
 
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+
 import java.util.List;
 
 import org.apache.commons.jcs.auxiliary.remote.server.behavior.RemoteType;

svn commit: r1798716 - /commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWaitFacade.java

[tv]

Author: tv
Date: Wed Jun 14 16:57:34 2017
New Revision: 1798716

URL: http://svn.apache.org/viewvc?rev=1798716=rev
Log:
Preliminary fix for JCS-178

Modified:

commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWaitFacade.java

Modified: 
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWaitFacade.java
URL: 
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWaitFacade.java?rev=1798716=1798715=1798716=diff
==
--- 
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWaitFacade.java
 (original)
+++ 
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWaitFacade.java
 Wed Jun 14 16:57:34 2017
@@ -1,25 +1,5 @@
 package org.apache.commons.jcs.auxiliary.remote;
 
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
- */
-
-import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.commons.jcs.auxiliary.remote.server.behavior.RemoteType;
@@ -68,10 +48,9 @@ public class RemoteCacheNoWaitFacade rcnw : new ArrayList>(this.noWaits))
+for (RemoteCacheNoWait rcnw : this.noWaits)
 {
 ((RemoteCache)rcnw.getRemoteCache()).setFacade(this);
-this.noWaits.add(rcnw);
 }
 }
 

svn commit: r1798715 - in /commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control: CompositeCache.java CompositeCacheConfigurator.java

[tv]

Author: tv
Date: Wed Jun 14 16:42:50 2017
New Revision: 1798715

URL: http://svn.apache.org/viewvc?rev=1798715=rev
Log:
Approach to fix JCS-177

Modified:

commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/CompositeCache.java

commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/CompositeCacheConfigurator.java

Modified: 
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/CompositeCache.java
URL: 
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/CompositeCache.java?rev=1798715=1798714=1798715=diff
==
--- 
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/CompositeCache.java
 (original)
+++ 
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/CompositeCache.java
 Wed Jun 14 16:42:50 2017
@@ -111,6 +111,9 @@ public class CompositeCache
 /** Count of misses where element was expired. */
 private AtomicInteger missCountExpired;
 
+/** Cache manager. */
+private CompositeCacheManager cacheManager = null;
+
 /**
  * The cache hub can only have one memory cache. This could be made more 
flexible in the future,
  * but they are tied closely together. More than one doesn't make much 
sense.
@@ -159,6 +162,16 @@ public class CompositeCache
 }
 
 /**
+ * Injector for cache manager
+ *
+ * @param manager
+ */
+public void setCompositeCacheManager( CompositeCacheManager manager )
+{
+this.cacheManager = manager;
+}
+
+/**
  * @see 
org.apache.commons.jcs.engine.behavior.IRequireScheduler#setScheduledExecutorService(java.util.concurrent.ScheduledExecutorService)
  */
 @Override
@@ -1286,19 +1299,26 @@ public class CompositeCache
  */
 public void dispose( boolean fromRemote )
 {
-if ( log.isInfoEnabled() )
+ // If already disposed, return immediately
+if ( alive.compareAndSet(true, false) == false )
 {
-log.info( "In DISPOSE, [" + this.cacheAttr.getCacheName() + "] 
fromRemote [" + fromRemote + "]" );
+return;
 }
 
-// If already disposed, return immediately
-if ( alive.compareAndSet(true, false) == false )
+if ( log.isInfoEnabled() )
 {
-return;
+log.info( "In DISPOSE, [" + this.cacheAttr.getCacheName() + "] 
fromRemote [" + fromRemote + "]" );
 }
 
 synchronized (this)
 {
+// Remove us from the cache managers list
+// This will call us back but exit immediately
+if (cacheManager != null)
+{
+cacheManager.freeCache(getCacheName(), fromRemote);
+}
+
 // Try to stop shrinker thread
 if (future != null)
 {

Modified: 
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/CompositeCacheConfigurator.java
URL: 
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/CompositeCacheConfigurator.java?rev=1798715=1798714=1798715=diff
==
--- 
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/CompositeCacheConfigurator.java
 (original)
+++ 
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/CompositeCacheConfigurator.java
 Wed Jun 14 16:42:50 2017
@@ -207,6 +207,9 @@ public class CompositeCacheConfigurator
 ccm.getDefaultCacheAttributes(), regionPrefix ), ea )
 : new CompositeCache( cca, ea );
 
+// Inject cache manager
+cache.setCompositeCacheManager(ccm);
+
 // Inject scheduler service
 cache.setScheduledExecutorService(ccm.getScheduledExecutorService());
 

svn commit: r1798714 - /commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/CompositeCacheManager.java

[tv]

Author: tv
Date: Wed Jun 14 16:40:57 2017
New Revision: 1798714

URL: http://svn.apache.org/viewvc?rev=1798714=rev
Log:
Make sure that attributes are cloned every time

Modified:

commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/CompositeCacheManager.java

Modified: 
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/CompositeCacheManager.java
URL: 
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/CompositeCacheManager.java?rev=1798714=1798713=1798714=diff
==
--- 
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/CompositeCacheManager.java
 (original)
+++ 
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/CompositeCacheManager.java
 Wed Jun 14 16:40:57 2017
@@ -527,7 +527,7 @@ public class CompositeCacheManager
 @Override
 public  CompositeCache getCache( String cacheName )
 {
-return getCache( cacheName, this.defaultCacheAttr.clone() );
+return getCache( cacheName, getDefaultCacheAttributes() );
 }
 
 /**
@@ -540,7 +540,7 @@ public class CompositeCacheManager
 public  CompositeCache getCache( String cacheName, 
ICompositeCacheAttributes cattr )
 {
 cattr.setCacheName( cacheName );
-return getCache( cattr, this.defaultElementAttr );
+return getCache( cattr, getDefaultElementAttributes() );
 }
 
 /**
@@ -565,7 +565,7 @@ public class CompositeCacheManager
  */
 public  CompositeCache  getCache( ICompositeCacheAttributes 
cattr )
 {
-return getCache( cattr, this.defaultElementAttr );
+return getCache( cattr, getDefaultElementAttributes() );
 }
 
 /**

svn commit: r20027 - /release/commons/fileupload/RELEASE-NOTES.txt

[chtompki]

Author: chtompki
Date: Wed Jun 14 12:46:02 2017
New Revision: 20027

Log:
Adding 1.3.2 notes to RELEASE-NOTES,fileupload

Modified:
release/commons/fileupload/RELEASE-NOTES.txt

Modified: release/commons/fileupload/RELEASE-NOTES.txt
==
--- release/commons/fileupload/RELEASE-NOTES.txt (original)
+++ release/commons/fileupload/RELEASE-NOTES.txt Wed Jun 14 12:46:02 2017
@@ -20,6 +20,20 @@ http://commons.apache.org/proper/commons
 
 --
 
+No client code changes are required to migrate from version 1.3.1 to 1.3.2.
+
+Changes in version 1.3.2 include:
+
+o FILEUPLOAD-272:  Performance Improvement in MultipartStream. Prevents a DoS 
(CVE-2016-3092)
+
+
+For complete information on Apache Commons FileUpload, including instructions 
on how to submit bug reports,
+patches, or suggestions for improvement, see the Apache Apache Commons 
FileUpload website:
+
+http://commons.apache.org/proper/commons-fileupload/
+
+--
+
   Apache Commons FileUpload 1.3.1 RELEASE NOTES
 
 The Apache Commons FileUpload team is pleased to announce the release of 
Apache Commons FileUpload 1.3.1.
@@ -53,4 +67,3 @@ For complete information on Apache Commo
 patches, or suggestions for improvement, see the Apache Apache Commons 
FileUpload website:
 
 http://commons.apache.org/proper/commons-fileupload/
-

[09/12] commons-cli git commit: Update TypeHandler.java

[britter]

Update TypeHandler.java

Add throws missing doc line from openFile function

Project: http://git-wip-us.apache.org/repos/asf/commons-cli/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-cli/commit/4f9c95bc
Tree: http://git-wip-us.apache.org/repos/asf/commons-cli/tree/4f9c95bc
Diff: http://git-wip-us.apache.org/repos/asf/commons-cli/diff/4f9c95bc

Branch: refs/heads/master
Commit: 4f9c95bcb246b64f7f6756cc3840d2061a262fe7
Parents: 1e59d0c
Author: Bela Schaum 
Authored: Mon Jun 12 23:34:29 2017 +0200
Committer: GitHub 
Committed: Mon Jun 12 23:34:29 2017 +0200

--
 src/main/java/org/apache/commons/cli/TypeHandler.java | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/commons-cli/blob/4f9c95bc/src/main/java/org/apache/commons/cli/TypeHandler.java
--
diff --git a/src/main/java/org/apache/commons/cli/TypeHandler.java 
b/src/main/java/org/apache/commons/cli/TypeHandler.java
index ad96b10..68b4f02 100644
--- a/src/main/java/org/apache/commons/cli/TypeHandler.java
+++ b/src/main/java/org/apache/commons/cli/TypeHandler.java
@@ -229,6 +229,7 @@ public class TypeHandler
  *
  * @param str the file location
  * @return The file input stream represented by str.
+ * @throws ParseException if the file is not exist or not readable
  */
 public static FileInputStream openFile(String str) throws ParseException
 {

[12/12] commons-cli git commit: Merge branch 'CLI-274'

[britter]

Merge branch 'CLI-274'


Project: http://git-wip-us.apache.org/repos/asf/commons-cli/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-cli/commit/0b453953
Tree: http://git-wip-us.apache.org/repos/asf/commons-cli/tree/0b453953
Diff: http://git-wip-us.apache.org/repos/asf/commons-cli/diff/0b453953

Branch: refs/heads/master
Commit: 0b453953fa5f55cf2e8fd034d4d55972deb7647a
Parents: 70a3927 2c52075
Author: Benedikt Ritter 
Authored: Wed Jun 14 09:56:49 2017 +0200
Committer: Benedikt Ritter 
Committed: Wed Jun 14 09:56:49 2017 +0200

--
 src/changes/changes.xml |  3 +++
 .../org/apache/commons/cli/TypeHandler.java | 23 +++-
 .../commons/cli/PatternOptionBuilderTest.java   | 20 +
 src/test/resources/existing-readable.file   |  1 +
 4 files changed, 42 insertions(+), 5 deletions(-)
--

[04/12] commons-cli git commit: Update PatternOptionBuilderTest.java

[britter]

Update PatternOptionBuilderTest.java

Project: http://git-wip-us.apache.org/repos/asf/commons-cli/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-cli/commit/c1cbe9dd
Tree: http://git-wip-us.apache.org/repos/asf/commons-cli/tree/c1cbe9dd
Diff: http://git-wip-us.apache.org/repos/asf/commons-cli/diff/c1cbe9dd

Branch: refs/heads/master
Commit: c1cbe9dd69f80b627ea046095af842bfafb15803
Parents: 9039cbd
Author: Bela Schaum 
Authored: Mon Apr 17 16:27:45 2017 +0200
Committer: GitHub 
Committed: Mon Apr 17 16:27:45 2017 +0200

--
 .../java/org/apache/commons/cli/PatternOptionBuilderTest.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/commons-cli/blob/c1cbe9dd/src/test/java/org/apache/commons/cli/PatternOptionBuilderTest.java
--
diff --git a/src/test/java/org/apache/commons/cli/PatternOptionBuilderTest.java 
b/src/test/java/org/apache/commons/cli/PatternOptionBuilderTest.java
index b74dc5e..03c9701 100644
--- a/src/test/java/org/apache/commons/cli/PatternOptionBuilderTest.java
+++ b/src/test/java/org/apache/commons/cli/PatternOptionBuilderTest.java
@@ -19,6 +19,7 @@ package org.apache.commons.cli;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -164,7 +165,7 @@ public class PatternOptionBuilderTest
 CommandLineParser parser = new PosixParser();
 CommandLine line = parser.parse(options, new String[] { "-f", 
"test.properties", "-g", "build.xml" });
 
-assertNotNull((FileInputStream) line.getOptionObject("g"));
+assertNotNull("option g not parsed, or not FileInputStream", 
(FileInputStream) line.getOptionObject("g"));
 
 try
 {

[11/12] commons-cli git commit: Add CLI-274 to changes.xml

[britter]

Add CLI-274 to changes.xml


Project: http://git-wip-us.apache.org/repos/asf/commons-cli/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-cli/commit/2c520752
Tree: http://git-wip-us.apache.org/repos/asf/commons-cli/tree/2c520752
Diff: http://git-wip-us.apache.org/repos/asf/commons-cli/diff/2c520752

Branch: refs/heads/master
Commit: 2c52075212094470def88dc8e2ebfc1940ce9f07
Parents: f4a28c0
Author: Benedikt Ritter 
Authored: Wed Jun 14 09:46:33 2017 +0200
Committer: Benedikt Ritter 
Committed: Wed Jun 14 09:46:33 2017 +0200

--
 src/changes/changes.xml | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/commons-cli/blob/2c520752/src/changes/changes.xml
--
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 63e7f5f..d444805 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -23,6 +23,9 @@
   
 
 
+  
+Option parser type EXISTING_FILE_VALUE not check file existing
+  
   
 CommandLine.getXXX and CommandLine.hasXXX should accept an Option as a 
parameter
   

[07/12] commons-cli git commit: Merge branch 'master' into patch-1

[britter]

Merge branch 'master' into patch-1

Project: http://git-wip-us.apache.org/repos/asf/commons-cli/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-cli/commit/aea58f86
Tree: http://git-wip-us.apache.org/repos/asf/commons-cli/tree/aea58f86
Diff: http://git-wip-us.apache.org/repos/asf/commons-cli/diff/aea58f86

Branch: refs/heads/master
Commit: aea58f8677e55513ae281c49b91a3abce5ee7d1b
Parents: fac3330 70a3927
Author: Bela Schaum 
Authored: Fri Jun 9 11:23:10 2017 +0200
Committer: GitHub 
Committed: Fri Jun 9 11:23:10 2017 +0200

--
 .gitignore  |  17 +
 .travis.yml |   2 +-
 README.md   |   3 +
 pom.xml |   8 +-
 src/changes/changes.xml |   3 +
 .../commons/cli/AlreadySelectedException.java   |   4 +-
 .../commons/cli/AmbiguousOptionException.java   |   8 +-
 .../org/apache/commons/cli/BasicParser.java |   6 +-
 .../org/apache/commons/cli/CommandLine.java |  78 ++---
 .../org/apache/commons/cli/DefaultParser.java   | 104 +++---
 .../java/org/apache/commons/cli/GnuParser.java  |   8 +-
 .../org/apache/commons/cli/HelpFormatter.java   | 124 
 .../commons/cli/MissingArgumentException.java   |   4 +-
 .../commons/cli/MissingOptionException.java |  10 +-
 .../java/org/apache/commons/cli/Option.java |  49 ++-
 .../org/apache/commons/cli/OptionBuilder.java   |  24 +-
 .../org/apache/commons/cli/OptionGroup.java |  12 +-
 .../org/apache/commons/cli/OptionValidator.java |  10 +-
 .../java/org/apache/commons/cli/Options.java|  26 +-
 .../org/apache/commons/cli/ParseException.java  |   2 +-
 .../java/org/apache/commons/cli/Parser.java |  54 ++--
 .../commons/cli/PatternOptionBuilder.java   |  10 +-
 .../org/apache/commons/cli/PosixParser.java |  26 +-
 .../org/apache/commons/cli/TypeHandler.java |  28 +-
 .../cli/UnrecognizedOptionException.java|   4 +-
 src/main/java/org/apache/commons/cli/Util.java  |   4 +-
 src/site/xdoc/index.xml |   4 +-
 .../org/apache/commons/cli/ApplicationTest.java |  58 ++--
 .../commons/cli/ArgumentIsOptionTest.java   |  12 +-
 .../org/apache/commons/cli/CommandLineTest.java |  62 ++--
 .../apache/commons/cli/HelpFormatterTest.java   | 202 ++--
 .../apache/commons/cli/OptionBuilderTest.java   |  26 +-
 .../org/apache/commons/cli/OptionGroupTest.java |  70 ++--
 .../java/org/apache/commons/cli/OptionTest.java |  30 +-
 .../org/apache/commons/cli/OptionsTest.java |  46 +--
 .../org/apache/commons/cli/ParserTestCase.java  | 318 +--
 .../commons/cli/PatternOptionBuilderTest.java   |  56 ++--
 .../java/org/apache/commons/cli/ValueTest.java  | 100 +++---
 .../java/org/apache/commons/cli/ValuesTest.java |   6 +-
 .../apache/commons/cli/bug/BugCLI133Test.java   |   8 +-
 .../apache/commons/cli/bug/BugCLI13Test.java|   5 +-
 .../apache/commons/cli/bug/BugCLI148Test.java   |  12 +-
 .../apache/commons/cli/bug/BugCLI162Test.java   |  22 +-
 .../apache/commons/cli/bug/BugCLI18Test.java|   6 +-
 .../apache/commons/cli/bug/BugCLI252Test.java   |   2 +-
 .../apache/commons/cli/bug/BugCLI265Test.java   |  14 +-
 .../apache/commons/cli/bug/BugCLI266Test.java   |  30 +-
 .../apache/commons/cli/bug/BugCLI71Test.java|  16 +-
 .../org/apache/commons/cli/bug/BugsTest.java| 112 +++
 49 files changed, 935 insertions(+), 910 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/commons-cli/blob/aea58f86/src/main/java/org/apache/commons/cli/TypeHandler.java
--

http://git-wip-us.apache.org/repos/asf/commons-cli/blob/aea58f86/src/test/java/org/apache/commons/cli/PatternOptionBuilderTest.java
--
diff --cc src/test/java/org/apache/commons/cli/PatternOptionBuilderTest.java
index 0ee56a1,b9e7a15..82eacb5
--- a/src/test/java/org/apache/commons/cli/PatternOptionBuilderTest.java
+++ b/src/test/java/org/apache/commons/cli/PatternOptionBuilderTest.java
@@@ -161,12 -159,13 +161,12 @@@ public class PatternOptionBuilderTes
  @Test
  public void testExistingFilePattern() throws Exception
  {
- Options options = PatternOptionBuilder.parsePattern("f

[06/12] commons-cli git commit: Update PatternOptionBuilderTest.java

[britter]

Update PatternOptionBuilderTest.java

really exist file name?

Project: http://git-wip-us.apache.org/repos/asf/commons-cli/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-cli/commit/fac33304
Tree: http://git-wip-us.apache.org/repos/asf/commons-cli/tree/fac33304
Diff: http://git-wip-us.apache.org/repos/asf/commons-cli/diff/fac33304

Branch: refs/heads/master
Commit: fac33304c67496380cd168d71cac79dbc0e60142
Parents: e3d65b0
Author: Bela Schaum 
Authored: Mon Apr 17 16:39:15 2017 +0200
Committer: GitHub 
Committed: Mon Apr 17 16:39:15 2017 +0200

--
 src/test/java/org/apache/commons/cli/PatternOptionBuilderTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/commons-cli/blob/fac33304/src/test/java/org/apache/commons/cli/PatternOptionBuilderTest.java
--
diff --git a/src/test/java/org/apache/commons/cli/PatternOptionBuilderTest.java 
b/src/test/java/org/apache/commons/cli/PatternOptionBuilderTest.java
index b7c1fb3..0ee56a1 100644
--- a/src/test/java/org/apache/commons/cli/PatternOptionBuilderTest.java
+++ b/src/test/java/org/apache/commons/cli/PatternOptionBuilderTest.java
@@ -163,7 +163,7 @@ public class PatternOptionBuilderTest
 {
 Options options = PatternOptionBuilder.parsePattern("f

[05/12] commons-cli git commit: Update PatternOptionBuilderTest.java

[britter]

Update PatternOptionBuilderTest.java

-.-' sry

Project: http://git-wip-us.apache.org/repos/asf/commons-cli/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-cli/commit/e3d65b0e
Tree: http://git-wip-us.apache.org/repos/asf/commons-cli/tree/e3d65b0e
Diff: http://git-wip-us.apache.org/repos/asf/commons-cli/diff/e3d65b0e

Branch: refs/heads/master
Commit: e3d65b0ee3b08599bd787a7721afc326d1bcccf1
Parents: c1cbe9d
Author: Bela Schaum 
Authored: Mon Apr 17 16:33:42 2017 +0200
Committer: GitHub 
Committed: Mon Apr 17 16:33:42 2017 +0200

--
 .../org/apache/commons/cli/PatternOptionBuilderTest.java  | 10 +-
 1 file changed, 1 insertion(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/commons-cli/blob/e3d65b0e/src/test/java/org/apache/commons/cli/PatternOptionBuilderTest.java
--
diff --git a/src/test/java/org/apache/commons/cli/PatternOptionBuilderTest.java 
b/src/test/java/org/apache/commons/cli/PatternOptionBuilderTest.java
index 03c9701..b7c1fb3 100644
--- a/src/test/java/org/apache/commons/cli/PatternOptionBuilderTest.java
+++ b/src/test/java/org/apache/commons/cli/PatternOptionBuilderTest.java
@@ -166,15 +166,7 @@ public class PatternOptionBuilderTest
 CommandLine line = parser.parse(options, new String[] { "-f", 
"test.properties", "-g", "build.xml" });
 
 assertNotNull("option g not parsed, or not FileInputStream", 
(FileInputStream) line.getOptionObject("g"));
-
-try
-{
-line.getOptionObject("f");
-fail("ParseException wasn't thrown");
-}
-catch (ParseException e)
-{
-}
+assertNull("option f parsed", (FileInputStream) 
line.getOptionObject("f"));
 }
 
 @Test

[10/12] commons-cli git commit: separate testcases

[britter]

separate testcases


Project: http://git-wip-us.apache.org/repos/asf/commons-cli/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-cli/commit/f4a28c04
Tree: http://git-wip-us.apache.org/repos/asf/commons-cli/tree/f4a28c04
Diff: http://git-wip-us.apache.org/repos/asf/commons-cli/diff/f4a28c04

Branch: refs/heads/master
Commit: f4a28c0463a414464ebe214a7790fde0b0069e3e
Parents: 4f9c95b
Author: Béla Schaum 
Authored: Tue Jun 13 13:58:13 2017 +0200
Committer: Béla Schaum 
Committed: Tue Jun 13 13:58:13 2017 +0200

--
 .../commons/cli/PatternOptionBuilderTest.java   | 20 ++--
 1 file changed, 14 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/commons-cli/blob/f4a28c04/src/test/java/org/apache/commons/cli/PatternOptionBuilderTest.java
--
diff --git a/src/test/java/org/apache/commons/cli/PatternOptionBuilderTest.java 
b/src/test/java/org/apache/commons/cli/PatternOptionBuilderTest.java
index ff92bc8..3a33eb7 100644
--- a/src/test/java/org/apache/commons/cli/PatternOptionBuilderTest.java
+++ b/src/test/java/org/apache/commons/cli/PatternOptionBuilderTest.java
@@ -161,15 +161,23 @@ public class PatternOptionBuilderTest
 @Test
 public void testExistingFilePattern() throws Exception
 {
-final Options options = PatternOptionBuilder.parsePattern("f

[02/12] commons-cli git commit: [CLI-274] misseed import

[britter]

[CLI-274] misseed import

Project: http://git-wip-us.apache.org/repos/asf/commons-cli/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-cli/commit/a315e187
Tree: http://git-wip-us.apache.org/repos/asf/commons-cli/tree/a315e187
Diff: http://git-wip-us.apache.org/repos/asf/commons-cli/diff/a315e187

Branch: refs/heads/master
Commit: a315e187908d184b1d40f9e7425bc65333a2d07a
Parents: abfcc82
Author: Bela Schaum 
Authored: Mon Apr 17 16:03:11 2017 +0200
Committer: GitHub 
Committed: Mon Apr 17 16:03:11 2017 +0200

--
 src/main/java/org/apache/commons/cli/TypeHandler.java | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/commons-cli/blob/a315e187/src/main/java/org/apache/commons/cli/TypeHandler.java
--
diff --git a/src/main/java/org/apache/commons/cli/TypeHandler.java 
b/src/main/java/org/apache/commons/cli/TypeHandler.java
index 4654f1d..eff91a7 100644
--- a/src/main/java/org/apache/commons/cli/TypeHandler.java
+++ b/src/main/java/org/apache/commons/cli/TypeHandler.java
@@ -19,6 +19,7 @@ package org.apache.commons.cli;
 
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 
 import java.net.MalformedURLException;
 import java.net.URL;

[01/12] commons-cli git commit: implement EXISTING_FILE_VALUE type handler

[britter]

Repository: commons-cli
Updated Branches:
  refs/heads/master 70a392756 -> 0b453953f


implement EXISTING_FILE_VALUE type handler

when the user pass option type FileInputStream.class, I think the expected 
behavior for the return value is the same type, which the user passed.
Before this there was no check whether the file exist.

Project: http://git-wip-us.apache.org/repos/asf/commons-cli/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-cli/commit/abfcc821
Tree: http://git-wip-us.apache.org/repos/asf/commons-cli/tree/abfcc821
Diff: http://git-wip-us.apache.org/repos/asf/commons-cli/diff/abfcc821

Branch: refs/heads/master
Commit: abfcc8211f529ab75f3b3edd4a827e484109eb0b
Parents: a41477b
Author: Bela Schaum 
Authored: Mon Apr 17 13:45:09 2017 +0200
Committer: GitHub 
Committed: Mon Apr 17 13:45:09 2017 +0200

--
 .../org/apache/commons/cli/TypeHandler.java | 21 +++-
 1 file changed, 20 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/commons-cli/blob/abfcc821/src/main/java/org/apache/commons/cli/TypeHandler.java
--
diff --git a/src/main/java/org/apache/commons/cli/TypeHandler.java 
b/src/main/java/org/apache/commons/cli/TypeHandler.java
index f981265..4654f1d 100644
--- a/src/main/java/org/apache/commons/cli/TypeHandler.java
+++ b/src/main/java/org/apache/commons/cli/TypeHandler.java
@@ -18,6 +18,7 @@
 package org.apache.commons.cli;
 
 import java.io.File;
+import java.io.FileInputStream;
 
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -87,7 +88,7 @@ public class TypeHandler
 }
 else if (PatternOptionBuilder.EXISTING_FILE_VALUE == clazz)
 {
-return createFile(str);
+return openFile(str);
 }
 else if (PatternOptionBuilder.FILES_VALUE == clazz)
 {
@@ -223,6 +224,24 @@ public class TypeHandler
 }
 
 /**
+ * Returns the opened FileInputStream represented by str.
+ *
+ * @param str the file location
+ * @return The file input stream represented by str.
+ */
+public static FileInputStream openFile(String str) throws ParseException
+{
+try
+{
+return new FileInputStream(str);
+}
+catch (FileNotFoundException e)
+{
+throw new ParseException("Unable to find file: " + str);
+}
+}
+
+/**
  * Returns the File[] represented by str.
  * 
  * This method is not yet implemented and always throws an

[03/12] commons-cli git commit: Update PatternOptionBuilderTest.java

[britter]

Update PatternOptionBuilderTest.java

Project: http://git-wip-us.apache.org/repos/asf/commons-cli/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-cli/commit/9039cbd4
Tree: http://git-wip-us.apache.org/repos/asf/commons-cli/tree/9039cbd4
Diff: http://git-wip-us.apache.org/repos/asf/commons-cli/diff/9039cbd4

Branch: refs/heads/master
Commit: 9039cbd454346276c632ae2424a3c20e18a2d276
Parents: a315e18
Author: Bela Schaum 
Authored: Mon Apr 17 16:21:42 2017 +0200
Committer: GitHub 
Committed: Mon Apr 17 16:21:42 2017 +0200

--
 .../commons/cli/PatternOptionBuilderTest.java   | 20 ++--
 1 file changed, 14 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/commons-cli/blob/9039cbd4/src/test/java/org/apache/commons/cli/PatternOptionBuilderTest.java
--
diff --git a/src/test/java/org/apache/commons/cli/PatternOptionBuilderTest.java 
b/src/test/java/org/apache/commons/cli/PatternOptionBuilderTest.java
index 1b3bdfc..b74dc5e 100644
--- a/src/test/java/org/apache/commons/cli/PatternOptionBuilderTest.java
+++ b/src/test/java/org/apache/commons/cli/PatternOptionBuilderTest.java
@@ -24,6 +24,7 @@ import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import java.io.File;
+import java.io.FileInputStream;
 import java.net.URL;
 import java.util.Calendar;
 import java.util.Date;
@@ -159,13 +160,20 @@ public class PatternOptionBuilderTest
 @Test
 public void testExistingFilePattern() throws Exception
 {
-Options options = PatternOptionBuilder.parsePattern("f<");
+Options options = PatternOptionBuilder.parsePattern("f

[08/12] commons-cli git commit: change and add file in PatternOptionBuilderTest.java

[britter]

change and add file in PatternOptionBuilderTest.java


Project: http://git-wip-us.apache.org/repos/asf/commons-cli/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-cli/commit/1e59d0c2
Tree: http://git-wip-us.apache.org/repos/asf/commons-cli/tree/1e59d0c2
Diff: http://git-wip-us.apache.org/repos/asf/commons-cli/diff/1e59d0c2

Branch: refs/heads/master
Commit: 1e59d0c2fd1cfee450d0104734307306803a84e0
Parents: aea58f8
Author: Béla Schaum 
Authored: Mon Jun 12 22:46:32 2017 +0200
Committer: Béla Schaum 
Committed: Mon Jun 12 22:46:32 2017 +0200

--
 .../org/apache/commons/cli/PatternOptionBuilderTest.java| 9 ++---
 src/test/resources/existing-readable.file   | 1 +
 2 files changed, 7 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/commons-cli/blob/1e59d0c2/src/test/java/org/apache/commons/cli/PatternOptionBuilderTest.java
--
diff --git a/src/test/java/org/apache/commons/cli/PatternOptionBuilderTest.java 
b/src/test/java/org/apache/commons/cli/PatternOptionBuilderTest.java
index 82eacb5..ff92bc8 100644
--- a/src/test/java/org/apache/commons/cli/PatternOptionBuilderTest.java
+++ b/src/test/java/org/apache/commons/cli/PatternOptionBuilderTest.java
@@ -163,10 +163,13 @@ public class PatternOptionBuilderTest
 {
 final Options options = PatternOptionBuilder.parsePattern("f