This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/release-2.x by this push:
new 297b668 [LOG4J2-2763] Update dependencies.
297b668 is described below
commit 297b66846fa8b7bd99174f2f3d540e4330899b10
Author: Gary Gregory <[email protected]>
AuthorDate: Mon Jan 20 09:34:37 2020 -0500
[LOG4J2-2763] Update dependencies.
* Apache Flume 1.7.0 -> 1.9.0
* HSQLDB 2.3.5 -> 2.5.0
* XMLUnit 2.5.1 -> 2.6.3
* Remove support for Java 7 builds.
---
log4j-core-its/pom.xml | 1 -
log4j-core/pom.xml | 1 -
log4j-perf/pom.xml | 1 -
pom.xml | 81 ++++----------------------------------------------
4 files changed, 5 insertions(+), 79 deletions(-)
diff --git a/log4j-core-its/pom.xml b/log4j-core-its/pom.xml
index 3c6b70d..15b9168 100644
--- a/log4j-core-its/pom.xml
+++ b/log4j-core-its/pom.xml
@@ -64,7 +64,6 @@
<dependency>
<groupId>com.conversantmedia</groupId>
<artifactId>disruptor</artifactId>
- <classifier>jdk7</classifier>
<optional>true</optional>
</dependency>
<!-- Alternative implementation of BlockingQueue using JCTools for
AsyncAppender -->
diff --git a/log4j-core/pom.xml b/log4j-core/pom.xml
index efc582f..a50d520 100644
--- a/log4j-core/pom.xml
+++ b/log4j-core/pom.xml
@@ -62,7 +62,6 @@
<dependency>
<groupId>com.conversantmedia</groupId>
<artifactId>disruptor</artifactId>
- <classifier>jdk7</classifier>
<optional>true</optional>
</dependency>
<!-- Alternative implementation of BlockingQueue using JCTools for
AsyncAppender -->
diff --git a/log4j-perf/pom.xml b/log4j-perf/pom.xml
index 6b234ac..4b0909f 100644
--- a/log4j-perf/pom.xml
+++ b/log4j-perf/pom.xml
@@ -99,7 +99,6 @@
<dependency>
<groupId>com.conversantmedia</groupId>
<artifactId>disruptor</artifactId>
- <classifier>jdk7</classifier>
</dependency>
<dependency>
<groupId>org.jctools</groupId>
diff --git a/pom.xml b/pom.xml
index e5bf4fc..2cd9ac1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -193,9 +193,9 @@
<jackson2Version>2.10.2</jackson2Version>
<springVersion>3.2.18.RELEASE</springVersion>
<kubernetes-client.version>4.6.1</kubernetes-client.version>
- <flumeVersion>1.7.0</flumeVersion> <!-- Version 1.8.0 requires Java 8 -->
+ <flumeVersion>1.9.0</flumeVersion>
<disruptorVersion>3.4.2</disruptorVersion>
- <conversantDisruptorVersion>1.2.10</conversantDisruptorVersion> <!--
Version 1.2.11 requires Java 8 -->
+ <conversantDisruptorVersion>1.2.15</conversantDisruptorVersion> <!--
Version 1.2.11 requires Java 8 -->
<mongodb2.version>2.14.3</mongodb2.version>
<mongodb3.version>3.12.1</mongodb3.version>
<groovy.version>2.5.6</groovy.version>
@@ -650,8 +650,6 @@
<groupId>com.conversantmedia</groupId>
<artifactId>disruptor</artifactId>
<version>${conversantDisruptorVersion}</version>
- <!-- TODO: this can be switched based on a profile -->
- <classifier>jdk7</classifier>
</dependency>
<dependency>
<groupId>org.jctools</groupId>
@@ -735,8 +733,7 @@
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
- <version>2.3.5</version>
- <!-- version 2.4.0 requires Java 8 -->
+ <version>2.5.0</version>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
@@ -793,13 +790,13 @@
<dependency>
<groupId>org.xmlunit</groupId>
<artifactId>xmlunit-core</artifactId>
- <version>2.5.1</version>
+ <version>2.6.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.xmlunit</groupId>
<artifactId>xmlunit-matchers</artifactId>
- <version>2.5.1</version>
+ <version>2.6.3</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -1703,74 +1700,6 @@
</reporting>
</profile>
<profile>
- <id>jdk7</id>
- <activation>
- <jdk>1.7</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>clirr-maven-plugin</artifactId>
- <version>${clirr.plugin.version}</version>
- <dependencies>
- <dependency>
- <groupId>org.apache.bcel</groupId>
- <artifactId>bcel</artifactId>
- <version>6.2</version>
- </dependency>
- </dependencies>
- <configuration>
- <minSeverity>${minSeverity}</minSeverity>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>-XX:MaxPermSize=512m</argLine>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-failsafe-plugin</artifactId>
- <configuration>
- <argLine>-XX:MaxPermSize=512m</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>useJava7</id>
- <activation>
- <property>
- <name>useJava7</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-toolchains-plugin</artifactId>
- <version>1.1</version>
- <executions>
- <execution>
- <goals>
- <goal>toolchain</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <toolchains>
- <jdk>
- <version>1.8</version>
- </jdk>
- </toolchains>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
<id>java8-doclint-disabled</id>
<activation>
<jdk>[1.8,)</jdk>
