[syncope] branch 2_1_X updated: [SYNCOPE-1581] Fix

[ilgrosso]

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

ilgrosso pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git


The following commit(s) were added to refs/heads/2_1_X by this push:
     new c1db693  [SYNCOPE-1581] Fix
c1db693 is described below

commit c1db6939f457c717a43999af7177d50a77e42478
Author: Francesco Chicchiriccò <ilgro...@apache.org>
AuthorDate: Fri Jul 17 11:18:37 2020 +0200

    [SYNCOPE-1581] Fix
---
 .../src/main/java/org/apache/syncope/installer/files/ConsolePom.java  | 4 +++-
 .../src/main/java/org/apache/syncope/installer/files/CorePom.java     | 3 ++-
 installer/src/main/resources/izpack/install.xml                       | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git 
a/installer/src/main/java/org/apache/syncope/installer/files/ConsolePom.java 
b/installer/src/main/java/org/apache/syncope/installer/files/ConsolePom.java
index c0dfc65..7754718 100644
--- a/installer/src/main/java/org/apache/syncope/installer/files/ConsolePom.java
+++ b/installer/src/main/java/org/apache/syncope/installer/files/ConsolePom.java
@@ -25,7 +25,9 @@ public final class ConsolePom {
     public static final String FLOWABLE_CONTENT_TO_ADD = "    <dependency>\n"
             + "      <groupId>org.apache.syncope.ext.flowable</groupId>\n"
             + "      
<artifactId>syncope-ext-flowable-client-console</artifactId>\n"
-            + "      <version>${project.version}</version>\n" + "    
</dependency>\n";
+            + "      <version>${syncope.version}</version>\n"
+            + "    </dependency>\n"
+            + "  </dependencies>\n";
 
     private ConsolePom() {
         // private constructor for static utility class
diff --git 
a/installer/src/main/java/org/apache/syncope/installer/files/CorePom.java 
b/installer/src/main/java/org/apache/syncope/installer/files/CorePom.java
index 044da8a..6b2f9a33 100644
--- a/installer/src/main/java/org/apache/syncope/installer/files/CorePom.java
+++ b/installer/src/main/java/org/apache/syncope/installer/files/CorePom.java
@@ -34,7 +34,8 @@ public final class CorePom {
     public static final String FLOWABLE_CONTENT_TO_ADD = "    <dependency>\n"
             + "      <groupId>org.apache.syncope.ext.flowable</groupId>\n"
             + "      <artifactId>syncope-ext-flowable-rest-cxf</artifactId>\n"
-            + "        </dependency>\n"
+            + "      <version>${syncope.version}</version>\n"
+            + "    </dependency>\n"
             + "  </dependencies>\n";
 
     private CorePom() {
diff --git a/installer/src/main/resources/izpack/install.xml 
b/installer/src/main/resources/izpack/install.xml
index 122b586..563a731 100644
--- a/installer/src/main/resources/izpack/install.xml
+++ b/installer/src/main/resources/izpack/install.xml
@@ -136,6 +136,7 @@ under the License.
   <jar src="lib/httpclient-@{httpclient.version}.jar"/>
   <jar src="lib/httpmime-@{httpclient.version}.jar"/>
   <jar src="lib/httpcore-4.4.13.jar"/>
+  <jar src="lib/commons-codec-1.11.jar"/>
   <jar src="lib/jackson-databind-@{jackson.version}.jar"/>
   <jar src="lib/jackson-core-@{jackson.version}.jar"/>
   <jar src="lib/jackson-annotations-@{jackson.version}.jar"/>