Skip to content

Commit

Permalink
Update to log4j 2.17.1
Browse files Browse the repository at this point in the history 
Issue #302 Update the log4j version to 2.17.1. Also include updates to the latest versions of rabbitmq, solr-core 7.7.3
  • Loading branch information
@gothub
gothub committed Jan 5, 2022
1 parent 3dbac83 commit 5305d95
Showing 1 changed file with 114 additions and 12 deletions.
126 changes: 114 additions & 12 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>edu.ucsb.nceas</groupId>
<artifactId>metadig-engine</artifactId>
<version>2.3.0</version>
<version>2.3.2</version>
<packaging>jar</packaging>

<name>metadig-engine</name>
Expand All @@ -17,17 +17,18 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<d1_libclient_java.version>2.4.0-SNAPSHOT</d1_libclient_java.version>
<renjin.version>0.8.2242</renjin.version>
<jython.version>2.7.1</jython.version>
<jython.version>2.7.2</jython.version>
<gson.version>2.6.2</gson.version>
<moxy.version>2.6.3</moxy.version>
<log4j.version>2.17.1</log4j.version>
<d1_cn_index_processor_version>2.4.0-SNAPSHOT</d1_cn_index_processor_version>
<d1_cn_index_common_version>2.4.0-SNAPSHOT</d1_cn_index_common_version>
<!-- Have to use a very old version of Spring in order to stay compatible with d1_cn_index_processor -->
<!-- <spring.version>4.3.8.RELEASE</spring.version> -->
<spring.version>3.1.4.RELEASE</spring.version>
<!-- <docker.registry>docker.io</docker.registry> -->
<docker.repo>metadig</docker.repo>
<docker.tag>2.3.0</docker.tag>
<docker.tag>2.3.2</docker.tag>
<modules.test.includes>**/*Test.java</modules.test.includes>
<modules.test.excludes>**/LTERSuiteTest.java</modules.test.excludes>
</properties>
Expand Down Expand Up @@ -104,12 +105,6 @@
<artifactId>commons-configuration2</artifactId>
<version>2.7</version>
</dependency>
<!-- https://mvnrepository.com/artifact/log4j/log4j -->
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
</dependency>
<!-- https://mvnrepository.com/artifact/commons-beanutils/commons-beanutils -->
<dependency>
<groupId>commons-beanutils</groupId>
Expand Down Expand Up @@ -139,7 +134,7 @@
<dependency>
<groupId>com.rabbitmq</groupId>
<artifactId>amqp-client</artifactId>
<version>5.9.0</version>
<version>5.13.1</version>
</dependency>
<!-- https://mvnrepository.com/artifact/joda-time/joda-time -->
<dependency>
Expand All @@ -150,12 +145,93 @@
<dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-solrj</artifactId>
<version>7.5.0</version>
<version>7.7.3</version>
<exclusions>
<exclusion>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-core</artifactId>
<version>7.5.0</version>
<version>7.7.3</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-web</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-1.2-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.6.1</version>
<exclusions>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-1.2-api</artifactId>
<version>${log4j.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>${log4j.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-jcl</artifactId>
<version>${log4j.version}</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1</version>
<exclusions>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- httpclient 4.5.5 is needed by solrj 7.2.1 but the solrj pom only loads
httpclient 4.5.3, so this dependency is included here. If this version is not included,
Expand Down Expand Up @@ -206,6 +282,26 @@
<groupId>com.rabbitmq</groupId>
<artifactId>amqp-client</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
<exclusion>
<groupId>com.hp.hpl.jena</groupId>
<artifactId>jena</artifactId>
</exclusion>
<exclusion>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- https://mvnrepository.com/artifact/org.json/json -->
Expand Down Expand Up @@ -291,6 +387,12 @@
</repository>
</repositories>
<build>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down

0 comments on commit 5305d95

Please sign in to comment.