From 93b53a37048526a66cdcc626c4ab495587b4b3ef Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 5 Jun 2018 17:28:52 +0200 Subject: [PATCH] Upgrade to WildFly 12 #146 --- README.md | 4 +-- pom.xml | 33 +++++-------------- src/site/markdown/examples/wildfly-json.md.vm | 2 +- src/site/markdown/examples/wildfly.md.vm | 8 ++--- src/site/markdown/index.md.vm | 4 +-- .../logging/StackTraceFilterUnitTests.java | 5 +-- src/test/resources/arquillian.xml | 9 ----- 7 files changed, 18 insertions(+), 47 deletions(-) diff --git a/README.md b/README.md index b5954a96d..47ae3b0c6 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ Provides logging to logstash using the Graylog Extended Logging Format ([GELF](h * [log4j 1.2.x](#log4j) * [log4j 2.x](#log4j2) * [JBoss AS7](#jbossas7) -* [WildFly 8/WildFly /WildFly 10](#wildfly) +* [WildFly](#wildfly) * [Logback](#logback) See also http://logging.paluch.biz/ or http://www.graylog2.org/resources/gelf/specification for further documentation. @@ -296,7 +296,7 @@ Include the library as module (see download above), then add following lines to -WildFly 8/WildFly 9/WildFly 10 configuration +WildFly configuration -------------------------------------------- Include the library as module (see download above). Place it below the `$JBOSS_HOME/modules/system/layers/base` path, then add following lines to your configuration: diff --git a/pom.xml b/pom.xml index 6148c30b8..bfc4f3c52 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ 1.7.13 1.1.3 1.5.2.Final - 1.1.5.Final + 1.4.0.Final 3.6 3.0.0 @@ -407,19 +407,14 @@ provided - - org.wildfly.arquillian - wildfly-arquillian-common - 1.0.0.Alpha5 + org.wildfly.core + wildfly-cli + 5.0.0.Final test - - - sun.jdk - jconsole - - + + org.jboss.arquillian.junit arquillian-junit-container @@ -507,8 +502,8 @@ 1.8 - 10.0.0.Final - 1.0.1.Final + 12.0.0.Final + 2.1.0.Final ${project.build.directory}/wildfly-${version.wildfly} @@ -517,13 +512,6 @@ wildfly-arquillian-container-managed ${version.org.wildfly.arquillian} test - - - - sun.jdk - jconsole - - @@ -601,11 +589,6 @@ - - org.junit.platform - junit-platform-surefire-provider - 1.0.2 - org.junit.jupiter junit-jupiter-engine diff --git a/src/site/markdown/examples/wildfly-json.md.vm b/src/site/markdown/examples/wildfly-json.md.vm index 5f94ae3b2..1fc0e0cc2 100644 --- a/src/site/markdown/examples/wildfly-json.md.vm +++ b/src/site/markdown/examples/wildfly-json.md.vm @@ -55,7 +55,7 @@ follow the steps to integrate the module: 2. Extract the module to `/modules/system/layers/base`. 3. Configure the logging subsystem by either adopting the changes in the XML files or by using the CLI -WildFly 8/WildFly 9/WildFly 10 Logging configuration +WildFly Logging configuration -------------- XML Configuration: diff --git a/src/site/markdown/examples/wildfly.md.vm b/src/site/markdown/examples/wildfly.md.vm index da0a1b8af..250af8152 100644 --- a/src/site/markdown/examples/wildfly.md.vm +++ b/src/site/markdown/examples/wildfly.md.vm @@ -5,7 +5,7 @@ Following settings can be used: | Attribute Name | Description | Default | | ----------------- |:------------------------------------:|:-------:| -| host | Hostname/IP-Address of the Logstash host. The `host` field accepts following forms:
  • `tcp:hostname` for TCP transport, e. g. `tcp:127.0.0.1` or `tcp:some.host.com`
  • `udp:hostname` for UDP transport, e. g. `udp:127.0.0.1`, `udp:some.host.com` or just `some.host.com`
  • `redis://[:password@]hostname:port/db-number#listname` for Redis transport. See [Redis transport for logstash-gelf](../redis.html) for details.
  • `redis-sentinel://[:password@]hostname:port/db-number?masterId=masterId#listname` for Redis transport with Sentinel lookup. See [Redis transport for logstash-gelf](../redis.html) for details.
| none | +| host | Hostname/IP-Address of the Logstash host. The `host` field accepts following forms:
  • `tcp:hostname` for TCP transport, e. g. `tcp:127.0.0.1` or `tcp:some.host.com`
  • `udp:hostname` for UDP transport, e. g. `udp:127.0.0.1`, `udp:some.host.com` or just `some.host.com`
  • `redis://[:password@]hostname:port/db-number#listname` for Redis transport. See [Redis transport for logstash-gelf](../redis.html) for details.
  • `redis-sentinel://[:password@]hostname:port/db-number?masterId=masterId#listname` for Redis transport with Sentinel lookup. See [Redis transport for logstash-gelf](../redis.html) for details.
