From e493e2eb69ce6803a6a4d6d8cbe8e903fbc3148f Mon Sep 17 00:00:00 2001
From: maximthomas <maxim.thomas@gmail.com>
Date: Wed, 26 Feb 2020 07:58:13 +0000
Subject: [PATCH] Merge branch 'master' into security_scan
---
pom.xml | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/pom.xml b/pom.xml
index 4a7db45..fa578ee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.openidentityplatform.opendj</groupId>
<artifactId>opendj-parent</artifactId>
- <version>4.4.4-SNAPSHOT</version>
+ <version>4.4.5-SNAPSHOT</version>
<packaging>pom</packaging>
<name>OpenDJ Directory Services Project</name>
@@ -32,6 +32,7 @@
<product.name>OpenDJ</product.name>
<product.name.lowercase>opendj</product.name.lowercase>
<product.locales>ca_ES,es,de,fr,ja,ko,pl,zh_CN,zh_TW</product.locales>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<localized.jars.classifier>i18n</localized.jars.classifier>
<freemarker.version>2.3.28</freemarker.version>
<grizzly-framework.version>2.4.4</grizzly-framework.version>
@@ -352,6 +353,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>3.0.0-M1</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.2.0</version>
</plugin>
--
Gitblit v1.10.0