Skip to content

Commit

Permalink
Add Wildfly 15 - 20 versions.
Browse files Browse the repository at this point in the history
  • Loading branch information
@jstourac @simkam
jstourac authored and simkam committed Oct 8, 2020
1 parent 0f24861 commit 6126b92
Show file tree
Hide file tree
Showing 8 changed files with 692 additions and 22 deletions.
138 changes: 138 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,144 @@ Dependencies for `creaper-commands`:
<version>6.0.2.Final</version>
</dependency>

#### WildFly 15 (15.0.0) (based on WildFly Core 7)

Dependencies for `creaper-core`:

<dependency>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-controller-client</artifactId>
<version>7.0.0.Final</version>
</dependency>
<dependency>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-cli</artifactId>
<version>7.0.0.Final</version>
</dependency>

Dependencies for `creaper-commands`:

<dependency>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-patching</artifactId>
<version>7.0.0.Final</version>
</dependency>

#### WildFly 16 (16.0.0) (based on WildFly Core 8)

Dependencies for `creaper-core`:

<dependency>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-controller-client</artifactId>
<version>8.0.0.Final</version>
</dependency>
<dependency>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-cli</artifactId>
<version>8.0.0.Final</version>
</dependency>

Dependencies for `creaper-commands`:

<dependency>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-patching</artifactId>
<version>8.0.0.Final</version>
</dependency>

#### WildFly 17 (17.0.0) (based on WildFly Core 9)

Dependencies for `creaper-core`:

<dependency>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-controller-client</artifactId>
<version>9.0.1.Final</version>
</dependency>
<dependency>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-cli</artifactId>
<version>9.0.1.Final</version>
</dependency>

Dependencies for `creaper-commands`:

<dependency>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-patching</artifactId>
<version>9.0.1.Final</version>
</dependency>

#### WildFly 18 (18.0.0) (based on WildFly Core 10)

Dependencies for `creaper-core`:

<dependency>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-controller-client</artifactId>
<version>10.0.0.Final</version>
</dependency>
<dependency>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-cli</artifactId>
<version>10.0.0.Final</version>
</dependency>

Dependencies for `creaper-commands`:

<dependency>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-patching</artifactId>
<version>10.0.0.Final</version>
</dependency>

#### WildFly 19 (19.0.0) (based on WildFly Core 11)

Dependencies for `creaper-core`:

<dependency>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-controller-client</artifactId>
<version>11.0.0.Final</version>
</dependency>
<dependency>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-cli</artifactId>
<version>11.0.0.Final</version>
</dependency>

Dependencies for `creaper-commands`:

<dependency>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-patching</artifactId>
<version>11.0.0.Final</version>
</dependency>

#### WildFly 20 (20.0.0) (based on WildFly Core 12)

Dependencies for `creaper-core`:

<dependency>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-controller-client</artifactId>
<version>12.0.1.Final</version>
</dependency>
<dependency>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-cli</artifactId>
<version>12.0.1.Final</version>
</dependency>

Dependencies for `creaper-commands`:

<dependency>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-patching</artifactId>
<version>12.0.1.Final</version>
</dependency>

### Transitive Dependencies

