Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Maven pom cleanup post jboss-parent upgrade: remove unnecessary decla… #222

Merged
merged 1 commit into from
Sep 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 19 additions & 43 deletions build/bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,46 +9,49 @@

<name>Arquillian Warp: BOM</name>
<description>Taking tests from Client to the Server and back</description>
<url>http://www.arquillian.org/</url>
<url>https://arquillian.org/arquillian-extension-warp/</url>

<licenses>
<license>
<name>Apache License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
</license>
</licenses>

<developers>
<developer>
<name>Lukas Fryc</name>
<email>[email protected]</email>
<roles>
<role>Emeritus Author</role>
</roles>
</developer>
<developer>
<name>Radoslav Husar</name>
<email>[email protected]</email>
<roles>
<role>Maintainer</role>
</roles>
</developer>
</developers>

<issueManagement>
<system>JIRA</system>
<url>https://issues.jboss.org/browse/ARQ/component/12315782</url>
<system>GitHub Issues</system>
<url>https://github.com/arquillian/arquillian-extension-warp/issues</url>
</issueManagement>

<scm>
<connection>scm:git:git://git@github.com:arquillian/arquillian-extension-warp.git</connection>
<developerConnection>scm:git:ssh://github.com/arquillian/arquillian-extension-warp.git</developerConnection>
<url>git://github.com/arquillian/arquillian-extension-warp.git</url>
<connection>scm:git:git://github.com:arquillian/arquillian-extension-warp.git</connection>
<developerConnection>scm:git:git@github.com:arquillian/arquillian-extension-warp.git</developerConnection>
<url>https://github.com/arquillian/arquillian-extension-warp</url>
<tag>HEAD</tag>
</scm>

<ciManagement>
<system>CloudBess</system>
<url>https://arquillian.ci.cloudbees.com/job/Arquillian-Extension-Warp/</url>
<system>GitHub Actions</system>
<url>https://github.com/arquillian/arquillian-extension-warp/actions</url>
</ciManagement>

<properties>
<jboss.releases.repo.url>https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/
</jboss.releases.repo.url>
<jboss.snapshots.repo.url>https://repository.jboss.org/nexus/content/repositories/snapshots/
</jboss.snapshots.repo.url>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
Expand Down Expand Up @@ -80,31 +83,4 @@
</dependencies>
</dependencyManagement>

<build>
<pluginManagement>
<plugins>
<plugin>
<artifactId>maven-release-plugin</artifactId>
<version>3.1.1</version>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.3.0</version>
</plugin>
</plugins>
</pluginManagement>
</build>

<distributionManagement>
<repository>
<id>jboss-releases-repository</id>
<name>JBoss Releases Repository</name>
<url>${jboss.releases.repo.url}</url>
</repository>
<snapshotRepository>
<id>jboss-snapshots-repository</id>
<name>JBoss Snapshots Repository</name>
<url>${jboss.snapshots.repo.url}</url>
</snapshotRepository>
</distributionManagement>
</project>
6 changes: 3 additions & 3 deletions build/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
<dependencies>

<!-- ShrinkWrap -->
<!--First declare the shrinkwrap-resolver bom to override version 2.2.6 pulled from elsewhere -->
<!-- First declare the shrinkwrap-resolver bom to override version 2.2.6 pulled from elsewhere -->
<!-- n.b. fixed by https://github.com/arquillian/arquillian-core/pull/575 - TODO move below post upgrade -->
<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-bom</artifactId>
Expand Down Expand Up @@ -57,7 +58,6 @@
<version>${version.arquillian_jacoco}</version>
</dependency>


<!-- Java EE APIs -->
<dependency>
<groupId>org.jboss.spec</groupId>
Expand Down Expand Up @@ -111,7 +111,7 @@
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
<version>1.15.3</version>
<version>${version.bytebuddy}</version>
</dependency>

<!-- Jacoco -->
Expand Down
37 changes: 20 additions & 17 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,24 +20,35 @@

<name>Arquillian Warp: Parent</name>
<description>Taking tests from Client to the Server and back</description>
<url>https://arquillian.org/arquillian-extension-warp/</url>

<licenses>
<license>
<name>Apache License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
</license>
</licenses>

<developers>
<developer>
<name>Lukas Fryc</name>
<email>[email protected]</email>
<roles>
<role>Emeritus Author</role>
</roles>
</developer>
<developer>
<name>Radoslav Husar</name>
<email>[email protected]</email>
<roles>
<role>Maintainer</role>
</roles>
</developer>
</developers>

<issueManagement>
<system>JIRA</system>
<url>https://issues.jboss.org/browse/ARQ/component/12315782</url>
<system>GitHub Issues</system>
<url>https://github.com/arquillian/arquillian-extension-warp/issues</url>
</issueManagement>

<scm>
Expand All @@ -53,25 +64,22 @@
</ciManagement>

<properties>
<!-- JBoss Parent -->
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>11</maven.compiler.source>

<!-- Arquillian -->
<version.servlet_api>3.0.1</version.servlet_api>
<version.arquillian_core>1.8.0.Final</version.arquillian_core>
<version.arquillian_drone>3.0.0-alpha.8</version.arquillian_drone>
<version.arquillian_jacoco>1.1.0</version.arquillian_jacoco>

<version.littleproxy>2.3.0</version.littleproxy>
<!--Littleproxy logging is done through SL4J and thus Log4j: -->
<!-- LittleProxy logging is done through SL4J and thus Log4j -->
<version.log4j>2.24.0</version.log4j>
<version.javassist>3.30.2-GA</version.javassist>
<version.httpcore>5.3</version.httpcore>

<!-- Tests -->
<version.junit>4.13.2</version.junit>
<version.mockito>4.9.0</version.mockito>
<version.bytebuddy>1.15.3</version.bytebuddy>
<version.jacoco>0.8.12</version.jacoco>
<version.shrinkwrap.resolver>3.3.1</version.shrinkwrap.resolver>
<version.jboss_spec>3.0.3.Final</version.jboss_spec>
Expand All @@ -81,14 +89,10 @@
<!-- Container Versions -->
<version.tomee>8.0.14</version.tomee>
<version.glassfish>5.1.0</version.glassfish>
<version.tomcat6>6.0.35</version.tomcat6>
<version.tomcat7>7.0.26</version.tomcat7>
<!-- Don't upgrade beyond WildFly 26 for EE 8, WF 27 and newer is Jakarta EE 10 -->
<version.wildfly>26.1.3.Final</version.wildfly>
<!-- Don't upgrade beyond wildfly-arquillian-container-managed 5.x for EE 8, version 5 and newer is Jakarta EE 10 -->
<version.wildfly.arquillian.container>4.0.1.Final</version.wildfly.arquillian.container>

<additionalparam>-Xdoclint:none</additionalparam>
</properties>

<modules>
Expand Down Expand Up @@ -125,7 +129,6 @@
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.3.0</version>
<configuration>
<argLine>${surefire.security.manager} ${modular.jdk.args}</argLine>
</configuration>
Expand All @@ -136,9 +139,9 @@

<profiles>
<profile>
<id>jdk-modular</id>
<id>jdk11-modular</id>
<activation>
<jdk>[17,)</jdk>
<jdk>[11,)</jdk>
</activation>
<properties>
<modular.jdk.args>
Expand All @@ -161,9 +164,9 @@
</properties>
</profile>
<profile>
<id>jdk23-security-manager</id>
<id>jdk18-security-manager</id>
<activation>
<jdk>[23,)</jdk>
<jdk>[18,)</jdk>
</activation>
<properties>
<surefire.security.manager>
Expand Down
Loading