This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new 52e1fa68 [MASSEMBLY-994] IT - refresh unpacked dependencies in dir
archive
52e1fa68 is described below
commit 52e1fa6873e23ce2a334a0e61c558dc3bf176596
Author: Slawomir Jaranowski <[email protected]>
AuthorDate: Fri Nov 10 21:54:02 2023 +0100
[MASSEMBLY-994] IT - refresh unpacked dependencies in dir archive
---
.../massembly-994-refresh-unpacked/child1/pom.xml | 39 +++++++++++++
.../child1/src/main/resources/test.properties | 18 ++++++
.../massembly-994-refresh-unpacked/child2/pom.xml | 64 ++++++++++++++++++++++
.../child2/src/assemble/dir.xml | 39 +++++++++++++
.../invoker.properties | 19 +++++++
.../massembly-994-refresh-unpacked/pom.xml | 43 +++++++++++++++
.../massembly-994-refresh-unpacked/verify.groovy | 24 ++++++++
7 files changed, 246 insertions(+)
diff --git
a/src/it/projects/dependency-sets/massembly-994-refresh-unpacked/child1/pom.xml
b/src/it/projects/dependency-sets/massembly-994-refresh-unpacked/child1/pom.xml
new file mode 100644
index 00000000..8600d6a3
--- /dev/null
+++
b/src/it/projects/dependency-sets/massembly-994-refresh-unpacked/child1/pom.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0"?>
+<project>
+
+ <!--
+ 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.
+ -->
+
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>dependencySet-unpacked</artifactId>
+ <groupId>test</groupId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>child1</artifactId>
+
+ <build>
+ <resources>
+ <resource>
+ <filtering>true</filtering>
+ <directory>src/main/resources</directory>
+ </resource>
+ </resources>
+ </build>
+</project>
diff --git
a/src/it/projects/dependency-sets/massembly-994-refresh-unpacked/child1/src/main/resources/test.properties
b/src/it/projects/dependency-sets/massembly-994-refresh-unpacked/child1/src/main/resources/test.properties
new file mode 100644
index 00000000..9a5040f9
--- /dev/null
+++
b/src/it/projects/dependency-sets/massembly-994-refresh-unpacked/child1/src/main/resources/test.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.
+
+testValue=${testProperty}
diff --git
a/src/it/projects/dependency-sets/massembly-994-refresh-unpacked/child2/pom.xml
b/src/it/projects/dependency-sets/massembly-994-refresh-unpacked/child2/pom.xml
new file mode 100644
index 00000000..97eab0dd
--- /dev/null
+++
b/src/it/projects/dependency-sets/massembly-994-refresh-unpacked/child2/pom.xml
@@ -0,0 +1,64 @@
+<?xml version='1.0'?>
+
+<!--
+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>
+ <parent>
+ <artifactId>dependencySet-unpacked</artifactId>
+ <groupId>test</groupId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>child2</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>test</groupId>
+ <artifactId>child1</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assemble/dir.xml</descriptor>
+ </descriptors>
+ <attach>false</attach>
+ </configuration>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
+
diff --git
a/src/it/projects/dependency-sets/massembly-994-refresh-unpacked/child2/src/assemble/dir.xml
b/src/it/projects/dependency-sets/massembly-994-refresh-unpacked/child2/src/assemble/dir.xml
new file mode 100644
index 00000000..abdfc51d
--- /dev/null
+++
b/src/it/projects/dependency-sets/massembly-994-refresh-unpacked/child2/src/assemble/dir.xml
@@ -0,0 +1,39 @@
+<?xml version='1.0'?>
+<!--
+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.
+-->
+
+<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
+ <id>dir</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+ <dependencySets>
+ <dependencySet>
+ <includes>
+ <include>test:child1</include>
+ </includes>
+ <unpack>true</unpack>
+ </dependencySet>
+ </dependencySets>
+</assembly>
diff --git
a/src/it/projects/dependency-sets/massembly-994-refresh-unpacked/invoker.properties
b/src/it/projects/dependency-sets/massembly-994-refresh-unpacked/invoker.properties
new file mode 100644
index 00000000..7d05bd55
--- /dev/null
+++
b/src/it/projects/dependency-sets/massembly-994-refresh-unpacked/invoker.properties
@@ -0,0 +1,19 @@
+# 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.1=clean package -DtestProperty=value1
+invoker.goals.2=package -DtestProperty=value2
diff --git
a/src/it/projects/dependency-sets/massembly-994-refresh-unpacked/pom.xml
b/src/it/projects/dependency-sets/massembly-994-refresh-unpacked/pom.xml
new file mode 100644
index 00000000..8e569de9
--- /dev/null
+++ b/src/it/projects/dependency-sets/massembly-994-refresh-unpacked/pom.xml
@@ -0,0 +1,43 @@
+<?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
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.maven.plugin.assembly.test</groupId>
+ <artifactId>it-project-parent</artifactId>
+ <version>1</version>
+ </parent>
+
+ <groupId>test</groupId>
+ <artifactId>dependencySet-unpacked</artifactId>
+ <packaging>pom</packaging>
+ <version>1.0-SNAPSHOT</version>
+
+ <properties>
+
<project.build.outputTimestamp>2023-05-11T20:36:09Z</project.build.outputTimestamp>
+ </properties>
+
+ <modules>
+ <module>child1</module>
+ <module>child2</module>
+ </modules>
+</project>
diff --git
a/src/it/projects/dependency-sets/massembly-994-refresh-unpacked/verify.groovy
b/src/it/projects/dependency-sets/massembly-994-refresh-unpacked/verify.groovy
new file mode 100644
index 00000000..63552c12
--- /dev/null
+++
b/src/it/projects/dependency-sets/massembly-994-refresh-unpacked/verify.groovy
@@ -0,0 +1,24 @@
+/*
+ * 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.
+ */
+
+
+File testProperties = new File( basedir,
"child2/target/child2-1.0-SNAPSHOT-dir/test.properties" )
+assert testProperties.exists()
+assert testProperties.text.contains('testValue=value2')
+
