Skip to content

Commit 98972e2

Browse files
authored
Merge pull request arquillian#359 from rhusar/jboss-parent-50
Upgrade to JBoss Parent 50 and related changes
2 parents 28a5236 + 167238b commit 98972e2

File tree

8 files changed

+33
-82
lines changed

8 files changed

+33
-82
lines changed

aggregate-jacoco-report/pom.xml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,13 @@
1111
<artifactId>arquillian-warp-aggregate-jacoco-report</artifactId>
1212
<name>Arquillian Warp: Aggregated Jacoco test coverage report</name>
1313
<packaging>pom</packaging>
14-
14+
15+
<properties>
16+
<!-- Do NOT deploy any of the jacoco modules -->
17+
<maven.deploy.skip>true</maven.deploy.skip>
18+
<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
19+
</properties>
20+
1521
<dependencies>
1622
<!--Add all modules that should be part of the jacoco test coverage report -->
1723
<dependency>
@@ -79,4 +85,4 @@
7985
</plugin>
8086
</plugins>
8187
</build>
82-
</project>
88+
</project>

build/docs/pom.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212

1313
<properties>
1414
<documentation.sources.directory>${project.build.directory}/compiled-sources-docs</documentation.sources.directory>
15+
<!-- Do NOT deploy any of the docs modules -->
16+
<maven.deploy.skip>true</maven.deploy.skip>
17+
<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
1518
</properties>
1619

1720
<build>

build/ftest-base/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@
3232
<arquillian.launch.wildfly>false</arquillian.launch.wildfly>
3333
<arquillian.launch.tomee>false</arquillian.launch.tomee>
3434
<arquillian.launch.glassfish>false</arquillian.launch.glassfish>
35+
36+
<!-- Do NOT deploy any of the ITs modules -->
37+
<maven.deploy.skip>true</maven.deploy.skip>
38+
<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
3539
</properties>
3640

3741
<dependencyManagement>

extension/jsf-ftest/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@
1515
<properties>
1616
<browser>htmlUnit</browser>
1717
<remoteReusable>false</remoteReusable>
18+
19+
<!-- Do NOT deploy any of the ITs modules -->
20+
<maven.deploy.skip>true</maven.deploy.skip>
21+
<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
1822
</properties>
1923

2024
<dependencies>

ftest/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@
1111
<artifactId>arquillian-warp-ftest</artifactId>
1212
<name>Arquillian Warp: Functional Test</name>
1313

14+
<properties>
15+
<!-- Do NOT deploy any of the ITs module -->
16+
<maven.deploy.skip>true</maven.deploy.skip>
17+
<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
18+
</properties>
19+
1420
<dependencies>
1521
<!--The dependency on the servlet api must be declared for each profile contained "ftest-base/pom.xml" instead of using "org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec",
1622
as the test "org.jboss.arquillian.warp.jsf.ftest.lifecycle.TestFacesLifecycleFailurePropagation" would fail for TomEE (see detailed explanation in this test)

impl_test_separatecl/pom.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515
<properties>
1616
<!--Avoid warning "JAR will be empty - no content was marked for inclusion!", as this project contains only test classes -->
1717
<maven.install.skip>true</maven.install.skip>
18+
<!-- Do NOT deploy any of the ITs module -->
1819
<maven.deploy.skip>true</maven.deploy.skip>
20+
<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
1921
</properties>
2022

2123
<dependencies>

pom.xml

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.jboss</groupId>
77
<artifactId>jboss-parent</artifactId>
8-
<version>49</version>
8+
<version>50</version>
99
</parent>
1010

1111
<!-- Model Version -->
@@ -28,6 +28,11 @@
2828
</license>
2929
</licenses>
3030

31+
<organization>
32+
<name>Arquillian Community</name>
33+
<url>https://arquillian.org/</url>
34+
</organization>
35+
3136
<developers>
3237
<developer>
3338
<name>Lukas Fryc</name>
@@ -65,8 +70,6 @@
6570
<properties>
6671
<!-- JBoss Parent -->
6772
<maven.compiler.release>17</maven.compiler.release>
68-
<maven.compiler.target>${maven.compiler.release}</maven.compiler.target>
69-
<maven.compiler.source>${maven.compiler.release}</maven.compiler.source>
7073

7174
<!-- Arquillian -->
7275
<version.arquillian_core>1.10.0.Final</version.arquillian_core>
@@ -137,17 +140,4 @@
137140
<module>aggregate-jacoco-report</module>
138141
</modules>
139142

140-
<build>
141-
<plugins>
142-
<plugin>
143-
<artifactId>maven-release-plugin</artifactId>
144-
<configuration>
145-
<autoVersionSubmodules>true</autoVersionSubmodules>
146-
<localCheckout>true</localCheckout>
147-
<tagNameFormat>@{project.version}</tagNameFormat>
148-
</configuration>
149-
</plugin>
150-
</plugins>
151-
</build>
152-
153143
</project>

settings.xml

Lines changed: 0 additions & 64 deletions
This file was deleted.

0 commit comments

Comments
 (0)