Skip to content

Commit

Permalink
Remove support for AS7
Browse files Browse the repository at this point in the history
We are keeping the `creaper.wildfly` property. We are also keeping the
default use of `remote` protocol with `9999` port.
  • Loading branch information
jstourac committed Oct 13, 2021
1 parent 6dd93e1 commit 71454e1
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 328 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
## 2.0.0 (not yet released)

- move to JDK 8 as a minimal required JDK version
- support for AS7 officially removed
- note: the property `creaper.wildfly` and protocol `remoting` with `9999` are still kept as default for now

## 1.6.2 [The Speedy Gonzales Edition](https://en.wikipedia.org/wiki/Speedy_Gonzales) (2020-11-05)

Expand Down
16 changes: 4 additions & 12 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,22 +37,14 @@ a running application server use Arquillian. This means that it's enough to run
time to execute, so these are not executed by default. To execute them,
activate the `slow-tests` profile by running `mvn test -Pslow-tests`.

By default, the tests run against WildFly 10. If you want to run the tests
against AS7 or previous WildFly, activate one of the test suite profiles:
By default, the tests run against WildFly 20. If you want to run the tests
against previous WildFly, activate one of the test suite profiles:
`mvn clean test -Pwildfly8`. Available profiles are:

- `as7` (see below)
- `wildfly8`
- `wildfly9`
- `wildfly10` (active by default)

Using the `as7` profile requires access to a Maven repository that, in addition
to all other dependencies, also contains the respective AS7 distribution under
these coordinates: `org.jboss.as:jboss-as-dist:${version.org.jboss.as.jboss-as-everything}`
(see `pom.xml` for version number). The URL of the repository must be specified
using a system property `maven.jboss.ga.repository.url` (again see `pom.xml`):

mvn clean test -Pas7 -Dmaven.jboss.ga.repository.url=...
- ...
- `wildfly20` (active by default)

To run a single test from the test suite, the following Maven invocation works:
`mvn clean test -pl testsuite/standalone/ -Dtest=...` (possibly with a profile
Expand Down
24 changes: 0 additions & 24 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,30 +74,6 @@ in previous WildFly versions, but was moved to a separate module due to
messaging changes). These dependencies are not listed here, because there
are no commands in Creaper that use them.

#### JBoss AS 7

Dependencies for `creaper-core`:

<!-- 7.5.0.Final-redhat-21 is JBoss EAP 6.4.0 -->
<dependency>
<groupId>org.jboss.as</groupId>
<artifactId>jboss-as-controller-client</artifactId>
<version>7.5.0.Final-redhat-21</version>
</dependency>
<dependency>
<groupId>org.jboss.as</groupId>
<artifactId>jboss-as-cli</artifactId>
<version>7.5.0.Final-redhat-21</version>
</dependency>

Dependencies for `creaper-commands`:

<dependency>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-patching</artifactId>
<version>7.5.0.Final-redhat-21</version>
</dependency>

#### WildFly 8

Dependencies for `creaper-core`:
Expand Down

This file was deleted.

63 changes: 4 additions & 59 deletions testsuite/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
</modules>

<properties>
<version.as7>${version.org.jboss.as.jboss-as-everything}</version.as7>
<version.wildfly8>8.2.1.Final</version.wildfly8>
<version.wildfly9>9.0.2.Final</version.wildfly9>
<version.wildfly9.core>1.0.2.Final</version.wildfly9.core>
Expand Down Expand Up @@ -60,23 +59,13 @@
<version.wildfly20.arquillian>2.2.0.Final</version.wildfly20.arquillian>


<managementPort.as7>9999</managementPort.as7>
<managementPort.wildfly>9990</managementPort.wildfly>

<ignoredCategory.as7>org.wildfly.extras.creaper.test.WildFlyTests</ignoredCategory.as7>
<ignoredCategory.wildfly>org.wildfly.extras.creaper.test.AS7Tests, org.wildfly.extras.creaper.test.WildFly11Tests</ignoredCategory.wildfly>
<ignoredCategory.wildfly11>org.wildfly.extras.creaper.test.AS7Tests</ignoredCategory.wildfly11>
<ignoredCategory.wildfly>org.wildfly.extras.creaper.test.WildFly11Tests</ignoredCategory.wildfly>
<ignoredCategory.wildfly11 />

