This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/maven-remote-resources-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new c50b86b added ITs run with invoker (bundle in setup, then process)
c50b86b is described below
commit c50b86bf8b4c265b8f69c0b04d98f94a05c3d841
Author: Hervé Boutemy <hbout...@apache.org>
AuthorDate: Sun Oct 21 09:47:18 2018 +0200
added ITs run with invoker (bundle in setup, then process)
---
src/it/process/invoker.properties | 18 ++++++++
src/it/process/pom.xml | 52 +++++++++++++++++++++
src/it/process/src/main/resources/common2.txt | 18 ++++++++
src/it/process/verify.groovy | 29 ++++++++++++
src/it/setup-bundle/invoker.properties | 18 ++++++++
src/it/setup-bundle/mrrp-bundle-a/pom.xml | 33 ++++++++++++++
.../mrrp-bundle-a/src/main/resources/a/a.txt | 18 ++++++++
.../src/main/resources/common-vm.txt.vm | 18 ++++++++
.../mrrp-bundle-a/src/main/resources/common.txt | 18 ++++++++
.../mrrp-bundle-a/src/main/resources/common2.txt | 18 ++++++++
src/it/setup-bundle/mrrp-bundle-b/pom.xml | 33 ++++++++++++++
.../mrrp-bundle-b/src/main/resources/b/b.txt | 18 ++++++++
.../src/main/resources/common-vm.txt.vm | 18 ++++++++
.../mrrp-bundle-b/src/main/resources/common.txt | 18 ++++++++
.../mrrp-bundle-b/src/main/resources/common2.txt | 18 ++++++++
src/it/setup-bundle/pom.xml | 53 ++++++++++++++++++++++
16 files changed, 398 insertions(+)
diff --git a/src/it/process/invoker.properties
b/src/it/process/invoker.properties
new file mode 100644
index 0000000..0097f00
--- /dev/null
+++ b/src/it/process/invoker.properties
@@ -0,0 +1,18 @@
+# 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.
+
+invoker.goals = generate-resources
diff --git a/src/it/process/pom.xml b/src/it/process/pom.xml
new file mode 100644
index 0000000..f3fa487
--- /dev/null
+++ b/src/it/process/pom.xml
@@ -0,0 +1,52 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+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.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
https://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its</groupId>
+ <artifactId>mrrp-process</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <version>@project.version@</version>
+ <configuration>
+ <resourceBundles>
+
<resourceBundle>org.apache.maven.its:mrrp-bundle-a:1.0-SNAPSHOT</resourceBundle>
+
<resourceBundle>org.apache.maven.its:mrrp-bundle-b:1.0-SNAPSHOT</resourceBundle>
+ </resourceBundles>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/src/it/process/src/main/resources/common2.txt
b/src/it/process/src/main/resources/common2.txt
new file mode 100644
index 0000000..d3a65ce
--- /dev/null
+++ b/src/it/process/src/main/resources/common2.txt
@@ -0,0 +1,18 @@
+# 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.
+
+using project's resource
diff --git a/src/it/process/verify.groovy b/src/it/process/verify.groovy
new file mode 100644
index 0000000..3c7ba52
--- /dev/null
+++ b/src/it/process/verify.groovy
@@ -0,0 +1,29 @@
+/*
+ * 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.
+ */
+
+dir = new File( basedir, 'target/maven-shared-archive-resources' )
+
+assert new File( dir, 'a/a.txt' ).text.contains( 'mrrp-bundle-a' )
+assert new File( dir, 'b/b.txt' ).text.contains( 'mrrp-bundle-b' )
+
+assert new File( dir, 'common.txt' ).text.contains( 'mrrp-bundle-a' ) //
bundle a is first in classpath
+assert new File( dir, 'common-vm.txt' ).text.contains( 'mrrp-bundle-a
org.apache.maven.its:mrrp-process' )
+assert new File( dir, 'common2.txt' ).text.contains( 'using project\'s
resource' ) // bundle content overridden by local project's resources
+
+return true;
\ No newline at end of file
diff --git a/src/it/setup-bundle/invoker.properties
b/src/it/setup-bundle/invoker.properties
new file mode 100644
index 0000000..97189ec
--- /dev/null
+++ b/src/it/setup-bundle/invoker.properties
@@ -0,0 +1,18 @@
+# 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.
+
+invoker.goals = install
diff --git a/src/it/setup-bundle/mrrp-bundle-a/pom.xml
b/src/it/setup-bundle/mrrp-bundle-a/pom.xml
new file mode 100644
index 0000000..ffb6609
--- /dev/null
+++ b/src/it/setup-bundle/mrrp-bundle-a/pom.xml
@@ -0,0 +1,33 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+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.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
https://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.its</groupId>
+ <artifactId>mrrp-bundle-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>mrrp-bundle-a</artifactId>
+</project>
diff --git a/src/it/setup-bundle/mrrp-bundle-a/src/main/resources/a/a.txt
b/src/it/setup-bundle/mrrp-bundle-a/src/main/resources/a/a.txt
new file mode 100644
index 0000000..a1bcd95
--- /dev/null
+++ b/src/it/setup-bundle/mrrp-bundle-a/src/main/resources/a/a.txt
@@ -0,0 +1,18 @@
+# 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.
+
+mrrp-bundle-a
diff --git
a/src/it/setup-bundle/mrrp-bundle-a/src/main/resources/common-vm.txt.vm
b/src/it/setup-bundle/mrrp-bundle-a/src/main/resources/common-vm.txt.vm
new file mode 100644
index 0000000..c75e0aa
--- /dev/null
+++ b/src/it/setup-bundle/mrrp-bundle-a/src/main/resources/common-vm.txt.vm
@@ -0,0 +1,18 @@
+# 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.
+
+mrrp-bundle-a ${project.groupId}:${project.artifactId}
diff --git a/src/it/setup-bundle/mrrp-bundle-a/src/main/resources/common.txt
b/src/it/setup-bundle/mrrp-bundle-a/src/main/resources/common.txt
new file mode 100644
index 0000000..a1bcd95
--- /dev/null
+++ b/src/it/setup-bundle/mrrp-bundle-a/src/main/resources/common.txt
@@ -0,0 +1,18 @@
+# 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.
+
+mrrp-bundle-a
diff --git a/src/it/setup-bundle/mrrp-bundle-a/src/main/resources/common2.txt
b/src/it/setup-bundle/mrrp-bundle-a/src/main/resources/common2.txt
new file mode 100644
index 0000000..feec793
--- /dev/null
+++ b/src/it/setup-bundle/mrrp-bundle-a/src/main/resources/common2.txt
@@ -0,0 +1,18 @@
+# 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.
+
+mrrp-bundle-a 2
diff --git a/src/it/setup-bundle/mrrp-bundle-b/pom.xml
b/src/it/setup-bundle/mrrp-bundle-b/pom.xml
new file mode 100644
index 0000000..cf12d0b
--- /dev/null
+++ b/src/it/setup-bundle/mrrp-bundle-b/pom.xml
@@ -0,0 +1,33 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+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.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
https://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.its</groupId>
+ <artifactId>mrrp-bundle-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>mrrp-bundle-b</artifactId>
+</project>
diff --git a/src/it/setup-bundle/mrrp-bundle-b/src/main/resources/b/b.txt
b/src/it/setup-bundle/mrrp-bundle-b/src/main/resources/b/b.txt
new file mode 100644
index 0000000..be3a44c
--- /dev/null
+++ b/src/it/setup-bundle/mrrp-bundle-b/src/main/resources/b/b.txt
@@ -0,0 +1,18 @@
+# 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.
+
+mrrp-bundle-b
diff --git
a/src/it/setup-bundle/mrrp-bundle-b/src/main/resources/common-vm.txt.vm
b/src/it/setup-bundle/mrrp-bundle-b/src/main/resources/common-vm.txt.vm
new file mode 100644
index 0000000..0b34f7b
--- /dev/null
+++ b/src/it/setup-bundle/mrrp-bundle-b/src/main/resources/common-vm.txt.vm
@@ -0,0 +1,18 @@
+# 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.
+
+mrrp-bundle-b ${project.groupId}:${project.artifactId}
diff --git a/src/it/setup-bundle/mrrp-bundle-b/src/main/resources/common.txt
b/src/it/setup-bundle/mrrp-bundle-b/src/main/resources/common.txt
new file mode 100644
index 0000000..be3a44c
--- /dev/null
+++ b/src/it/setup-bundle/mrrp-bundle-b/src/main/resources/common.txt
@@ -0,0 +1,18 @@
+# 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.
+
+mrrp-bundle-b
diff --git a/src/it/setup-bundle/mrrp-bundle-b/src/main/resources/common2.txt
b/src/it/setup-bundle/mrrp-bundle-b/src/main/resources/common2.txt
new file mode 100644
index 0000000..99a98a3
--- /dev/null
+++ b/src/it/setup-bundle/mrrp-bundle-b/src/main/resources/common2.txt
@@ -0,0 +1,18 @@
+# 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.
+
+mrrp-bundle-b 2
diff --git a/src/it/setup-bundle/pom.xml b/src/it/setup-bundle/pom.xml
new file mode 100644
index 0000000..9151683
--- /dev/null
+++ b/src/it/setup-bundle/pom.xml
@@ -0,0 +1,53 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+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.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
https://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its</groupId>
+ <artifactId>mrrp-bundle-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>mrrp-bundle-a</module>
+ <module>mrrp-bundle-b</module>
+ </modules>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <version>@project.version@</version>
+ <configuration>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>bundle</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
