From fd2757a412080149dc4b6ef591932c4221d17220 Mon Sep 17 00:00:00 2001 From: Alex Tighe Date: Mon, 2 Sep 2019 20:49:40 -0400 Subject: [PATCH] Moving resources example from core-java-io2 to core-java-io. Removing core-java-io2 --- core-java-modules/core-java-io/pom.xml | 17 +++ .../baeldung/resource/MyResourceLoader.java | 0 core-java-modules/core-java-io2/.gitignore | 5 - core-java-modules/core-java-io2/pom.xml | 139 ------------------ .../src/main/resources/input.txt | 3 - .../src/test/resources/.gitignore | 13 -- 6 files changed, 17 insertions(+), 160 deletions(-) rename core-java-modules/{core-java-io2 => core-java-io}/src/main/java/com/baeldung/resource/MyResourceLoader.java (100%) delete mode 100644 core-java-modules/core-java-io2/.gitignore delete mode 100644 core-java-modules/core-java-io2/pom.xml delete mode 100644 core-java-modules/core-java-io2/src/main/resources/input.txt delete mode 100644 core-java-modules/core-java-io2/src/test/resources/.gitignore diff --git a/core-java-modules/core-java-io/pom.xml b/core-java-modules/core-java-io/pom.xml index 1a133d2cbe..84bf3baeed 100644 --- a/core-java-modules/core-java-io/pom.xml +++ b/core-java-modules/core-java-io/pom.xml @@ -207,6 +207,21 @@ ${maven.compiler.target} + + + + org.apache.maven.plugins + maven-jar-plugin + ${maven-jar-plugin.version} + + + + true + com.baeldung.resource.MyResourceLoader + + + + @@ -274,6 +289,8 @@ 1.18 0.1.5 + 3.1.0 + \ No newline at end of file diff --git a/core-java-modules/core-java-io2/src/main/java/com/baeldung/resource/MyResourceLoader.java b/core-java-modules/core-java-io/src/main/java/com/baeldung/resource/MyResourceLoader.java similarity index 100% rename from core-java-modules/core-java-io2/src/main/java/com/baeldung/resource/MyResourceLoader.java rename to core-java-modules/core-java-io/src/main/java/com/baeldung/resource/MyResourceLoader.java diff --git a/core-java-modules/core-java-io2/.gitignore b/core-java-modules/core-java-io2/.gitignore deleted file mode 100644 index c61d35324d..0000000000 --- a/core-java-modules/core-java-io2/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -0.* - -# Files generated by integration tests -# *.txt -/temp \ No newline at end of file diff --git a/core-java-modules/core-java-io2/pom.xml b/core-java-modules/core-java-io2/pom.xml deleted file mode 100644 index 922403edab..0000000000 --- a/core-java-modules/core-java-io2/pom.xml +++ /dev/null @@ -1,139 +0,0 @@ - - 4.0.0 - core-java-io2 - 0.1.0-SNAPSHOT - core-java-io2 - jar - - - com.baeldung - parent-java - 0.0.1-SNAPSHOT - ../../parent-java - - - - - org.apache.commons - commons-collections4 - ${commons-collections4.version} - - - - commons-io - commons-io - 2.6 - - - - org.projectlombok - lombok - ${lombok.version} - provided - - - - log4j - log4j - ${log4j.version} - - - - org.slf4j - log4j-over-slf4j - ${org.slf4j.version} - - - - - - core-java-io2 - - - src/main/resources - true - - - - - org.codehaus.mojo - exec-maven-plugin - ${exec-maven-plugin.version} - - java - com.baeldung.outofmemoryerror.OutOfMemoryGCLimitExceed - - -Xmx300m - -XX:+UseParallelGC - -classpath - - com.baeldung.outofmemoryerror.OutOfMemoryGCLimitExceed - - - - - - - org.apache.maven.plugins - maven-jar-plugin - ${maven-jar-plugin.version} - - - - true - com.baeldung.resource.MyResourceLoader - - - - - - - - - - integration - - - - org.codehaus.mojo - exec-maven-plugin - - - - run-benchmarks - - none - - exec - - - test - java - - -classpath - - org.openjdk.jmh.Main - .* - - - - - - - - - - - - - - 4.1 - - - 3.1.0 - - - - \ No newline at end of file diff --git a/core-java-modules/core-java-io2/src/main/resources/input.txt b/core-java-modules/core-java-io2/src/main/resources/input.txt deleted file mode 100644 index 8670fb3460..0000000000 --- a/core-java-modules/core-java-io2/src/main/resources/input.txt +++ /dev/null @@ -1,3 +0,0 @@ -Lorem ipsum dolor sit amet, consectetur adipiscing elit. -In lacus enim, scelerisque id sapien ut, semper euismod quam. -Nunc ullamcorper semper blandit. \ No newline at end of file diff --git a/core-java-modules/core-java-io2/src/test/resources/.gitignore b/core-java-modules/core-java-io2/src/test/resources/.gitignore deleted file mode 100644 index 83c05e60c8..0000000000 --- a/core-java-modules/core-java-io2/src/test/resources/.gitignore +++ /dev/null @@ -1,13 +0,0 @@ -*.class - -#folders# -/target -/neoDb* -/data -/src/main/webapp/WEB-INF/classes -*/META-INF/* - -# Packaged files # -*.jar -*.war -*.ear \ No newline at end of file