Skip to content

Commit 99af354

Browse files
gnodetgnodet
committed
Integrate into maven's build
1 parent 92a08b2 commit 99af354

File tree

10 files changed

+92
-42
lines changed

10 files changed

+92
-42
lines changed

‎apache-maven/pom.xml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -353,6 +353,34 @@ under the License.
353353
</plugins>
354354
</build>
355355
</profile>
356+
<profile>
357+
<id>run-its</id>
358+
<build>
359+
<plugins>
360+
<plugin>
361+
<artifactId>maven-assembly-plugin</artifactId>
362+
<executions>
363+
<execution>
364+
<id>create-distribution-dir</id>
365+
<goals>
366+
<goal>single</goal>
367+
</goals>
368+
<phase>package</phase>
369+
<configuration>
370+
<finalName>./</finalName>
371+
<appendAssemblyId>false</appendAssemblyId>
372+
<attach>false</attach>
373+
<outputDirectory>${basedir}/target/maven</outputDirectory>
374+
<descriptors>
375+
<descriptor>src/assembly/dir.xml</descriptor>
376+
</descriptors>
377+
</configuration>
378+
</execution>
379+
</executions>
380+
</plugin>
381+
</plugins>
382+
</build>
383+
</profile>
356384
<profile>
357385
<id>apache-release</id>
358386
<build>

‎its/.mvn/readme.txt‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎its/core-it-suite/pom.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -580,6 +580,13 @@ under the License.
580580
<profile>
581581
<id>run-its</id>
582582
<dependencies>
583+
<dependency>
584+
<groupId>org.apache.maven</groupId>
585+
<artifactId>apache-maven</artifactId>
586+
<version>4.0.0-beta-6-SNAPSHOT</version>
587+
<classifier>bin</classifier>
588+
<type>zip</type>
589+
</dependency>
583590
<!-- not really used but will force download in the local repo used -->
584591
<dependency>
585592
<groupId>org.apache.maven.wagon</groupId>

