This is an automated email from the ASF dual-hosted git repository.

snoopdave pushed a commit to branch roller-6.0.x
in repository https://gitbox.apache.org/repos/asf/roller.git

commit c108ab09847045b30cb53583feae7b7c584efb67
Merge: 4c0c78a 2c4da11
Author: David M. Johnson <[email protected]>
AuthorDate: Sun Nov 24 09:50:23 2019 -0500

    Merge branch 'master' into roller-6.0.x

 app/pom.xml       | 35 +++++++++++++++++++++++++----------
 pom.xml           | 12 ++++++++++--
 version-rules.xml | 16 ++++++++++++++++
 3 files changed, 51 insertions(+), 12 deletions(-)

diff --cc app/pom.xml
index b09e31c,762b45e..5581d0c
--- a/app/pom.xml
+++ b/app/pom.xml
@@@ -38,13 -38,15 +38,14 @@@ limitations under the License
          <java-activation.version>1.2.0</java-activation.version>
          <java-mail.version>1.4.7</java-mail.version>
          <jstl.version>1.2</jstl.version>
 -
          <angular.version>1.7.8</angular.version>
-         <ant.version>1.10.5</ant.version>
+         <ant.version>1.10.7</ant.version>
+         <asm.version>7.2</asm.version>
          <commons-validator.version>1.6</commons-validator.version>
-         <commons-beanutils.version>1.9.3</commons-beanutils.version>
+         <commons-beanutils.version>1.9.4</commons-beanutils.version>
          <commons-httpclient.version>3.1</commons-httpclient.version>
-         <commons-codec.version>1.12</commons-codec.version>
-         <eclipse-link.version>2.7.4</eclipse-link.version>
+         <commons-codec.version>1.13</commons-codec.version>
+         <eclipse-link.version>2.7.5</eclipse-link.version>
          <guice.version>4.2.2</guice.version>
          <log4j.version>1.2.17</log4j.version>
          <log4j2.version>2.10.0</log4j2.version>

Reply via email to