These are the dependencies that you will get transitively when you depend
Expand Down
12 changes: 12 additions & 0 deletions core/src/main/java/org/wildfly/extras/creaper/core/ServerVersion.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,14 @@ public final class ServerVersion {
public static final ServerVersion VERSION_7_0_0 = new ServerVersion(7, 0, 0);
/** WF 14.0.x.Final */
public static final ServerVersion VERSION_8_0_0 = new ServerVersion(8, 0, 0);
/** WF 15.0.x.Final */
public static final ServerVersion VERSION_9_0_0 = new ServerVersion(9, 0, 0);
/** WF 16.0.x.Final, 17.0.x.Final and 18.0.x.Final */
public static final ServerVersion VERSION_10_0_0 = new ServerVersion(10, 0, 0);
/** WF 19.0.x.Final */
public static final ServerVersion VERSION_12_0_0 = new ServerVersion(12, 0, 0);
/** WF 20.0.x.Final */
public static final ServerVersion VERSION_13_0_0 = new ServerVersion(13, 0, 0);

private static final ServerVersion[] KNOWN_VERSIONS = {
VERSION_0_0_0,
Expand All @@ -99,6 +107,10 @@ public final class ServerVersion {
VERSION_6_0_0,
VERSION_7_0_0,
VERSION_8_0_0,
VERSION_9_0_0,
VERSION_10_0_0,
VERSION_12_0_0,
VERSION_13_0_0
};

/**
Expand Down
8 changes: 8 additions & 0 deletions core/src/test/java/org/wildfly/extras/creaper/core/ServerVersionTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ public void referenceEquality() {
assertSame(ServerVersion.VERSION_6_0_0, ServerVersion.from(6, 0, 0));
assertSame(ServerVersion.VERSION_7_0_0, ServerVersion.from(7, 0, 0));
assertSame(ServerVersion.VERSION_8_0_0, ServerVersion.from(8, 0, 0));
assertSame(ServerVersion.VERSION_9_0_0, ServerVersion.from(9, 0, 0));
assertSame(ServerVersion.VERSION_10_0_0, ServerVersion.from(10, 0, 0));
assertSame(ServerVersion.VERSION_12_0_0, ServerVersion.from(12, 0, 0));
assertSame(ServerVersion.VERSION_13_0_0, ServerVersion.from(13, 0, 0));

assertNotSame(ServerVersion.from(42, 42, 42), ServerVersion.from(42, 42, 42));
}
Expand Down Expand Up @@ -59,6 +63,10 @@ public void equality() {
assertEquals(ServerVersion.VERSION_6_0_0, ServerVersion.from(6, 0, 0));
assertEquals(ServerVersion.VERSION_7_0_0, ServerVersion.from(7, 0, 0));
assertEquals(ServerVersion.VERSION_8_0_0, ServerVersion.from(8, 0, 0));
assertEquals(ServerVersion.VERSION_9_0_0, ServerVersion.from(9, 0, 0));
assertEquals(ServerVersion.VERSION_10_0_0, ServerVersion.from(10, 0, 0));
assertEquals(ServerVersion.VERSION_12_0_0, ServerVersion.from(12, 0, 0));
assertEquals(ServerVersion.VERSION_13_0_0, ServerVersion.from(13, 0, 0));

assertEquals(ServerVersion.from(42, 42, 42), ServerVersion.from(42, 42, 42));
}
Expand Down
96 changes: 96 additions & 0 deletions core/src/test/java/org/wildfly/extras/creaper/core/offline/OfflineServerVersionTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,12 @@ public class OfflineServerVersionTest {
private static final String WFLY12_ROOT = "6.0";
private static final String WFLY13_ROOT = "7.0";
private static final String WFLY14_ROOT = "8.0";
private static final String WFLY15_ROOT = "9.0";
private static final String WFLY16_ROOT = "10.0";
private static final String WFLY17_ROOT = "10.0";
private static final String WFLY18_ROOT = "10.0";
private static final String WFLY19_ROOT = "12.0";
private static final String WFLY20_ROOT = "13.0";

@Rule
public final TemporaryFolder tmp = new TemporaryFolder();
Expand Down Expand Up @@ -110,6 +116,36 @@ public void discoverStandaloneXml_wfly14() throws IOException {
test(ServerVersion.VERSION_8_0_0, STANDALONE_XML, WFLY14_ROOT, EAP7_LOGGING, EAP7_EE);
}

@Test
public void discoverStandaloneXml_wfly15() throws IOException {
test(ServerVersion.VERSION_9_0_0, STANDALONE_XML, WFLY15_ROOT, EAP7_LOGGING, EAP7_EE);
}

@Test
public void discoverStandaloneXml_wfly16() throws IOException {
test(ServerVersion.VERSION_10_0_0, STANDALONE_XML, WFLY16_ROOT, EAP7_LOGGING, EAP7_EE);
}

@Test
public void discoverStandaloneXml_wfly17() throws IOException {
test(ServerVersion.VERSION_10_0_0, STANDALONE_XML, WFLY17_ROOT, EAP7_LOGGING, EAP7_EE);
}

@Test
public void discoverStandaloneXml_wfly18() throws IOException {
test(ServerVersion.VERSION_10_0_0, STANDALONE_XML, WFLY18_ROOT, EAP7_LOGGING, EAP7_EE);
}

@Test
public void discoverStandaloneXml_wfly19() throws IOException {
test(ServerVersion.VERSION_12_0_0, STANDALONE_XML, WFLY19_ROOT, EAP7_LOGGING, EAP7_EE);
}

@Test
public void discoverStandaloneXml_wfly20() throws IOException {
test(ServerVersion.VERSION_13_0_0, STANDALONE_XML, WFLY20_ROOT, EAP7_LOGGING, EAP7_EE);
}

@Test
public void discoverHostXml_eap6() throws IOException {
test(ServerVersion.VERSION_1_7_0, HOST_XML, EAP6_ROOT, EAP6_LOGGING, EAP6_EE);
Expand Down Expand Up @@ -140,6 +176,36 @@ public void discoverHostXml_wfly14() throws IOException {
test(ServerVersion.VERSION_8_0_0, HOST_XML, WFLY14_ROOT, EAP7_LOGGING, EAP7_EE);
}

@Test
public void discoverHostXml_wfly15() throws IOException {
test(ServerVersion.VERSION_9_0_0, HOST_XML, WFLY15_ROOT, EAP7_LOGGING, EAP7_EE);
}

@Test
public void discoverHostXml_wfly16() throws IOException {
test(ServerVersion.VERSION_10_0_0, HOST_XML, WFLY16_ROOT, EAP7_LOGGING, EAP7_EE);
}

@Test
public void discoverHostXml_wfly17() throws IOException {
test(ServerVersion.VERSION_10_0_0, HOST_XML, WFLY17_ROOT, EAP7_LOGGING, EAP7_EE);
}

@Test
public void discoverHostXml_wfly18() throws IOException {
test(ServerVersion.VERSION_10_0_0, HOST_XML, WFLY18_ROOT, EAP7_LOGGING, EAP7_EE);
}

@Test
public void discoverHostXml_wfly19() throws IOException {
test(ServerVersion.VERSION_12_0_0, HOST_XML, WFLY19_ROOT, EAP7_LOGGING, EAP7_EE);
}

@Test
public void discoverHostXml_wfly20() throws IOException {
test(ServerVersion.VERSION_13_0_0, HOST_XML, WFLY20_ROOT, EAP7_LOGGING, EAP7_EE);
}

@Test
public void discoverDomainXml_eap6() throws IOException {
test(ServerVersion.VERSION_1_7_0, DOMAIN_XML, EAP6_ROOT, EAP6_LOGGING, EAP6_EE);
Expand Down Expand Up @@ -170,6 +236,36 @@ public void discoverDomainXml_wfly14() throws IOException {
test(ServerVersion.VERSION_8_0_0, DOMAIN_XML, WFLY14_ROOT, EAP7_LOGGING, EAP7_EE);
}

@Test
public void discoverDomainXml_wfly15() throws IOException {
test(ServerVersion.VERSION_9_0_0, DOMAIN_XML, WFLY15_ROOT, EAP7_LOGGING, EAP7_EE);
}

@Test
public void discoverDomainXml_wfly16() throws IOException {
test(ServerVersion.VERSION_10_0_0, DOMAIN_XML, WFLY16_ROOT, EAP7_LOGGING, EAP7_EE);
}

@Test
public void discoverDomainXml_wfly17() throws IOException {
test(ServerVersion.VERSION_10_0_0, DOMAIN_XML, WFLY17_ROOT, EAP7_LOGGING, EAP7_EE);
}

@Test
public void discoverDomainXml_wfly18() throws IOException {
test(ServerVersion.VERSION_10_0_0, DOMAIN_XML, WFLY18_ROOT, EAP7_LOGGING, EAP7_EE);
}

@Test
public void discoverDomainXml_wfly19() throws IOException {
test(ServerVersion.VERSION_12_0_0, DOMAIN_XML, WFLY19_ROOT, EAP7_LOGGING, EAP7_EE);
}

@Test
public void discoverDomainXml_wfly20() throws IOException {
test(ServerVersion.VERSION_13_0_0, DOMAIN_XML, WFLY20_ROOT, EAP7_LOGGING, EAP7_EE);
}

private void test(ServerVersion expected, String xmlPattern,
String rootVersion, String loggingVersion, String eeVersion) throws IOException {
String xml = xmlPattern
Expand Down
Loading

0 comments on commit 6126b92

Please sign in to comment.