diff --git a/src/it/staging-dependencies/pom.xml b/src/it/staging-dependencies/pom.xml index 31cca75c..72e92ce0 100644 --- a/src/it/staging-dependencies/pom.xml +++ b/src/it/staging-dependencies/pom.xml @@ -68,6 +68,12 @@ under the License. 1.7.36 test + + org.slf4j + slf4j-api + 1.7.36 + true + diff --git a/src/it/staging-dependencies/verify.bsh b/src/it/staging-dependencies/verify.bsh index 7e43c8ba..5a1fb4bb 100644 --- a/src/it/staging-dependencies/verify.bsh +++ b/src/it/staging-dependencies/verify.bsh @@ -57,7 +57,10 @@ try "org/apache/maven/its/dep/2.0/dep-2.0.jar", "org/apache/maven/its/dep/maven-metadata-local.xml", "test/staging-dependencies/1.0-SNAPSHOT/staging-dependencies-1.0-SNAPSHOT.jar", - "test/staging-dependencies/1.0-SNAPSHOT/staging-dependencies-1.0-SNAPSHOT.pom" + "test/staging-dependencies/1.0-SNAPSHOT/staging-dependencies-1.0-SNAPSHOT.pom", + "org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.pom", + "org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar", + "org/slf4j/slf4j-parent/1.7.36/slf4j-parent-1.7.36.pom" }; for ( String file : files ) { diff --git a/src/it/staging-reactor/mod1/pom.xml b/src/it/staging-reactor/mod1/pom.xml index fad9dc45..e1cb6a6e 100644 --- a/src/it/staging-reactor/mod1/pom.xml +++ b/src/it/staging-reactor/mod1/pom.xml @@ -29,7 +29,7 @@ under the License. ../mod1-parent - mod1 + mod1 1.0-SNAPSHOT jar @@ -47,6 +47,12 @@ under the License. mod2 1.0-SNAPSHOT + + test + mod3 + 1.0-SNAPSHOT + true + diff --git a/src/it/staging-reactor/mod3/pom.xml b/src/it/staging-reactor/mod3/pom.xml new file mode 100644 index 00000000..13f90a15 --- /dev/null +++ b/src/it/staging-reactor/mod3/pom.xml @@ -0,0 +1,59 @@ + + + + + + 4.0.0 + + + test + mod2-parent + 1.0-SNAPSHOT + + + mod3 + 1.0-SNAPSHOT + jar + + + Test to check for proper staging during a multi module build, i.e. artifacts from the reactor need to be considered. + + + + UTF-8 + + + + + + maven-source-plugin + @sourcePluginVersion@ + + + attach-resources + + jar + + + + + + + diff --git a/src/it/staging-reactor/mod3/src/main/resources/main.properties b/src/it/staging-reactor/mod3/src/main/resources/main.properties new file mode 100644 index 00000000..00ae6c00 --- /dev/null +++ b/src/it/staging-reactor/mod3/src/main/resources/main.properties @@ -0,0 +1,17 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + diff --git a/src/it/staging-reactor/pom.xml b/src/it/staging-reactor/pom.xml index ae0a279c..62ae2f34 100644 --- a/src/it/staging-reactor/pom.xml +++ b/src/it/staging-reactor/pom.xml @@ -34,6 +34,7 @@ under the License. mod1 mod2 + mod3 diff --git a/src/it/staging-reactor/verify.bsh b/src/it/staging-reactor/verify.bsh index 9a684fc7..bc88213d 100644 --- a/src/it/staging-reactor/verify.bsh +++ b/src/it/staging-reactor/verify.bsh @@ -44,6 +44,9 @@ try "test/mod2/1.0-SNAPSHOT/maven-metadata-local.xml", "test/mod2/1.0-SNAPSHOT/mod2-1.0-SNAPSHOT.pom", "test/mod2/1.0-SNAPSHOT/mod2-1.0-SNAPSHOT.jar", + "test/mod3/1.0-SNAPSHOT/maven-metadata-local.xml", + "test/mod3/1.0-SNAPSHOT/mod3-1.0-SNAPSHOT.pom", + "test/mod3/1.0-SNAPSHOT/mod3-1.0-SNAPSHOT.jar", "test/mod2-parent/maven-metadata-local.xml", "test/mod2-parent/1.0-SNAPSHOT/maven-metadata-local.xml", "test/mod2-parent/1.0-SNAPSHOT/mod2-parent-1.0-SNAPSHOT.pom",