Skip to content

Commit

Permalink
Merge pull request #834 from dmlloyd/upstream-logging
Browse files Browse the repository at this point in the history 
Switch to upstream JBoss Logging
  • Loading branch information
@dmlloyd
dmlloyd authored Feb 11, 2019
2 parents d18b2ba + 3a264a6 commit 9d728bf
Show file tree
Hide file tree
Showing 40 changed files with 249 additions and 8,322 deletions.
127 changes: 4 additions & 123 deletions build-parent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
<log4j2.version>2.0</log4j2.version>
<slf4j.version>1.7.25</slf4j.version>
<slf4j-jboss-logging.version>1.1.0.Final</slf4j-jboss-logging.version>
<wildfly-common.version>1.5.0.Alpha3-format-001</wildfly-common.version>
<wildfly-common.version>1.5.0.Alpha4-format-002</wildfly-common.version>
<wildfly-client-config.version>1.0.0.Final</wildfly-client-config.version>
<!-- This requires a release build of the https://github.com/jbossas/protean-wildfly-elytron-embedded project -->
<wildfly-elytron.version>1.8.0.Alpha1</wildfly-elytron.version>
Expand All @@ -127,6 +127,7 @@
<netty.version>4.1.30.Final</netty.version>
<reactive-streams.version>1.0.2</reactive-streams.version>
<test-containers.version>1.10.6</test-containers.version>
<jboss-logging.version>3.3.2.Final</jboss-logging.version>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -155,12 +156,6 @@
<groupId>org.jboss.shamrock</groupId>
<artifactId>shamrock-builder</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jboss.shamrock</groupId>
Expand Down Expand Up @@ -528,8 +523,8 @@
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-embedded</artifactId>
<version>${project.version}</version>
<artifactId>jboss-logging</artifactId>
<version>${jboss-logging.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.logmanager</groupId>
Expand Down Expand Up @@ -700,10 +695,6 @@
<artifactId>undertow-servlet</artifactId>
<version>${undertow.version}</version>
<exclusions>
<exclusion>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.spec.javax.annotation</groupId>
<artifactId>jboss-annotations-api_1.2_spec</artifactId>
Expand All @@ -715,10 +706,6 @@
<artifactId>undertow-websockets-jsr</artifactId>
<version>${undertow.version}</version>
<exclusions>
<exclusion>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.spec.javax.annotation</groupId>
<artifactId>jboss-annotations-api_1.2_spec</artifactId>
Expand All @@ -730,10 +717,6 @@
<artifactId>smallrye-config</artifactId>
<version>${smallrye-config.version}</version>
<exclusions>
<exclusion>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand All @@ -746,10 +729,6 @@
<artifactId>smallrye-metrics</artifactId>
<version>${smallrye-metrics.version}</version>
<exclusions>
<exclusion>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
</exclusion>
<exclusion>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
Expand All @@ -761,10 +740,6 @@
<artifactId>smallrye-open-api</artifactId>
<version>${smallrye-open-api.version}</version>
<exclusions>
<exclusion>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
</exclusion>
<exclusion>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
Expand All @@ -776,10 +751,6 @@
<artifactId>smallrye-opentracing</artifactId>
<version>${smallrye-opentracing.version}</version>
<exclusions>
<exclusion>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
</exclusion>
<exclusion>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
Expand All @@ -790,12 +761,6 @@
<groupId>io.smallrye</groupId>
<artifactId>smallrye-fault-tolerance</artifactId>
<version>${smallrye-fault-tolerance.version}</version>
<exclusions>
<exclusion>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
Expand Down Expand Up @@ -1036,12 +1001,6 @@
<groupId>org.jboss.metadata</groupId>
<artifactId>jboss-metadata-web</artifactId>
<version>${jboss-metadata-web.version}</version>
<exclusions>
<exclusion>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand All @@ -1068,22 +1027,12 @@
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-client</artifactId>
<version>${resteasy.version}</version>
<exclusions>
<exclusion>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-core</artifactId>
<version>${resteasy.version}</version>
<exclusions>
<exclusion>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.spec.javax.annotation</groupId>
<artifactId>jboss-annotations-api_1.3_spec</artifactId>
Expand All @@ -1099,10 +1048,6 @@
<artifactId>resteasy-core-spi</artifactId>
<version>${resteasy.version}</version>
<exclusions>
<exclusion>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.spec.javax.annotation</groupId>
<artifactId>jboss-annotations-api_1.3_spec</artifactId>
Expand All @@ -1117,33 +1062,17 @@
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-json-binding-provider</artifactId>
<version>${resteasy.version}</version>
<exclusions>
<exclusion>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-json-p-provider</artifactId>
<version>${resteasy.version}</version>
<exclusions>
<exclusion>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxb-provider</artifactId>
<version>${resteasy.version}</version>
<exclusions>
<exclusion>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
</exclusion>
<!-- The JBoss JAXB API artifact is used instead -->
<exclusion>
<groupId>javax.xml.bind</groupId>
Expand All @@ -1155,12 +1084,6 @@
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-rxjava2</artifactId>
<version>${resteasy.version}</version>
<exclusions>
<exclusion>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down Expand Up @@ -1189,12 +1112,6 @@
<groupId>org.jboss.threads</groupId>
<artifactId>jboss-threads</artifactId>
<version>${jboss-threads.version}</version>
<exclusions>
<exclusion>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
Expand All @@ -1205,12 +1122,6 @@
<groupId>org.jboss.protean.arc</groupId>
<artifactId>arc-processor</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jboss.protean.arc</groupId>
Expand Down Expand Up @@ -1260,23 +1171,11 @@
<groupId>org.wildfly.client</groupId>
<artifactId>wildfly-client-config</artifactId>
<version>${wildfly-client-config.version}</version>
<exclusions>
<exclusion>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.wildfly.security</groupId>
<artifactId>wildfly-elytron-embedded</artifactId>
<version>${wildfly-elytron.version}</version>
<exclusions>
<exclusion>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand All @@ -1303,12 +1202,6 @@
<groupId>org.jboss.slf4j</groupId>
<artifactId>slf4j-jboss-logging</artifactId>
<version>${slf4j-jboss-logging.version}</version>
<exclusions>
<exclusion>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>javax.enterprise</groupId>
Expand All @@ -1319,12 +1212,6 @@
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId>
<version>${hibernate-validator.version}</version>
<exclusions>
<exclusion>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
Expand All @@ -1341,10 +1228,6 @@
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand Down Expand Up @@ -1449,8 +1332,6 @@
<!-- Use javax.annotation-api -->
<exclude>org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec</exclude>
<exclude>org.jboss.spec.javax.annotation:jboss-annotations-api_1.3_spec</exclude>
<!-- use our jboss-logging -->
<exclude>org.jboss.logging:jboss-logging</exclude>
<!-- use our jboss-logmanager -->
<exclude>org.jboss.logging:jboss-logmanager</exclude>
<!-- We don't want all the API's in one jar-->
Expand Down
2 changes: 1 addition & 1 deletion core/builder/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-embedded</artifactId>
<artifactId>jboss-logging</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.threads</groupId>
Expand Down
2 changes: 1 addition & 1 deletion core/runtime/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-embedded</artifactId>
<artifactId>jboss-logging</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.logmanager</groupId>
Expand Down
6 changes: 0 additions & 6 deletions extensions/arc/runtime/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,6 @@
<dependency>
<groupId>org.jboss.protean.arc</groupId>
<artifactId>arc-runtime</artifactId>
<exclusions>
<exclusion>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jboss.shamrock</groupId>
Expand Down
10 changes: 0 additions & 10 deletions extensions/infinispan-client/runtime/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,23 +53,13 @@
<groupId>org.jboss.marshalling</groupId>
<artifactId>jboss-marshalling-osgi</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-remote-query-client</artifactId>
<optional>true</optional>
<exclusions>
<exclusion>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down
4 changes: 2 additions & 2 deletions independent-projects/infinispan-hibernate-cache-protean/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

<version.caffeine>2.6.2</version.caffeine>
<version.hibernate>5.4.1.Final</version.hibernate>
<version.jboss-logging>1.0.0.Alpha1-SNAPSHOT</version.jboss-logging>
<version.jboss-logging>3.3.2.Final</version.jboss-logging>

<!-- Build settings -->

Expand All @@ -47,7 +47,7 @@
<dependencies>
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-embedded</artifactId>
<artifactId>jboss-logging</artifactId>
<version>${version.jboss-logging}</version>
</dependency>

Expand Down
Loading

0 comments on commit 9d728bf

Please sign in to comment.