Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-ognl.git
diff --git a/README.md b/README.md
index ce35222..2063a06 100644
--- a/README.md
+++ b/README.md
@@ -16,5 +16,6 @@
-->
# Apache Commons OGNL
-[![Build Status](https://travis-ci.com/apache/commons-ognl.svg?branch=master)](https://travis-ci.com/apache/commons-ognl)
+[![Java CI Status](https://github.com/apache/commons-ognl/workflows/Java%20CI/badge.svg)](https://github.com/apache/commons-ognl/actions?query=workflow%3A%22Java+CI%22)
+[![Travis Status](https://travis-ci.com/apache/commons-ognl.svg?branch=master)](https://travis-ci.com/apache/commons-ognl)
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.apache.commons/commons-ognl/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.apache.commons/commons-ognl)
diff --git a/pom.xml b/pom.xml
index 2eec638..cc15c2a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -254,7 +254,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>3.1.0</version>
+ <version>3.2.0</version>
<configuration>
<archive>
<compress>true</compress>
@@ -336,12 +336,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-idea-plugin</artifactId>
- <version>2.2</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.2</version>
</plugin>
@@ -364,7 +358,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changes-plugin</artifactId>
- <version>2.8</version>
+ <version>2.12.1</version>
<configuration>
<xmlPath>${basedir}/src/changes/changes.xml</xmlPath>
<issueLinkTemplate>%URL%/%ISSUE%</issueLinkTemplate>
@@ -380,7 +374,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.7</version>
+ <version>3.1.1</version>
<configuration>
<configLocation>config/maven_checks.xml</configLocation>
<headerLocation>config/maven-header.txt</headerLocation>
@@ -400,11 +394,11 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
- <version>2.4</version>
+ <version>2.7</version>
</plugin>
<plugin>
<artifactId>maven-pmd-plugin</artifactId>
- <version>2.3</version>
+ <version>3.14.0</version>
<configuration>
<targetJdk>${maven.compile.target}</targetJdk>
</configuration>
@@ -433,7 +427,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>javancss-maven-plugin</artifactId>
- <version>2.0</version>
+ <version>2.1</version>
</plugin>
<plugin>
<groupId>org.codehaus.sonar-plugins</groupId>
@@ -493,14 +487,14 @@
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
- <version>1.3.158</version>
+ <version>1.4.200</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.carrotsearch</groupId>
<artifactId>junit-benchmarks</artifactId>
<classifier>jdk15</classifier>
- <version>0.3.0</version>
+ <version>0.7.2</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -516,7 +510,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.7</version>
+ <version>3.2.0</version>
<executions>
<execution>
<id>add-test-source</id>
@@ -561,7 +555,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.7</version>
+ <version>3.0.0</version>
<executions>
<execution>
<id>prepare-checkout</id>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 5eb41d6..aa28ccd 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -23,6 +23,9 @@
</properties>
<body>
<release version="4.0-incubating" date="TBD" description="First ASF release under Incubation.">
+ <action issue="" type="update" dev="nhojpatrick">
+ Upgrade to JUnit v4.13.1
+ </action>
<action issue="OGNL-39" type="update" dev="mcucchiara">
Simplify OgnlRuntime: Greatly simplified OgnlRuntime, delegating away responsibilities to several new classes.
Caching responsibilities are now taken by a new OgnlCache class.