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.

Sign up for GitHub

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

Jump to bottom

[WFCORE-3703] Move all SLF4J dependencies to Core #3182

Merged
merged 1 commit into from Mar 26, 2018
Merged

[WFCORE-3703] Move all SLF4J dependencies to Core #3182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 16 additions & 0 deletions core-feature-pack/pom.xml
View file
Open in desktop
Expand Up @@ -58,6 +58,11 @@
<artifactId>undertow-core</artifactId>
</dependency>

<dependency>
<groupId>ch.qos.cal10n</groupId>
<artifactId>cal10n-api</artifactId>
</dependency>

<dependency>
<groupId>com.fasterxml.woodstox</groupId>
<artifactId>woodstox-core</artifactId>
Expand Down Expand Up @@ -236,6 +241,17 @@
<artifactId>slf4j-api</artifactId>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-ext</artifactId>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.wildfly.common</groupId>
<artifactId>wildfly-common</artifactId>
Expand Down
22 changes: 22 additions & 0 deletions core-feature-pack/src/license/core-feature-pack-licenses.xml
View file
Open in desktop
@@ -1,6 +1,17 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<licenseSummary>
<dependencies>
<dependency>
<groupId>ch.qos.cal10n</groupId>
<artifactId>cal10n-api</artifactId>
<licenses>
<license>
<name>MIT License</name>
<url>http://www.opensource.org/licenses/MIT</url>
<distribution>repo</distribution>
</license>
</licenses>
</dependency>
<dependency>
<groupId>com.fasterxml.woodstox</groupId>
<artifactId>woodstox-core</artifactId>
Expand Down Expand Up @@ -422,6 +433,17 @@
</license>
</licenses>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-ext</artifactId>
<licenses>
<license>
<name>MIT License</name>
<url>http://www.opensource.org/licenses/MIT</url>
<distribution>repo</distribution>
</license>
</licenses>
</dependency>
<dependency>
<groupId>org.wildfly.client</groupId>
<artifactId>wildfly-client-config</artifactId>
Expand Down
36 changes: 36 additions & 0 deletions ...-feature-pack/src/main/resources/modules/system/layers/base/ch/qos/cal10n/main/module.xml
View file
Open in desktop
@@ -0,0 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>

<!--
~ JBoss, Home of Professional Open Source.
~ Copyright 2010, Red Hat, Inc., and individual contributors
~ as indicated by the @author tags. See the copyright.txt file in the
~ distribution for a full listing of individual contributors.
~
~ This is free software; you can redistribute it and/or modify it
~ under the terms of the GNU Lesser General Public License as
~ published by the Free Software Foundation; either version 2.1 of
~ the License, or (at your option) any later version.
~
~ This software is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
~ Lesser General Public License for more details.
~
~ You should have received a copy of the GNU Lesser General Public
~ License along with this software; if not, write to the Free
~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->

<module xmlns="urn:jboss:module:1.6" name="ch.qos.cal10n">
<properties>
<property name="jboss.api" value="private"/>
</properties>

<resources>
<artifact name="${ch.qos.cal10n:cal10n-api}"/>
</resources>

<dependencies>
</dependencies>
</module>
40 changes: 40 additions & 0 deletions ...-feature-pack/src/main/resources/modules/system/layers/base/org/slf4j/ext/main/module.xml
View file
Open in desktop
@@ -0,0 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>

<!--
~ JBoss, Home of Professional Open Source.
~ Copyright 2010, Red Hat, Inc., and individual contributors
~ as indicated by the @author tags. See the copyright.txt file in the
~ distribution for a full listing of individual contributors.
~
~ This is free software; you can redistribute it and/or modify it
~ under the terms of the GNU Lesser General Public License as
~ published by the Free Software Foundation; either version 2.1 of
~ the License, or (at your option) any later version.
~
~ This software is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
~ Lesser General Public License for more details.
~
~ You should have received a copy of the GNU Lesser General Public
~ License along with this software; if not, write to the Free
~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->

<module xmlns="urn:jboss:module:1.6" name="org.slf4j.ext">

<properties>
<property name="jboss.api" value="deprecated"/>
</properties>

<resources>
<artifact name="${org.slf4j:slf4j-ext}"/>
</resources>

<dependencies>
<module name="ch.qos.cal10n" />
<module name="org.slf4j"/>
<module name="org.jboss.logmanager"/>
</dependencies>
</module>
21 changes: 20 additions & 1 deletion pom.xml
View file
Open in desktop
Expand Up @@ -84,6 +84,7 @@
For example: <version.org.jboss.hal.release-stream>
-->

<version.ch.qos.cal10n>0.8.1</version.ch.qos.cal10n>
<version.com.io7m.xom>1.2.10</version.com.io7m.xom>
<version.commons-codec>1.10</version.commons-codec>
<version.commons-io>2.5</version.commons-io>
Expand Down Expand Up @@ -139,7 +140,7 @@
<version.org.mockito>2.13.0</version.org.mockito>
<version.org.picketbox>5.0.2.Final</version.org.picketbox>
<version.org.projectodd.vdx>1.1.6</version.org.projectodd.vdx>
<version.org.slf4j>1.7.22</version.org.slf4j>
<version.org.slf4j>1.7.22.jbossorg-1</version.org.slf4j>
<version.org.syslog4j>0.9.30</version.org.syslog4j>
<version.org.wildfly.build-tools>1.2.6.Final</version.org.wildfly.build-tools>
<version.org.wildfly.checkstyle-config>1.0.5.Final</version.org.wildfly.checkstyle-config>
Expand Down Expand Up @@ -945,6 +946,12 @@
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>ch.qos.cal10n</groupId>
<artifactId>cal10n-api</artifactId>
<version>${version.ch.qos.cal10n}</version>
</dependency>

<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
Expand Down Expand Up @@ -1475,6 +1482,18 @@
<version>${version.org.slf4j}</version>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-ext</artifactId>
<version>${version.org.slf4j}</version>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>${version.org.slf4j}</version>
</dependency>

<dependency>
<groupId>org.syslog4j</groupId>
<artifactId>syslog4j</artifactId>
Expand Down