Skip to content

Commit db292ea

Browse files
cstamascstamas
authored
[MASSEMBLY-969] Update common artifact filters to 3.3.1 (#83)
As version 3.3.0 has an unwanted change regarding 4 elements pattern and are parsed as GATV only, while before they were parsed as GATC as well. Created IT based on issue supplied POM and assembly descriptor.
1 parent f4f2f75 commit db292ea

File tree

4 files changed

+298
-1
lines changed

4 files changed

+298
-1
lines changed

‎pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ under the License.
141141
<dependency>
142142
<groupId>org.apache.maven.shared</groupId>
143143
<artifactId>maven-common-artifact-filters</artifactId>
144-
<version>3.3.0</version>
144+
<version>3.3.1</version>
145145
</dependency>
146146
<dependency>
147147
<groupId>org.apache.maven.shared</groupId>

‎src/it/projects/dependency-sets/massembly-969/pom.xml

Lines changed: 197 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,197 @@
1+
<?xml version="1.0"?>
2+
<!--
3+
Licensed to the Apache Software Foundation (ASF) under one
4+
or more contributor license agreements. See the NOTICE file
5+
distributed with this work for additional information
6+
regarding copyright ownership. The ASF licenses this file
7+
to you under the Apache License, Version 2.0 (the
8+
"License"); you may not use this file except in compliance
9+
with the License. You may obtain a copy of the License at
10+
11+
http://www.apache.org/licenses/LICENSE-2.0
12+
13+
Unless required by applicable law or agreed to in writing,
14+
software distributed under the License is distributed on an
15+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
16+
KIND, either express or implied. See the License for the
17+
specific language governing permissions and limitations
18+
under the License.
19+
-->
20+
<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/xsd/maven-4.0.0.xsd">
21+
<modelVersion>4.0.0</modelVersion>
22+
<parent>
23+
<groupId>org.apache.maven.plugin.assembly.test</groupId>
24+
<artifactId>it-project-parent</artifactId>
25+
<version>1</version>
26+
</parent>
27+
28+
<groupId>test</groupId>
29+
<artifactId>massembly-969</artifactId>
30+
<version>1</version>
31+
<properties>
32+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
33+
<javafx.version>18.0.1</javafx.version>
34+
</properties>
35+
<dependencies>
36+
<dependency>
37+
<groupId>org.openjfx</groupId>
38+
<artifactId>javafx-base</artifactId>
39+
<version>${javafx.version}</version>
40+
</dependency>
41+
<dependency>
42+
<groupId>org.openjfx</groupId>
43+
<artifactId>javafx-base</artifactId>
44+
<version>${javafx.version}</version>
45+
<classifier>win</classifier>
46+
</dependency>
47+
<dependency>
48+
<groupId>org.openjfx</groupId>
49+
<artifactId>javafx-base</artifactId>
50+
<version>${javafx.version}</version>
51+
<classifier>linux</classifier>
52+
</dependency>
53+
<dependency>
54+
<groupId>org.openjfx</groupId>
55+
<artifactId>javafx-base</artifactId>
56+
<version>${javafx.version}</version>
57+
<classifier>mac</classifier>
58+
</dependency>
59+
<dependency>
60+
<groupId>org.openjfx</groupId>
61+
<artifactId>javafx-controls</artifactId>
62+
<version>${javafx.version}</version>
63+
</dependency>
64+
<dependency>
65+
<groupId>org.openjfx</groupId>
66+
<artifactId>javafx-controls</artifactId>
67+
<version>${javafx.version}</version>
68+
<classifier>win</classifier>
69+
</dependency>
70+
<dependency>
71+
<groupId>org.openjfx</groupId>
72+
<artifactId>javafx-controls</artifactId>
73+
<version>${javafx.version}</version>
74+
<classifier>linux</classifier>
75+
</dependency>
76+
<dependency>
77+
<groupId>org.openjfx</groupId>
78+
<artifactId>javafx-controls</artifactId>
79+
<version>${javafx.version}</version>
80+
<classifier>mac</classifier>
81+
</dependency>
82+
<dependency>
83+
<groupId>org.openjfx</groupId>
84+
<artifactId>javafx-web</artifactId>
85+
<version>${javafx.version}</version>
86+
</dependency>
87+
<dependency>
88+
<groupId>org.openjfx</groupId>
89+
<artifactId>javafx-web</artifactId>
90+
<version>${javafx.version}</version>
91+
<classifier>win</classifier>
92+
</dependency>
93+
<dependency>
94+
<groupId>org.openjfx</groupId>
95+
<artifactId>javafx-web</artifactId>
96+
<version>${javafx.version}</version>
97+
<classifier>linux</classifier>
98+
</dependency>
99+
<dependency>
100+
<groupId>org.openjfx</groupId>
101+
<artifactId>javafx-web</artifactId>
102+
<version>${javafx.version}</version>
103+
<classifier>mac</classifier>
104+
</dependency>
105+
<dependency>
106+
<groupId>org.openjfx</groupId>
107+
<artifactId>javafx-media</artifactId>
108+
<version>${javafx.version}</version>
109+
</dependency>
110+
<dependency>
111+
<groupId>org.openjfx</groupId>
112+
<artifactId>javafx-media</artifactId>
113+
<version>${javafx.version}</version>
114+
<classifier>win</classifier>
115+
</dependency>
116+
<dependency>
117+
<groupId>org.openjfx</groupId>
118+
<artifactId>javafx-media</artifactId>
119+
<version>${javafx.version}</version>
120+
<classifier>linux</classifier>
121+
</dependency>
122+
<dependency>
123+
<groupId>org.openjfx</groupId>
124+
<artifactId>javafx-media</artifactId>
125+
<version>${javafx.version}</version>
126+
<classifier>mac</classifier>
127+
</dependency>
128+
<dependency>
129+
<groupId>org.openjfx</groupId>
130+
<artifactId>javafx-swing</artifactId>
131+
<version>${javafx.version}</version>
132+
</dependency>
133+
<dependency>
134+
<groupId>org.openjfx</groupId>
135+
<artifactId>javafx-swing</artifactId>
136+
<version>${javafx.version}</version>
137+
<classifier>win</classifier>
138+
</dependency>
139+
<dependency>
140+
<groupId>org.openjfx</groupId>
141+
<artifactId>javafx-swing</artifactId>
142+
<version>${javafx.version}</version>
143+
<classifier>linux</classifier>
144+
</dependency>
145+
<dependency>
146+
<groupId>org.openjfx</groupId>
147+
<artifactId>javafx-swing</artifactId>
148+
<version>${javafx.version}</version>
149+
<classifier>mac</classifier>
150+
</dependency>
151+
<dependency>
152+
<groupId>org.openjfx</groupId>
153+
<artifactId>javafx-graphics</artifactId>
154+
<version>${javafx.version}</version>
155+
</dependency>
156+
<dependency>
157+
<groupId>org.openjfx</groupId>
158+
<artifactId>javafx-graphics</artifactId>
159+
<version>${javafx.version}</version>
160+
<classifier>win</classifier>
161+
</dependency>
162+
<dependency>
163+
<groupId>org.openjfx</groupId>
164+
<artifactId>javafx-graphics</artifactId>
165+
<version>${javafx.version}</version>
166+
<classifier>linux</classifier>
167+
</dependency>
168+
<dependency>
169+
<groupId>org.openjfx</groupId>
170+
<artifactId>javafx-graphics</artifactId>
171+
<version>${javafx.version}</version>
172+
<classifier>mac</classifier>
173+
</dependency>
174+
</dependencies>
175+
<build>
176+
<plugins>
177+
<plugin>
178+
<artifactId>maven-assembly-plugin</artifactId>
179+
<version>${testVersion}</version>
180+
<executions>
181+
<execution>
182+
<id>assembly</id>
183+
<phase>package</phase>
184+
<goals>
185+
<goal>single</goal>
186+
</goals>
187+
<configuration>
188+
<descriptors>
189+
<descriptor>src/main/assembly/bin.xml</descriptor>
190+
</descriptors>
191+
</configuration>
192+
</execution>
193+
</executions>
194+
</plugin>
195+
</plugins>
196+
</build>
197+
</project>

‎src/it/projects/dependency-sets/massembly-969/src/main/assembly/bin.xml

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
<!--
2+
Licensed to the Apache Software Foundation (ASF) under one
3+
or more contributor license agreements. See the NOTICE file
4+
distributed with this work for additional information
5+
regarding copyright ownership. The ASF licenses this file
6+
to you under the Apache License, Version 2.0 (the
7+
"License"); you may not use this file except in compliance
8+
with the License. You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing,
13+
software distributed under the License is distributed on an
14+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
KIND, either express or implied. See the License for the
16+
specific language governing permissions and limitations
17+
under the License.
18+
-->
19+
<assembly>
20+
<id>bin</id>
21+
<formats>
22+
<format>dir</format>
23+
</formats>
24+
<includeBaseDirectory>false</includeBaseDirectory>
25+
<dependencySets>
26+
<dependencySet>
27+
<unpack>false</unpack>
28+
<scope>runtime</scope>
29+
<outputDirectory></outputDirectory>
30+
<useProjectArtifact>false</useProjectArtifact>
31+
<includes>
32+
<include>org.openjfx:javafx-base</include>
33+
<include>org.openjfx:javafx-controls</include>
34+
<include>org.openjfx:javafx-media</include>
35+
<include>org.openjfx:javafx-web</include>
36+
<include>org.openjfx:javafx-swing</include>
37+
<include>org.openjfx:javafx-graphics:jar:linux</include>
38+
</includes>
39+
<excludes>
40+
<exclude>org.openjfx:javafx-base:jar:mac</exclude>
41+
<exclude>org.openjfx:javafx-base:jar:win</exclude>
42+
<exclude>org.openjfx:javafx-controls:jar:mac</exclude>
43+
<exclude>org.openjfx:javafx-controls:jar:win</exclude>
44+
<exclude>org.openjfx:javafx-media:jar:mac</exclude>
45+
<exclude>org.openjfx:javafx-media:jar:win</exclude>
46+
<exclude>org.openjfx:javafx-web:jar:mac</exclude>
47+
<exclude>org.openjfx:javafx-web:jar:win</exclude>
48+
<exclude>org.openjfx:javafx-swing:jar:mac</exclude>
49+
<exclude>org.openjfx:javafx-swing:jar:win</exclude>
50+
</excludes>
51+
</dependencySet>
52+
</dependencySets>
53+
</assembly>

‎src/it/projects/dependency-sets/massembly-969/verify.groovy

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
20+
import java.io.*;
21+
22+
def expectedFilenames = [ "javafx-base-18.0.1.jar",
23+
"javafx-controls-18.0.1-linux.jar",
24+
"javafx-media-18.0.1-linux.jar",
25+
"javafx-web-18.0.1.jar",
26+
"javafx-base-18.0.1-linux.jar",
27+
"javafx-graphics-18.0.1-linux.jar",
28+
"javafx-swing-18.0.1.jar",
29+
"javafx-web-18.0.1-linux.jar",
30+
"javafx-controls-18.0.1.jar",
31+
"javafx-media-18.0.1.jar",
32+
"javafx-swing-18.0.1-linux.jar"
33+
]
34+
35+
File assemblyBasedir = new File( basedir, "target/massembly-969-1-bin/" )
36+
37+
assert assemblyBasedir.listFiles().length == expectedFilenames.size()
38+
39+
for ( fileName in expectedFilenames )
40+
{
41+
File file = new File( assemblyBasedir, fileName )
42+
assert file.isFile() // exists and is file
43+
}
44+
45+
// defined set vs listed set: same cardinality and all present: OK
46+
47+
return true

0 commit comments

Comments
 (0)