svn commit: r1673015 - in /maven/shared/trunk/maven-filtering: ./ src/main/java/org/apache/maven/shared/filtering/ src/main/java/org/apache/maven/shared/filtering/streams/ src/test/java/org/apache/maven/shared/filtering/ src/test/java/org/apache/maven/...

[kr...@apache.org]

Author: krosenvold
Date: Sun Apr 12 15:06:18 2015
New Revision: 1673015

URL: http://svn.apache.org/r1673015
Log:
Revert "Added inputstreams that convert to windows or linux line feeds. Taken from maven-assembly-plugin"

Submitted to commons-io instead, was not released here.

Added:
    maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/BoundedReader.java
      - copied, changed from r1671466, maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/streams/BoundedReader.java
Removed:
    maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/streams/BoundedReader.java
    maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/streams/LinuxLineFeedInputStream.java
    maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/streams/WindowsLineFeedInputStream.java
    maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/streams/LinuxLineFeedInputStreamTest.java
    maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/streams/WindowsLineFeedInputStreamTest.java
Modified:
    maven/shared/trunk/maven-filtering/pom.xml
    maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.java
    maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/BoundedReaderTest.java

Modified: maven/shared/trunk/maven-filtering/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/pom.xml?rev=1673015&r1=1673014&r2=1673015&view=diff
==============================================================================
--- maven/shared/trunk/maven-filtering/pom.xml (original)
+++ maven/shared/trunk/maven-filtering/pom.xml Sun Apr 12 15:06:18 2015
@@ -129,6 +129,7 @@
       <scope>test</scope>
       <classifier>tests</classifier>
     </dependency>
+
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>

Copied: maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/BoundedReader.java (from r1671466, maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/streams/BoundedReader.java)
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/BoundedReader.java?p2=maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/BoundedReader.java&p1=maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/streams/BoundedReader.java&r1=1671466&r2=1673015&rev=1673015&view=diff
==============================================================================
--- maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/streams/BoundedReader.java (original)
+++ maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/BoundedReader.java Sun Apr 12 15:06:18 2015
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.filtering.streams;
+package org.apache.maven.shared.filtering;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,7 +19,6 @@ package org.apache.maven.shared.filterin
  * under the License.
  */
 
-import javax.annotation.Nonnull;
 import java.io.IOException;
 import java.io.Reader;
 
@@ -84,7 +83,7 @@ public class BoundedReader
     }
 
     @Override
-    public int read( @Nonnull char[] cbuf, int off, int len )
+    public int read( char[] cbuf, int off, int len )
         throws IOException
     {
         int c;

Modified: maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.java?rev=1673015&r1=1673014&r2=1673015&view=diff
==============================================================================
--- maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.java (original)
+++ maven/shared/trunk/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.java Sun Apr 12 15:06:18 2015
@@ -26,7 +26,6 @@ import java.io.Reader;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
-import org.apache.maven.shared.filtering.streams.BoundedReader;
 import org.codehaus.plexus.interpolation.InterpolationException;
 import org.codehaus.plexus.interpolation.Interpolator;
 import org.codehaus.plexus.interpolation.RecursionInterceptor;

Modified: maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/BoundedReaderTest.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/BoundedReaderTest.java?rev=1673015&r1=1673014&r2=1673015&view=diff
==============================================================================
--- maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/BoundedReaderTest.java (original)
+++ maven/shared/trunk/maven-filtering/src/test/java/org/apache/maven/shared/filtering/BoundedReaderTest.java Sun Apr 12 15:06:18 2015
@@ -25,7 +25,6 @@ import java.io.IOException;
 import java.io.Reader;
 import java.io.StringReader;
 
-import org.apache.maven.shared.filtering.streams.BoundedReader;
 import org.junit.Test;
 
 public class BoundedReaderTest