You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by mb...@apache.org on 2018/04/29 19:40:53 UTC

[commons-weaver] 02/13: remove obsolete dependencies

This is an automated email from the ASF dual-hosted git repository.

mbenson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-weaver.git

commit 5f50c12f73c8e7e360c9f1b1f9c56134aaf76365
Author: Matt Benson <mb...@apache.org>
AuthorDate: Thu Apr 19 17:20:56 2018 -0500

    remove obsolete dependencies
---
 modules/normalizer/pom.xml                         |  4 ----
 .../commons/weaver/normalizer/Normalizer.java      |  3 +--
 modules/privilizer/weaver/pom.xml                  |  4 ----
 .../commons/weaver/privilizer/Privilizer.java      |  3 +--
 parent/pom.xml                                     | 12 +----------
 processor/pom.xml                                  | 24 ++++++++++++++--------
 6 files changed, 19 insertions(+), 31 deletions(-)

diff --git a/modules/normalizer/pom.xml b/modules/normalizer/pom.xml
index d27fcd8..961b330 100644
--- a/modules/normalizer/pom.xml
+++ b/modules/normalizer/pom.xml
@@ -53,10 +53,6 @@ under the License.
       <artifactId>commons-lang3</artifactId>
     </dependency>
     <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-    </dependency>
-    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <scope>test</scope>
diff --git a/modules/normalizer/src/main/java/org/apache/commons/weaver/normalizer/Normalizer.java b/modules/normalizer/src/main/java/org/apache/commons/weaver/normalizer/Normalizer.java
index b469c88..1c8be3f 100644
--- a/modules/normalizer/src/main/java/org/apache/commons/weaver/normalizer/Normalizer.java
+++ b/modules/normalizer/src/main/java/org/apache/commons/weaver/normalizer/Normalizer.java
@@ -34,7 +34,6 @@ import java.util.stream.Stream;
 
 import javax.activation.DataSource;
 
-import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.CharEncoding;
 import org.apache.commons.lang3.Conversion;
@@ -264,7 +263,7 @@ public class Normalizer {
             final DataSource classfile = env.getClassfile(className);
             env.debug("Writing class %s to %s", className, classfile.getName());
             try (OutputStream outputStream = classfile.getOutputStream()) {
-                IOUtils.write(bytecode, outputStream);
+                outputStream.write(bytecode);
             } catch (final IOException e) {
                 throw new RuntimeException(e);
             }
diff --git a/modules/privilizer/weaver/pom.xml b/modules/privilizer/weaver/pom.xml
index bef4e15..306fce1 100644
--- a/modules/privilizer/weaver/pom.xml
+++ b/modules/privilizer/weaver/pom.xml
@@ -51,10 +51,6 @@ under the License.
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
     </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-    </dependency>
   </dependencies>
   <profiles>
     <profile>
diff --git a/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/Privilizer.java b/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/Privilizer.java
index d1e7ab4..ffd4e33 100644
--- a/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/Privilizer.java
+++ b/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/Privilizer.java
@@ -28,7 +28,6 @@ import java.util.Set;
 
 import javax.activation.DataSource;
 
-import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.Validate;
@@ -113,7 +112,7 @@ public class Privilizer {
             final DataSource classfile = env.getClassfile(className);
             env.debug("Writing class %s to resource %s", className, classfile.getName());
             try (OutputStream outputStream = classfile.getOutputStream()) {
-                IOUtils.write(bytecode, outputStream);
+                outputStream.write(bytecode);
             } catch (final IOException e) {
                 throw new RuntimeException(e);
             }
diff --git a/parent/pom.xml b/parent/pom.xml
index a99f7e7..754d607 100755
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -160,16 +160,6 @@ under the License.
         <version>3.4</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.commons</groupId>
-        <artifactId>commons-collections4</artifactId>
-        <version>4.1</version>
-      </dependency>
-      <dependency>
-        <groupId>commons-io</groupId>
-        <artifactId>commons-io</artifactId>
-        <version>2.6</version>
-      </dependency>
-      <dependency>
         <groupId>org.ow2.asm</groupId>
         <artifactId>asm</artifactId>
         <version>${asm.version}</version>
@@ -244,7 +234,7 @@ under the License.
           <configuration>
             <parameter>
               <ignoreMissingNewVersion />
-	      <reportOnlyFilename>true</reportOnlyFilename>
+              <reportOnlyFilename>true</reportOnlyFilename>
             </parameter>
           </configuration>
         </plugin>
diff --git a/processor/pom.xml b/processor/pom.xml
index fbfe4bb..275b544 100644
--- a/processor/pom.xml
+++ b/processor/pom.xml
@@ -50,14 +50,6 @@ under the License.
       <artifactId>commons-lang3</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-collections4</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-    </dependency>
-    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <scope>test</scope>
@@ -68,6 +60,22 @@ under the License.
       <scope>test</scope>
     </dependency>
   </dependencies>
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>com.github.siom79.japicmp</groupId>
+          <artifactId>japicmp-maven-plugin</artifactId>
+          <configuration>
+            <parameter>
+              <!-- obsolete dependency -->
+              <ignoreMissingClassesByRegularExpressions>org\.apache\.commons\.collections4\..+</ignoreMissingClassesByRegularExpressions>
+            </parameter>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
   <reporting>
     <plugins>
       <plugin>

-- 
To stop receiving notification emails like this one, please contact
mbenson@apache.org.