Skip to content

Commit

Permalink
RHDM-251 - Wildfly 11 upgrade (#811)
Browse files Browse the repository at this point in the history
* Upgrade supported WildFly version to 11.

This reverts commit c53616e.

* RHDM-251: added SDM dev extension for disabling JBoss logging

* Fix logging in SDM for drools-wb-webapp.
  • Loading branch information
mareknovotny authored and mbarkley committed Mar 1, 2018
1 parent 931d7e1 commit 7244057
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 26 deletions.
13 changes: 10 additions & 3 deletions drools-wb-webapp/pom.xml
Expand Up @@ -34,7 +34,7 @@

<properties>
<!-- Add the absolute path for $JBOSS_HOME below to manage another instance -->
<errai.jboss.home>${project.build.directory}/wildfly-${version.org.wildfly.gwt.sdm}</errai.jboss.home>
<errai.jboss.home>${project.build.directory}/wildfly-${version.org.jboss.errai.wildfly}</errai.jboss.home>
</properties>

<dependencies>
Expand Down Expand Up @@ -89,6 +89,13 @@
</exclusions>
</dependency>

<!-- Disables WF logging subsystem in SDM -->
<dependency>
<groupId>org.kie.workbench</groupId>
<artifactId>kie-wb-common-wf-sdm-extensions</artifactId>
<scope>provided</scope>
</dependency>

<!-- dependencies added because of new illegal transitive dependency check -->
<dependency>
<groupId>org.apache.lucene</groupId>
Expand Down Expand Up @@ -1313,9 +1320,9 @@
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.wildfly</groupId>
<groupId>org.jboss.errai</groupId>
<artifactId>wildfly-dist</artifactId>
<version>${version.org.wildfly.gwt.sdm}</version>
<version>${version.org.jboss.errai.wildfly}</version>
<type>zip</type>
<overWrite>false</overWrite>
<outputDirectory>${project.build.directory}</outputDirectory>
Expand Down
2 changes: 1 addition & 1 deletion drools-wb-webapp/src/main/resources/logback.xml
Expand Up @@ -14,7 +14,7 @@
<logger name="org.guvnor" level="info"/>
<logger name="org.uberfire.backend" level="debug"/>

<root level="error">
<root level="info">
<appender-ref ref="consoleAppender" />
</root>

Expand Down
Expand Up @@ -19,17 +19,13 @@
-->
<jboss-deployment-structure xmlns="urn:jboss:deployment-structure:1.0">
<deployment>
<exclusions>
<!-- Need to exclude the ecj jar in Wildfly 8 that does not support Java 8. -->
<module name="io.undertow.jsp"/>
</exclusions>
<dependencies>
<!-- IMPORTANT: when adding dependency (module) here, make sure it is a public one.
Do not add private modules as there is no guarantee they won't be changed or
removed in future. WildFly also generates warning(s) during the deployment if
the WAR depends on private modules. -->
<!-- Keep the alphabetical order! -->
<module name="deployment.jsp"/>
<module name="io.undertow.jsp"/>
<module name="javax.activation.api"/>
<module name="javax.ejb.api"/>
<module name="javax.faces.api"/>
Expand All @@ -46,15 +42,10 @@
<module name="org.hibernate.commons-annotations"/>
<module name="org.hibernate.validator"/>
<module name="org.jboss.ejb-client"/>
<module name="org.jboss.logging"/>
<module name="org.jboss.logmanager"/>
<module name="org.jboss.marshalling"/>
<module name="org.jboss.remote-naming"/>
<module name="org.jboss.remoting3"/>
<module name="org.jboss.xnio"/>
<module name="org.slf4j"/>
<module name="org.slf4j.ext"/>
<module name="org.slf4j.jcl-over-slf4j"/>


<!-- ******************************************************************************************** -->
Expand All @@ -73,20 +64,8 @@
required if using the concrete Wildfly/EAP provider for the user system management, as this webapp does by default. -->
<module name="org.jboss.as.controller-client"/>
<module name="org.jboss.as.domain-management"/>
<module name="org.jboss.sasl"/>
<module name="org.jboss.msc"/>
<module name="org.jboss.dmr"/>
</dependencies>
</deployment>

<!-- A dependency for all classes in io.undertow.jsp *except* those in Wildfly's ecj jar. -->
<module name="deployment.jsp">
<dependencies>
<module name="io.undertow.jsp" export="true">
<imports>
<exclude path="org/eclipse/jdt/**"/>
</imports>
</module>
</dependencies>
</module>
</jboss-deployment-structure>

0 comments on commit 7244057

Please sign in to comment.