<specialJvmArgs.as7 />
<specialJvmArgs.wildfly>-Dcreaper.wildfly</specialJvmArgs.wildfly>

<as7.applicationServer.groupId>org.jboss.as</as7.applicationServer.groupId>
<as7.applicationServer.artifactId>jboss-as-dist</as7.applicationServer.artifactId>
<as7.applicationServer.version>${version.as7}</as7.applicationServer.version>
<as7.arquillianContainer.groupId>org.jboss.as</as7.arquillianContainer.groupId>
<as7.arquillianContainer.artifactId>jboss-as-arquillian-container-managed</as7.arquillianContainer.artifactId>
<as7.arquillianContainer.version>${version.as7}</as7.arquillianContainer.version>

<wildfly8.applicationServer.groupId>org.wildfly</wildfly8.applicationServer.groupId>
<wildfly8.applicationServer.artifactId>wildfly-dist</wildfly8.applicationServer.artifactId>
<wildfly8.applicationServer.version>${version.wildfly8}</wildfly8.applicationServer.version>
Expand Down Expand Up @@ -168,8 +157,8 @@
<wildfly20.arquillianContainer.artifactId>wildfly-arquillian-container-managed</wildfly20.arquillianContainer.artifactId>
<wildfly20.arquillianContainer.version>${version.wildfly20.arquillian}</wildfly20.arquillianContainer.version>

<!-- defined in profiles "as7", "wildfly8", "wildfly9", "wildfly10", "wildfly11", "wildfly12",
"wildfly13", "wildfly14", "wildfly15", "wildfly16", "wildfly17", "wildfly18", "wildfly19" and "wildfly20" below -->
<!-- defined in profiles "wildfly8", "wildfly9", "wildfly10", "wildfly11", "wildfly12", "wildfly13",
"wildfly14", "wildfly15", "wildfly16", "wildfly17", "wildfly18", "wildfly19" and "wildfly20" below -->
<applicationServer.groupId>MUST-BE-DEFINED</applicationServer.groupId>
<applicationServer.artifactId>MUST-BE-DEFINED</applicationServer.artifactId>
<applicationServer.version>MUST-BE-DEFINED</applicationServer.version>
Expand Down Expand Up @@ -364,50 +353,6 @@
</build>
</profile>

<profile>
<id>as7</id>

<properties>
<applicationServer.groupId>${as7.applicationServer.groupId}</applicationServer.groupId>
<applicationServer.artifactId>${as7.applicationServer.artifactId}</applicationServer.artifactId>
<applicationServer.version>${as7.applicationServer.version}</applicationServer.version>
<applicationServer.managementPort>${managementPort.as7}</applicationServer.managementPort>

<arquillianContainer.groupId>${as7.arquillianContainer.groupId}</arquillianContainer.groupId>
<arquillianContainer.artifactId>${as7.arquillianContainer.artifactId}</arquillianContainer.artifactId>
<arquillianContainer.version>${as7.arquillianContainer.version}</arquillianContainer.version>

<tests.ignoredCategory>${ignoredCategory.as7}</tests.ignoredCategory>
<tests.specialJvmArgs>${specialJvmArgs.as7}</tests.specialJvmArgs>
</properties>

<dependencies>
<dependency>
<groupId>org.wildfly.extras.creaper</groupId>
<artifactId>creaper-core</artifactId>
</dependency>
<dependency>
<groupId>org.wildfly.extras.creaper</groupId>
<artifactId>creaper-commands</artifactId>
</dependency>

<dependency>
<groupId>org.jboss.as</groupId>
<artifactId>jboss-as-controller-client</artifactId>
<version>${version.as7}</version>
</dependency>
<dependency>
<groupId>org.jboss.as</groupId>
<artifactId>jboss-as-cli</artifactId>
<version>${version.as7}</version>
</dependency>
<dependency>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-patching</artifactId>
<version>${version.as7}</version>
</dependency>
</dependencies>
</profile>
<profile>
<id>wildfly8</id>

Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

0 comments on commit 71454e1

Please sign in to comment.