Project

General

Profile

« Previous | Next » 

Revision b5f21afa

Added by Andreas Müller 8 months ago

ref #10072, ref #9359, ref #10095 replace commons-logging by jcl-over-slf4j and adapt some loggers to log4j

View differences:

pom.xml
41 41 
    <doxia.version>1.11.1</doxia.version>                <!-- checked 2021-12 -->
42 42 
    <poi.version>5.2.2</poi.version>                    <!-- checked 2022-06 -->
43 43 
    <jackson.version>2.13.3</jackson.version>           <!-- checked 2022-05 -->
44 
	<commons-logging.version>1.2</commons-logging.version> <!-- checked 2022-06 -->
45 44 
	<!-- CAUTION when upgrading, 1.8x requires another log4j binding: https://logging.apache.org/log4j/2.x/log4j-slf4j-impl/index.html -->
46 45 
    <slf4j.version>1.7.36</slf4j.version>               <!-- checked 2022-06 -->
47 46 
	<log4j.version>2.18.0</log4j.version>
......
940 939 
        <groupId>org.apache.httpcomponents</groupId>
941 940 
        <artifactId>httpclient</artifactId>
942 941 
        <version>${httpcomponents.version}</version>
942 
        <exclusions>
943 
          <exclusion>
944 
            <!-- we use jcl-over-slf4j instead -->
945 
            <groupId>commons-logging</groupId>
946 
            <artifactId>commons-logging</artifactId>
947 
          </exclusion>
948 
        </exclusions>
943 949 
      </dependency>
944 950 
      <dependency>
945 951 
        <groupId>org.apache.httpcomponents</groupId>
......
967 973 
        <artifactId>commons-codec</artifactId>
968 974 
        <version>1.15</version>
969 975 
      </dependency>
970 
      <!-- only for version management, httpcore:4.2.4, commons-beanutils:1.8.3,
971 
        httpclient:4.2.3, spring-modules-cache
972 
        require 1.1 and batik-ext requires 1.0.4, so we update here to the latest
973 
        version 1.1.2, poi and springframework require 1.1.3 -->
974 
      <dependency>
975 
        <groupId>commons-logging</groupId>
976 
        <artifactId>commons-logging</artifactId>
977 
        <version>${commons-logging.version}</version>
978 
      </dependency>
979 976 
      <!-- only for version management, hibernate-commons-annotations:4.0.1.Final
980 977 
        requires 3.1.0.CR2 , so we update
981 978 
        here to the latest version 3.4.1.Final -->
......
1027 1024 
        <version>2.4</version>
1028 1025 
        <!-- classifier required as json-lib exists on maven central as json-lib-2.4-jdk15.jar and xxx-jdk13.jar, see #9887 -->
1029 1026 
        <classifier>jdk15</classifier>
1027 
        <exclusions>
1028 
          <exclusion>
1029 
            <!-- we use jcl-over-slf4j instead -->
1030 
            <groupId>commons-logging</groupId>
1031 
            <artifactId>commons-logging</artifactId>
1032 
          </exclusion>
1033 
        </exclusions>
1030 1034 
      </dependency>
1031 1035 
      <!-- media  -->
1032 1036 
      <dependency>
......
1421 1425 
        <groupId>org.springframework</groupId>
1422 1426 
        <artifactId>spring-core</artifactId>
1423 1427 
        <version>${spring.version}</version>
1428 
        <exclusions>
1429 
          <exclusion>
1430 
            <groupId>commons-logging</groupId>
1431 
            <artifactId>commons-logging</artifactId>
1432 
          </exclusion>
1433 
        </exclusions>
1424 1434 
      </dependency>
1425 1435 
      <dependency>
1426 1436 
        <groupId>org.springframework</groupId>

Also available in: Unified diff