‎its/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/PropertiesUtil.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ public static void serialize(Properties props, String key, Object value) {
104104
} else if (value instanceof Map) {
105105
Map map = (Map) value;
106106
props.setProperty(key, Integer.toString(map.size()));
107+
@SuppressWarnings("checkstyle:UnusedLocalVariable")
107108
int i = 0;
108109
for (Iterator it = map.keySet().iterator(); it.hasNext(); i++) {
109110
Object k = it.next();

‎its/core-it-support/core-it-plugins/maven-it-plugin-expression/src/main/java/org/apache/maven/plugin/coreit/PropertyUtil.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ private static void store(Properties props, String key, Object obj, Collection v
8787
} else if (obj instanceof Map) {
8888
Map map = (Map) obj;
8989
props.put(key, Integer.toString(map.size()));
90+
@SuppressWarnings("checkstyle:UnusedLocalVariable")
9091
int index = 0;
9192
for (Iterator it = map.entrySet().iterator(); it.hasNext(); index++) {
9293
Map.Entry entry = (Map.Entry) it.next();

‎its/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/src/main/java/org/apache/maven/plugin/coreit/UsesWagonMojo.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ public void execute() throws MojoExecutionException {
4747
throw new MojoExecutionException(e.getMessage(), e);
4848
}
4949
try {
50+
@SuppressWarnings("checkstyle:UnusedLocalVariable")
5051
FileWagon theWagon = (FileWagon) fileWagon;
5152
} catch (ClassCastException e) {
5253
getLog().error("", e);
@@ -64,6 +65,7 @@ public void execute() throws MojoExecutionException {
6465
throw new MojoExecutionException(e.getMessage(), e);
6566
}
6667
try {
68+
@SuppressWarnings("checkstyle:UnusedLocalVariable")
6769
ScpWagon theWagon = (ScpWagon) scpWagon;
6870
} catch (ClassCastException e) {
6971
getLog().error("", e);

‎its/core-it-support/core-it-plugins/mng7529-plugin/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@ under the License.
3232
<name>Maven IT Plugin :: mng-7529 plugin</name>
3333

3434
<properties>
35-
<maven-version>3.6.0</maven-version>
35+
<maven3-version>3.6.0</maven3-version>
3636
</properties>
3737

3838
<dependencies>
3939
<dependency>
4040
<groupId>org.apache.maven</groupId>
4141
<artifactId>maven-plugin-api</artifactId>
42-
<version>${maven-version}</version>
42+
<version>${maven3-version}</version>
4343
<scope>provided</scope>
4444
</dependency>
4545
<dependency>
@@ -50,13 +50,13 @@ under the License.
5050
<dependency>
5151
<groupId>org.apache.maven</groupId>
5252
<artifactId>maven-core</artifactId>
53-
<version>${maven-version}</version>
53+
<version>${maven3-version}</version>
5454
<scope>provided</scope>
5555
</dependency>
5656
<dependency>
5757
<groupId>org.apache.maven</groupId>
5858
<artifactId>maven-model</artifactId>
59-
<version>${maven-version}</version>
59+
<version>${maven3-version}</version>
6060
<scope>provided</scope>
6161
</dependency>
6262
</dependencies>

‎its/core-it-support/core-it-plugins/mng7529-plugin/src/main/java/org/apache/maven/its/mng7529/plugin/ResolveMojo.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ public void execute() throws MojoExecutionException {
5858
request.setMavenProject(project);
5959
request.setRepositorySession(buildingRequest.getRepositorySession());
6060

61+
@SuppressWarnings("checkstyle:UnusedLocalVariable")
6162
DependencyResolutionResult result = dependencyResolver.resolve(request);
6263

6364
getLog().info("Resolution successful, resolved ok");

‎its/pom.xml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,8 @@ under the License.
2222

2323
<parent>
2424
<groupId>org.apache.maven</groupId>
25-
<artifactId>maven-parent</artifactId>
26-
<version>41</version>
27-
<relativePath />
25+
<artifactId>maven</artifactId>
26+
<version>4.0.0-beta-6-SNAPSHOT</version>
2827
</parent>
2928

3029
<groupId>org.apache.maven.its</groupId>
@@ -71,10 +70,10 @@ under the License.
7170
<maven.site.path>core-its</maven.site.path>
7271
<maven.site.cache>${user.home}/maven-sites</maven.site.cache>
7372
<rat.ignoreErrors>true</rat.ignoreErrors>
74-
<maven.compiler.source>8</maven.compiler.source>
75-
<maven.compiler.target>8</maven.compiler.target>
73+
<!-- <maven.compiler.source>8</maven.compiler.source>-->
74+
<!-- <maven.compiler.target>8</maven.compiler.target>-->
7675

77-
<maven-version>3.8.6</maven-version>
76+
<maven-version>4.0.0-beta-6-SNAPSHOT</maven-version>
7877
<maven-plugin-tools-version>3.6.4</maven-plugin-tools-version>
7978
</properties>
8079

‎pom.xml‎

Lines changed: 43 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,8 @@ under the License.
170170
<wagonVersion>3.5.3</wagonVersion>
171171
<woodstoxVersion>7.1.0</woodstoxVersion>
172172
<xmlunitVersion>2.10.0</xmlunitVersion>
173+
<!-- maven.version -->
174+
<maven-version>${project.version}</maven-version>
173175
</properties>
174176

175177
<!--bootstrap-start-comment-->
@@ -181,157 +183,157 @@ under the License.
181183
<dependency>
182184
<groupId>org.apache.maven</groupId>
183185
<artifactId>maven-artifact</artifactId>
184-
<version>${project.version}</version>
186+
<version>${maven-version}</version>
185187
</dependency>
186188
<dependency>
187189
<groupId>org.apache.maven</groupId>
188190
<artifactId>maven-builder-support</artifactId>
189-
<version>${project.version}</version>
191+
<version>${maven-version}</version>
190192
</dependency>
191193
<dependency>
192194
<groupId>org.apache.maven</groupId>
193195
<artifactId>maven-jline</artifactId>
194-
<version>${project.version}</version>
196+
<version>${maven-version}</version>
195197
</dependency>
196198
<dependency>
197199
<groupId>org.apache.maven</groupId>
198200
<artifactId>maven-logging</artifactId>
199-
<version>${project.version}</version>
201+
<version>${maven-version}</version>
200202
</dependency>
201203
<dependency>
202204
<groupId>org.apache.maven</groupId>
203205
<artifactId>maven-core</artifactId>
204-
<version>${project.version}</version>
206+
<version>${maven-version}</version>
205207
</dependency>
206208
<dependency>
207209
<groupId>org.apache.maven</groupId>
208210
<artifactId>maven-impl</artifactId>
209-
<version>${project.version}</version>
211+
<version>${maven-version}</version>
210212
</dependency>
211213
<dependency>
212214
<groupId>org.apache.maven</groupId>
213215
<artifactId>maven-embedder</artifactId>
214-
<version>${project.version}</version>
216+
<version>${maven-version}</version>
215217
</dependency>
216218
<dependency>
217219
<groupId>org.apache.maven</groupId>
218220
<artifactId>maven-cli</artifactId>
219-
<version>${project.version}</version>
221+
<version>${maven-version}</version>
220222
</dependency>
221223
<dependency>
222224
<groupId>org.apache.maven</groupId>
223225
<artifactId>maven-model</artifactId>
224-
<version>${project.version}</version>
226+
<version>${maven-version}</version>
225227
</dependency>
226228
<dependency>
227229
<groupId>org.apache.maven</groupId>
228230
<artifactId>maven-api-core</artifactId>
229-
<version>${project.version}</version>
231+
<version>${maven-version}</version>
230232
</dependency>
231233
<dependency>
232234
<groupId>org.apache.maven</groupId>
233235
<artifactId>maven-api-meta</artifactId>
234-
<version>${project.version}</version>
236+
<version>${maven-version}</version>
235237
</dependency>
236238
<dependency>
237239
<groupId>org.apache.maven</groupId>
238240
<artifactId>maven-api-model</artifactId>
239-
<version>${project.version}</version>
241+
<version>${maven-version}</version>
240242
</dependency>
241243
<dependency>
242244
<groupId>org.apache.maven</groupId>
243245
<artifactId>maven-api-settings</artifactId>
244-
<version>${project.version}</version>
246+
<version>${maven-version}</version>
245247
</dependency>
246248
<dependency>
247249
<groupId>org.apache.maven</groupId>
248250
<artifactId>maven-api-spi</artifactId>
249-
<version>${project.version}</version>
251+
<version>${maven-version}</version>
250252
</dependency>
251253
<dependency>
252254
<groupId>org.apache.maven</groupId>
253255
<artifactId>maven-api-toolchain</artifactId>
254-
<version>${project.version}</version>
256+
<version>${maven-version}</version>
255257
</dependency>
256258
<dependency>
257259
<groupId>org.apache.maven</groupId>
258260
<artifactId>maven-api-plugin</artifactId>
259-
<version>${project.version}</version>
261+
<version>${maven-version}</version>
260262
</dependency>
261263
<dependency>
262264
<groupId>org.apache.maven</groupId>
263265
<artifactId>maven-api-xml</artifactId>
264-
<version>${project.version}</version>
266+
<version>${maven-version}</version>
265267
</dependency>
266268
<dependency>
267269
<groupId>org.apache.maven</groupId>
268270
<artifactId>maven-api-di</artifactId>
269-
<version>${project.version}</version>
271+
<version>${maven-version}</version>
270272
</dependency>
271273
<dependency>
272274
<groupId>org.apache.maven</groupId>
273275
<artifactId>maven-api-metadata</artifactId>
274-
<version>${project.version}</version>
276+
<version>${maven-version}</version>
275277
</dependency>
276278
<dependency>
277279
<groupId>org.apache.maven</groupId>
278280
<artifactId>maven-api-cli</artifactId>
279-
<version>${project.version}</version>
281+
<version>${maven-version}</version>
280282
</dependency>
281283
<dependency>
282284
<groupId>org.apache.maven</groupId>
283285
<artifactId>maven-di</artifactId>
284-
<version>${project.version}</version>
286+
<version>${maven-version}</version>
285287
</dependency>
286288
<dependency>
287289
<groupId>org.apache.maven</groupId>
288290
<artifactId>maven-model-builder</artifactId>
289-
<version>${project.version}</version>
291+
<version>${maven-version}</version>
290292
</dependency>
291293
<dependency>
292294
<groupId>org.apache.maven</groupId>
293295
<artifactId>maven-plugin-api</artifactId>
294-
<version>${project.version}</version>
296+
<version>${maven-version}</version>
295297
</dependency>
296298
<dependency>
297299
<groupId>org.apache.maven</groupId>
298300
<artifactId>maven-repository-metadata</artifactId>
299-
<version>${project.version}</version>
301+
<version>${maven-version}</version>
300302
</dependency>
301303
<dependency>
302304
<groupId>org.apache.maven</groupId>
303305
<artifactId>maven-resolver-provider</artifactId>
304-
<version>${project.version}</version>
306+
<version>${maven-version}</version>
305307
</dependency>
306308
<dependency>
307309
<groupId>org.apache.maven</groupId>
308310
<artifactId>maven-settings</artifactId>
309-
<version>${project.version}</version>
311+
<version>${maven-version}</version>
310312
</dependency>
311313
<dependency>
312314
<groupId>org.apache.maven</groupId>
313315
<artifactId>maven-settings-builder</artifactId>
314-
<version>${project.version}</version>
316+
<version>${maven-version}</version>
315317
</dependency>
316318
<dependency>
317319
<groupId>org.apache.maven</groupId>
318320
<artifactId>maven-toolchain-model</artifactId>
319-
<version>${project.version}</version>
321+
<version>${maven-version}</version>
320322
</dependency>
321323
<dependency>
322324
<groupId>org.apache.maven</groupId>
323325
<artifactId>maven-toolchain-builder</artifactId>
324-
<version>${project.version}</version>
326+
<version>${maven-version}</version>
325327
</dependency>
326328
<dependency>
327329
<groupId>org.apache.maven</groupId>
328330
<artifactId>maven-xml</artifactId>
329-
<version>${project.version}</version>
331+
<version>${maven-version}</version>
330332
</dependency>
331333
<dependency>
332334
<groupId>org.apache.maven</groupId>
333335
<artifactId>maven-compat</artifactId>
334-
<version>${project.version}</version>
336+
<version>${maven-version}</version>
335337
</dependency>
336338
<!--bootstrap-end-comment-->
337339
<dependency>
@@ -788,6 +790,7 @@ under the License.</licenseText>
788790
<exclude>src/test/resources*/**</exclude>
789791
<exclude>src/test/projects/**</exclude>
790792
<exclude>src/test/remote-repo/**</exclude>
793+
<exclude>its/core-it-suite/src/test/resources/**</exclude>
791794
<exclude>**/*.odg</exclude>
792795
<exclude>**/*.svg</exclude>
793796
<exclude>.asf.yaml</exclude>
@@ -1029,5 +1032,14 @@ under the License.</licenseText>
10291032
</plugins>
10301033
</build>
10311034
</profile>
1035+
<profile>
1036+
<id>run-its</id>
1037+
<modules>
1038+
<module>its</module>
1039+
</modules>
1040+
<properties>
1041+
<mavenDistro>${session.rootDirectory}/apache-maven/target/apache-maven-${project.version}-bin.zip</mavenDistro>
1042+
</properties>
1043+
</profile>
10321044
</profiles>
10331045
</project>

0 commit comments

Comments
 (0)