| none | | port | Port of the Logstash host | `12201` | | version | GELF Version `1.0` or `1.1` | `1.0` | | originHost | Originating Hostname | FQDN Hostname | @@ -33,12 +33,12 @@ If you want to get started with the logstash-gelf support for WildFly, you will the server. It is possible to create the module manually, but it's easier to use the prepackaged binary. Please follow the steps to integrate the module: -1. Obtain the logging module from [Maven](http://search.maven.org/remotecontent?filepath=biz/paluch/logging/logstash-gelf/${logstash-gelf-release-version}/logstash-gelf-${logstash-gelf-release-version}-logging-module.zip) or [Github](https://github.com/mp911de/logstash-gelf/releases/download/logstash-gelf-${logstash-gelf-release-version}/logstash-gelf-${logstash-gelf-release-version}-logging-module.zip) +1. Obtain the logging module from [Maven](http://search.maven.org/remotecontent?filepath=biz/paluch/logging/logstash-gelf/${logstash-gelf-release-version}/logstash-gelf-${logstash-gelf-release-version}-logging-module.zip) or [Github](https://github.com/mp911de/logstash-gelf/releases/download/logstash-gelf-${logstash-gelf-release-version}/logstash-gelf-${logstash-gelf-release-version}-logging-module.zip) 2. Extract the module to `/modules/system/layers/base`. 3. Configure the logging subsystem by either adopting the changes in the XML files or by using the CLI -WildFly 8/WildFly 9/WildFly 10 Logging Configuration +WildFly Logging Configuration -------------- XML Configuration: @@ -97,4 +97,4 @@ CLI Configuration: }) /subsystem=logging/root-logger=ROOT/:write-attribute(name=handlers,value=["FILE","CONSOLE","GelfLogger"]) - + diff --git a/src/site/markdown/index.md.vm b/src/site/markdown/index.md.vm index 145d6f7f5..9bccb11e6 100644 --- a/src/site/markdown/index.md.vm +++ b/src/site/markdown/index.md.vm @@ -10,8 +10,8 @@ Provides logging to logstash using the Graylog Extended Logging Format (GELF) 1. * [log4j 1.2.x JSON Layout](examples/log4j-1.2.x-json.html) * [log4j 2.x](examples/log4j-2.x.html) * [JBoss 7](examples/jbossas7.html) -* [WildFly 8/WildFly 9/WildFly 10](examples/wildfly.html) -* [WildFly 8/WildFly 9/WildFly 10 JSON Formatter](examples/wildfly-json.html) +* [WildFly](examples/wildfly.html) +* [WildFly JSON Formatter](examples/wildfly-json.html) * [Logback](examples/logback.html) How to get diff --git a/src/test/java/biz/paluch/logging/StackTraceFilterUnitTests.java b/src/test/java/biz/paluch/logging/StackTraceFilterUnitTests.java index 42068097e..e57634994 100644 --- a/src/test/java/biz/paluch/logging/StackTraceFilterUnitTests.java +++ b/src/test/java/biz/paluch/logging/StackTraceFilterUnitTests.java @@ -5,7 +5,6 @@ import java.util.Arrays; import java.util.List; -import org.jboss.common.beans.property.ByteEditor; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -46,7 +45,6 @@ public void filterWholeStackTrace() { assertThat(lines).contains("\tSuppressed: java.lang.RuntimeException: suppressed"); assertThat(lines).contains("\t\tCaused by: java.lang.NumberFormatException: For input string: \"text\""); - assertThat(lines).contains("\t\t\t\t\t1 line skipped for [org.jboss]"); } @Test @@ -105,8 +103,7 @@ private Exception intermediate2() { suppressed1.addSuppressed(suppressed2); try { - new ByteEditor().setAsText("text"); - + throw new IllegalArgumentException(new NumberFormatException("For input string: \"text\"")); } catch (Exception e) { suppressed1.addSuppressed(e); } diff --git a/src/test/resources/arquillian.xml b/src/test/resources/arquillian.xml index be6b22352..3e3aa8ab2 100644 --- a/src/test/resources/arquillian.xml +++ b/src/test/resources/arquillian.xml @@ -1,10 +1,4 @@ - @@ -14,9 +8,6 @@ - - REMOTE - ${jboss.home} -XX:MaxPermSize=512m -Djava.net.preferIPv4Stack=true -XX:+IgnoreUnrecognizedVMOptions