Skip to content

Commit 868fe32

Browse files
feat: Added jul.to.sl4j bridge (#6102)
* refactor: Removed programmatic SLF4JBridgeHandler initialization (#5884) * added new org.eclipse.kura.jul.to.slf4j.configuration bundle * Fixed copyright * added jul.to.slf4j * updated NOTICE.md * Added jul.to.slf4j to test runtime Signed-off-by: Nicola Timeus <[email protected]> * Added jul.to.slf4j to dev env emulator Signed-off-by: Nicola Timeus <[email protected]> --------- Signed-off-by: Nicola Timeus <[email protected]> Co-authored-by: Nicola Timeus <[email protected]>
1 parent a263fa0 commit 868fe32

File tree

27 files changed

+217
-0
lines changed

27 files changed

+217
-0
lines changed

NOTICE.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ This project leverages the following third party content.
115115
* maven/mavencentral/org.apache.logging.log4j/log4j-api/2.23.1, Apache-2.0, approved, #13368
116116
* maven/mavencentral/org.apache.logging.log4j/log4j-core/2.23.1, Apache-2.0 AND (Apache-2.0 AND LGPL-2.0-or-later), approved, #14737
117117
* maven/mavencentral/org.apache.logging.log4j/log4j-slf4j-impl/2.23.1, Apache-2.0, approved, #14736
118+
* maven/mavencentral/org.slf4j/jul-to-slf4j/2.0.17, MIT, approved, #7698
118119
* maven/mavencentral/org.apache.qpid/proton-j/0.33.2, Apache-2.0, approved, clearlydefined
119120
* maven/mavencentral/org.apache.qpid/qpid-jms-client/0.45.0, Apache-2.0, approved, clearlydefined
120121
* maven/mavencentral/org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-beans/4.3.20.RELEASE_1, Apache-2.0, approved, CQ16239

kura/distrib/config/kura.build.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ org.eclipse.kura.rest.network.status.provider.version=1.3.0
138138
org.eclipse.kura.wire.script.tools.version=1.3.0
139139
org.eclipse.kura.cloudconnection.sparkplug.mqtt.provider.version=1.1.0
140140
org.eclipse.kura.equinox.permission.cache.fix.version=1.0.0
141+
org.eclipse.kura.jul.to.slf4j.configuration.version=1.0.0
141142

142143
## features versions
143144
org.eclipse.kura.driver.opcua.version=1.6.1

kura/distrib/pom.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -709,6 +709,11 @@
709709
<artifactId>org.eclipse.kura.equinox.permission.cache.fix</artifactId>
710710
<version>${org.eclipse.kura.equinox.permission.cache.fix.version}</version>
711711
</artifactItem>
712+
<artifactItem>
713+
<groupId>org.eclipse.kura</groupId>
714+
<artifactId>org.eclipse.kura.jul.to.slf4j.configuration</artifactId>
715+
<version>${org.eclipse.kura.jul.to.slf4j.configuration.version}</version>
716+
</artifactItem>
712717
</artifactItems>
713718
<stripVersion>true</stripVersion>
714719
<outputDirectory>${project.basedir}/target/plugins</outputDirectory>
@@ -876,6 +881,7 @@
876881
<move file="target/plugins/org.eclipse.kura.event.publisher.jar" tofile="target/plugins/org.eclipse.kura.event.publisher_${org.eclipse.kura.event.publisher.version}.jar" />
877882
<move file="target/plugins/org.eclipse.kura.rest.network.status.provider.jar" tofile="target/plugins/org.eclipse.kura.rest.network.status.provider_${org.eclipse.kura.rest.network.status.provider.version}.jar" />
878883
<move file="target/plugins/org.eclipse.kura.equinox.permission.cache.fix.jar" tofile="target/plugins/org.eclipse.kura.equinox.permission.cache.fix_${org.eclipse.kura.equinox.permission.cache.fix.version}.jar" />
884+
<move file="target/plugins/org.eclipse.kura.jul.to.slf4j.configuration.jar" tofile="target/plugins/org.eclipse.kura.jul.to.slf4j.configuration_${org.eclipse.kura.jul.to.slf4j.configuration.version}.jar" />
879885
</target>
880886
</configuration>
881887
</execution>
@@ -2482,6 +2488,8 @@
24822488
<copy file="${project.build.directory}/plugins/org.eclipse.kura.web2_${org.eclipse.kura.web2.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" failonerror="false" />
24832489
<copy file="${project.build.directory}/plugins/org.eclipse.kura.useradmin.store_${org.eclipse.kura.useradmin.store.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
24842490
<copy file="${project.build.directory}/plugins/org.eclipse.kura.equinox.permission.cache.fix_${org.eclipse.kura.equinox.permission.cache.fix.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
2491+
<copy file="${project.build.directory}/plugins/org.eclipse.kura.jul.to.slf4j.configuration_${org.eclipse.kura.jul.to.slf4j.configuration.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
2492+
24852493
<!-- Add REST bundles-->
24862494
<copy file="${project.build.directory}/plugins/org.eclipse.kura.request.handler.jaxrs_${org.eclipse.kura.request.handler.jaxrs.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />
24872495
<copy file="${project.build.directory}/plugins/org.eclipse.kura.rest.provider_${org.eclipse.kura.rest.provider.version}.jar" todir="${project.build.directory}/staging/target-definition/equinox_3.16.0/repository/plugins" />

kura/distrib/src/main/ant/build_equinox_distrib.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -799,6 +799,9 @@ fi]]>
799799
<zipfileset
800800
file="${project.build.directory}/plugins/org.eclipse.kura.equinox.permission.cache.fix_${org.eclipse.kura.equinox.permission.cache.fix.version}.jar"
801801
prefix="${build.output.name}/${plugins.folder}" />
802+
<zipfileset
803+
file="${project.build.directory}/plugins/org.eclipse.kura.jul.to.slf4j.configuration_${org.eclipse.kura.jul.to.slf4j.configuration.version}.jar"
804+
prefix="${build.output.name}/${plugins.folder}" />
802805
</zip>
803806

