From aa92bde665516985e29f9ee7d96d9855f55827ce Mon Sep 17 00:00:00 2001 From: Dhawal Kapil Date: Fri, 4 Feb 2022 19:08:59 +0530 Subject: [PATCH] JAVA-7535 Moved ebook specific code snippets to maven-simple module --- maven-modules/maven-dependency/pom.xml | 38 -------- maven-modules/maven-profiles/pom.xml | 96 ------------------- .../maven-dependency/README.md | 0 .../maven-simple/maven-dependency/pom.xml | 37 +++++++ .../src/main/java/com/baeldung/Main.java | 0 .../maven-profiles/README.md | 0 .../maven-simple/maven-profiles/pom.xml | 96 +++++++++++++++++++ .../plugin-management/README.md | 0 .../maven-simple/plugin-management/pom.xml | 63 ++++++++++++ .../plugin-management/submodule-1/pom.xml | 0 .../submodule-1/src/resources/include.json | 0 .../CopiesAdditionalResourcesUnitTest.java | 0 .../plugin-management/submodule-2/pom.xml | 0 maven-modules/maven-simple/pom.xml | 22 +++++ maven-modules/plugin-management/pom.xml | 64 ------------- maven-modules/pom.xml | 4 +- 16 files changed, 219 insertions(+), 201 deletions(-) delete mode 100644 maven-modules/maven-dependency/pom.xml delete mode 100644 maven-modules/maven-profiles/pom.xml rename maven-modules/{ => maven-simple}/maven-dependency/README.md (100%) create mode 100644 maven-modules/maven-simple/maven-dependency/pom.xml rename maven-modules/{ => maven-simple}/maven-dependency/src/main/java/com/baeldung/Main.java (100%) rename maven-modules/{ => maven-simple}/maven-profiles/README.md (100%) create mode 100644 maven-modules/maven-simple/maven-profiles/pom.xml rename maven-modules/{ => maven-simple}/plugin-management/README.md (100%) create mode 100644 maven-modules/maven-simple/plugin-management/pom.xml rename maven-modules/{ => maven-simple}/plugin-management/submodule-1/pom.xml (100%) rename maven-modules/{ => maven-simple}/plugin-management/submodule-1/src/resources/include.json (100%) rename maven-modules/{ => maven-simple}/plugin-management/submodule-1/src/test/java/com/baeldung/CopiesAdditionalResourcesUnitTest.java (100%) rename maven-modules/{ => maven-simple}/plugin-management/submodule-2/pom.xml (100%) create mode 100644 maven-modules/maven-simple/pom.xml delete mode 100644 maven-modules/plugin-management/pom.xml diff --git a/maven-modules/maven-dependency/pom.xml b/maven-modules/maven-dependency/pom.xml deleted file mode 100644 index f17998c327..0000000000 --- a/maven-modules/maven-dependency/pom.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - 4.0.0 - com.baeldung - maven-dependency - 1.0.0-SNAPSHOT - pom - - - com.baeldung - maven-modules - 0.0.1-SNAPSHOT - - - - - - org.apache.commons - commons-lang3 - 3.12.0 - - - - - - - org.junit.vintage - junit-vintage-engine - - - org.apache.commons - commons-lang3 - - - - \ No newline at end of file diff --git a/maven-modules/maven-profiles/pom.xml b/maven-modules/maven-profiles/pom.xml deleted file mode 100644 index 322dada104..0000000000 --- a/maven-modules/maven-profiles/pom.xml +++ /dev/null @@ -1,96 +0,0 @@ - - - 4.0.0 - com.baeldung - maven-profiles - 0.0.1-SNAPSHOT - maven-profiles - - - - no-tests - - true - - - - integration-tests - - true - - - - mutation-tests - - - active-on-jdk-11 - - 11 - - - - active-on-windows-10 - - - windows 10 - Windows - amd64 - 10.0 - - - - - active-on-property-environment - - - environment - !test - - - - - active-on-missing-file - - - target/testreport.html - - - - - active-on-present-file - - - target/artifact.jar - - - - - show-active-profiles - - - - org.apache.maven.plugins - maven-help-plugin - ${help.plugin.version} - - - show-profiles - compile - - active-profiles - - - - - - - - - - - 3.2.0 - - - \ No newline at end of file diff --git a/maven-modules/maven-dependency/README.md b/maven-modules/maven-simple/maven-dependency/README.md similarity index 100% rename from maven-modules/maven-dependency/README.md rename to maven-modules/maven-simple/maven-dependency/README.md diff --git a/maven-modules/maven-simple/maven-dependency/pom.xml b/maven-modules/maven-simple/maven-dependency/pom.xml new file mode 100644 index 0000000000..46c59409ef --- /dev/null +++ b/maven-modules/maven-simple/maven-dependency/pom.xml @@ -0,0 +1,37 @@ + + + 4.0.0 + maven-dependency + 1.0.0-SNAPSHOT + pom + + + com.baeldung + maven-modules + 0.0.1-SNAPSHOT + + + + + + org.apache.commons + commons-lang3 + 3.12.0 + + + + + + + org.junit.vintage + junit-vintage-engine + + + org.apache.commons + commons-lang3 + + + + \ No newline at end of file diff --git a/maven-modules/maven-dependency/src/main/java/com/baeldung/Main.java b/maven-modules/maven-simple/maven-dependency/src/main/java/com/baeldung/Main.java similarity index 100% rename from maven-modules/maven-dependency/src/main/java/com/baeldung/Main.java rename to maven-modules/maven-simple/maven-dependency/src/main/java/com/baeldung/Main.java diff --git a/maven-modules/maven-profiles/README.md b/maven-modules/maven-simple/maven-profiles/README.md similarity index 100% rename from maven-modules/maven-profiles/README.md rename to maven-modules/maven-simple/maven-profiles/README.md diff --git a/maven-modules/maven-simple/maven-profiles/pom.xml b/maven-modules/maven-simple/maven-profiles/pom.xml new file mode 100644 index 0000000000..1168350de9 --- /dev/null +++ b/maven-modules/maven-simple/maven-profiles/pom.xml @@ -0,0 +1,96 @@ + + + 4.0.0 + com.baeldung + maven-profiles + 0.0.1-SNAPSHOT + maven-profiles + + + + no-tests + + true + + + + integration-tests + + true + + + + mutation-tests + + + active-on-jdk-11 + + 11 + + + + active-on-windows-10 + + + windows 10 + Windows + amd64 + 10.0 + + + + + active-on-property-environment + + + environment + !test + + + + + active-on-missing-file + + + target/testreport.html + + + + + active-on-present-file + + + target/artifact.jar + + + + + show-active-profiles + + + + org.apache.maven.plugins + maven-help-plugin + ${help.plugin.version} + + + show-profiles + compile + + active-profiles + + + + + + + + + + + 3.2.0 + + + \ No newline at end of file diff --git a/maven-modules/plugin-management/README.md b/maven-modules/maven-simple/plugin-management/README.md similarity index 100% rename from maven-modules/plugin-management/README.md rename to maven-modules/maven-simple/plugin-management/README.md diff --git a/maven-modules/maven-simple/plugin-management/pom.xml b/maven-modules/maven-simple/plugin-management/pom.xml new file mode 100644 index 0000000000..b680d1d39b --- /dev/null +++ b/maven-modules/maven-simple/plugin-management/pom.xml @@ -0,0 +1,63 @@ + + + 4.0.0 + plugin-management + pom + + + maven-modules + com.baeldung + 0.0.1-SNAPSHOT + + + + submodule-1 + submodule-2 + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + ${maven.bulid.helper.plugin} + + + add-resource + generate-resources + + add-resource + + + + + src/resources + json + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven.compiler.plugin} + + 1.8 + 1.8 + + + + + + + + 3.8.1 + 3.2.0 + + + \ No newline at end of file diff --git a/maven-modules/plugin-management/submodule-1/pom.xml b/maven-modules/maven-simple/plugin-management/submodule-1/pom.xml similarity index 100% rename from maven-modules/plugin-management/submodule-1/pom.xml rename to maven-modules/maven-simple/plugin-management/submodule-1/pom.xml diff --git a/maven-modules/plugin-management/submodule-1/src/resources/include.json b/maven-modules/maven-simple/plugin-management/submodule-1/src/resources/include.json similarity index 100% rename from maven-modules/plugin-management/submodule-1/src/resources/include.json rename to maven-modules/maven-simple/plugin-management/submodule-1/src/resources/include.json diff --git a/maven-modules/plugin-management/submodule-1/src/test/java/com/baeldung/CopiesAdditionalResourcesUnitTest.java b/maven-modules/maven-simple/plugin-management/submodule-1/src/test/java/com/baeldung/CopiesAdditionalResourcesUnitTest.java similarity index 100% rename from maven-modules/plugin-management/submodule-1/src/test/java/com/baeldung/CopiesAdditionalResourcesUnitTest.java rename to maven-modules/maven-simple/plugin-management/submodule-1/src/test/java/com/baeldung/CopiesAdditionalResourcesUnitTest.java diff --git a/maven-modules/plugin-management/submodule-2/pom.xml b/maven-modules/maven-simple/plugin-management/submodule-2/pom.xml similarity index 100% rename from maven-modules/plugin-management/submodule-2/pom.xml rename to maven-modules/maven-simple/plugin-management/submodule-2/pom.xml diff --git a/maven-modules/maven-simple/pom.xml b/maven-modules/maven-simple/pom.xml new file mode 100644 index 0000000000..87df6a9bca --- /dev/null +++ b/maven-modules/maven-simple/pom.xml @@ -0,0 +1,22 @@ + + + 4.0.0 + maven-simple + maven-simple + pom + + + com.baeldung + maven-modules + 0.0.1-SNAPSHOT + + + + maven-profiles + plugin-management + maven-dependency + + + diff --git a/maven-modules/plugin-management/pom.xml b/maven-modules/plugin-management/pom.xml deleted file mode 100644 index cd75e5dbd0..0000000000 --- a/maven-modules/plugin-management/pom.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - 4.0.0 - plugin-management - 0.0.1-SNAPSHOT - pom - - - maven-modules - com.baeldung - 0.0.1-SNAPSHOT - - - - submodule-1 - submodule-2 - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - ${maven.bulid.helper.plugin} - - - add-resource - generate-resources - - add-resource - - - - - src/resources - json - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven.compiler.plugin} - - 1.8 - 1.8 - - - - - - - - 3.8.1 - 3.2.0 - - - \ No newline at end of file diff --git a/maven-modules/pom.xml b/maven-modules/pom.xml index e09283efb4..21bc0e72e1 100644 --- a/maven-modules/pom.xml +++ b/maven-modules/pom.xml @@ -22,7 +22,6 @@ maven-integration-test maven-multi-source maven-plugins - maven-profiles maven-properties maven-unused-dependencies @@ -34,10 +33,9 @@ maven-printing-plugins maven-builder-plugin host-maven-repo-example - plugin-management maven-surefire-plugin maven-parent-pom-resolution - maven-dependency + maven-simple