diff --git a/pom.xml b/pom.xml index c119b433..45990b93 100644 --- a/pom.xml +++ b/pom.xml @@ -397,14 +397,11 @@ true setup verify - src/it/mrm/settings.xml + src/it/settings.xml ${mojo.java.target} ${mojo.java.target} - - ${mrm.repository.url} - ${project.version} @@ -419,29 +416,6 @@ - - org.codehaus.mojo - mrm-maven-plugin - - - - src/it/mrm/repository - - - ${project.build.directory}/local-repo - - - - - - - - start - stop - - - - maven-enforcer-plugin diff --git a/src/it/projects/java_module-export/pom.xml b/src/it/projects/java_module-export/pom.xml index d30fac9c..7a6dbba7 100644 --- a/src/it/projects/java_module-export/pom.xml +++ b/src/it/projects/java_module-export/pom.xml @@ -17,7 +17,6 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.0 9 diff --git a/src/it/projects/java_module-mainclass/pom.xml b/src/it/projects/java_module-mainclass/pom.xml index 0ca2e37e..86918cfa 100644 --- a/src/it/projects/java_module-mainclass/pom.xml +++ b/src/it/projects/java_module-mainclass/pom.xml @@ -17,7 +17,6 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.0 9 diff --git a/src/it/projects/java_module-module+mainclass/pom.xml b/src/it/projects/java_module-module+mainclass/pom.xml index 96e4edb4..c5f48d97 100644 --- a/src/it/projects/java_module-module+mainclass/pom.xml +++ b/src/it/projects/java_module-module+mainclass/pom.xml @@ -17,7 +17,6 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.0 9 9 diff --git a/src/it/projects/setup-parent/invoker.properties b/src/it/projects/setup-parent/invoker.properties new file mode 100644 index 00000000..b7044f62 --- /dev/null +++ b/src/it/projects/setup-parent/invoker.properties @@ -0,0 +1 @@ +invoker.goals = dependency:resolve-plugins install diff --git a/src/it/mrm/repository/parent-0.1.pom b/src/it/projects/setup-parent/pom.xml similarity index 65% rename from src/it/mrm/repository/parent-0.1.pom rename to src/it/projects/setup-parent/pom.xml index f8553c58..8b61d740 100644 --- a/src/it/mrm/repository/parent-0.1.pom +++ b/src/it/projects/setup-parent/pom.xml @@ -1,91 +1,92 @@ - - - - 4.0.0 - - org.codehaus.mojo.exec.it - parent - 0.1 - - pom - - exec-maven-plugin - http://www.codehaus.org - - - - Apache License 2 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - UTF-8 - - - - - - commons-io - commons-io - 1.1 - - - - - - - - - org.apache.maven.plugins - maven-site-plugin - 2.0.1 - - - org.apache.maven.plugins - maven-surefire-plugin - 2.16 - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.0 - - - org.apache.maven.plugins - maven-clean-plugin - 2.5 - - - org.apache.maven.plugins - maven-assembly-plugin - 2.4 - - - org.apache.maven.plugins - maven-jar-plugin - 2.4 - - - org.apache.maven.plugins - maven-install-plugin - 2.4 - - - org.apache.maven.plugins - maven-war-plugin - 2.3 - - - org.apache.maven.plugins - maven-resources-plugin - 2.6 - - - - - + + + + 4.0.0 + + org.codehaus.mojo.exec.it + parent + 0.1 + pom + + + + Apache License 2 + https://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + UTF-8 + + + + + + commons-io + commons-io + 1.1 + + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + @maven-dependency-plugin.version@ + + + org.apache.maven.plugins + maven-site-plugin + @maven-site-plugin.version@ + + + org.apache.maven.plugins + maven-surefire-plugin + @maven-surefire-plugin.version@ + + + org.apache.maven.plugins + maven-compiler-plugin + @maven-compiler-plugin.version@ + + + org.apache.maven.plugins + maven-clean-plugin + @maven-clean-plugin.version@ + + + org.apache.maven.plugins + maven-assembly-plugin + @maven-assembly-plugin.version@ + + + org.apache.maven.plugins + maven-jar-plugin + @maven-jar-plugin.version@ + + + org.apache.maven.plugins + maven-install-plugin + @maven-install-plugin.version@ + + + org.apache.maven.plugins + maven-war-plugin + @maven-war-plugin.version@ + + + org.apache.maven.plugins + maven-resources-plugin + @maven-resources-plugin.version@ + + + + + diff --git a/src/it/mrm/settings.xml b/src/it/settings.xml similarity index 66% rename from src/it/mrm/settings.xml rename to src/it/settings.xml index 0890403d..5b00f63c 100644 --- a/src/it/mrm/settings.xml +++ b/src/it/settings.xml @@ -20,46 +20,30 @@ under the License. --> - - - mrm-maven-plugin - Mock Repository Manager - @mrm.repository.url@ - * - - it-repo - snapshots - @mrm.repository.url@ + local.central + @localRepositoryUrl@ true - ignore - never true - ignore - always - snapshots - @mrm.repository.url@ + local.central + @localRepositoryUrl@ true - ignore - never true - ignore - always @@ -68,5 +52,4 @@ under the License. it-repo - - + \ No newline at end of file