804807
<antcall target="camel-jar" />
@@ -992,6 +995,10 @@ fi]]>
992995
value=", reference:file:${kura.install.dir}/${kura.symlink}/${plugins.folder}/org.apache.commons.commons-io_${org.apache.commons.commons-io.version}.jar@3:start" />
993996
<entry key="osgi.bundles" operation="+"
994997
value=", reference:file:${kura.install.dir}/${kura.symlink}/${plugins.folder}/slf4j.api_${slf4j.api.version}.jar@3:start" />
998+
<entry key="osgi.bundles" operation="+"
999+
value=", reference:file:${kura.install.dir}/${kura.symlink}/${plugins.folder}/jul.to.slf4j_${jul.to.slf4j.version}.jar@3" />
1000+
<entry key="osgi.bundles" operation="+"
1001+
value=", reference:file:${kura.install.dir}/${kura.symlink}/${plugins.folder}/org.eclipse.kura.jul.to.slf4j.configuration_${org.eclipse.kura.jul.to.slf4j.configuration.version}.jar@3:start" />
9951002
<entry key="osgi.bundles" operation="+"
9961003
value=", reference:file:${kura.install.dir}/${kura.symlink}/${plugins.folder}/jcl.over.slf4j_${jcl.over.slf4j.version}.jar@3:start" />
9971004
<entry key="osgi.bundles" operation="+"

kura/distrib/src/main/resources/common/Kura_Emulator.launch

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,8 @@
182182
<setEntry value="org.knowhowlab.osgi.monitoradmin@default:default"/>
183183
<setEntry value="org.usb4java@default:default"/>
184184
<setEntry value="slf4j.api@default:default"/>
185+
<setEntry value="org.eclipse.kura.jul.to.slf4j.configuration@default:default"/>
186+
<setEntry value="jul.to.slf4j@default:default"/>
185187
<setEntry value="usb4java-javax@default:default"/>
186188
<setEntry value="org.apache.servicemix.bundles.c3p0@default:default"/>
187189
<setEntry value="com.zaxxer.HikariCP@default:default"/>

kura/distrib/src/main/resources/docker-x86_64-nn/log4j.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,10 @@
5757
<AppenderRef ref="Console"/>
5858
<AppenderRef ref="RollingFile"/>
5959
</Logger>
60+
<Logger name="org.glassfish.jersey.internal" level="error" additivity="false">
61+
<AppenderRef ref="Console"/>
62+
<AppenderRef ref="RollingFile"/>
63+
</Logger>
6064
<Logger name="AuditLogger" level="trace" additivity="false">
6165
<AppenderRef ref="audit"/>
6266
</Logger>

kura/distrib/src/main/resources/generic-aarch64-nn/log4j.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@
4848
<Logger name="org.eclipse" level="info" additivity="false">
4949
<AppenderRef ref="RollingFile"/>
5050
</Logger>
51+
<Logger name="org.glassfish.jersey.internal" level="error" additivity="false">
52+
<AppenderRef ref="RollingFile"/>
53+
</Logger>
5154
<Logger name="AuditLogger" level="trace" additivity="false">
5255
<AppenderRef ref="audit"/>
5356
</Logger>

kura/distrib/src/main/resources/generic-aarch64/log4j.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@
4848
<Logger name="org.eclipse" level="info" additivity="false">
4949
<AppenderRef ref="RollingFile"/>
5050
</Logger>
51+
<Logger name="org.glassfish.jersey.internal" level="error" additivity="false">
52+
<AppenderRef ref="RollingFile"/>
53+
</Logger>
5154
<Logger name="AuditLogger" level="trace" additivity="false">
5255
<AppenderRef ref="audit"/>
5356
</Logger>

kura/distrib/src/main/resources/generic-arm32-nn/log4j.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@
4848
<Logger name="org.eclipse" level="info" additivity="false">
4949
<AppenderRef ref="RollingFile"/>
5050
</Logger>
51+
<Logger name="org.glassfish.jersey.internal" level="error" additivity="false">
52+
<AppenderRef ref="RollingFile"/>
53+
</Logger>
5154
<Logger name="AuditLogger" level="trace" additivity="false">
5255
<AppenderRef ref="audit"/>
5356
</Logger>

kura/distrib/src/main/resources/generic-arm32/log4j.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@
4848
<Logger name="org.eclipse" level="info" additivity="false">
4949
<AppenderRef ref="RollingFile"/>
5050
</Logger>
51+
<Logger name="org.glassfish.jersey.internal" level="error" additivity="false">
52+
<AppenderRef ref="RollingFile"/>
53+
</Logger>
5154
<Logger name="AuditLogger" level="trace" additivity="false">
5255
<AppenderRef ref="audit"/>
5356
</Logger>

0 commit comments

Comments
 (0)