From aba59cf51f875e045f4deebbaab67fe4d6988197 Mon Sep 17 00:00:00 2001
From: Valera V Harseko <vharseko@3a-systems.ru>
Date: Sun, 10 Mar 2019 22:16:26 +0300
Subject: [PATCH 1/5] Revert "added library version to agentadmin"

This reverts commit 657a7167b482a231a73b56b84ec98c22196c08ba.
---
 jee-agents-distribution/src/main/assembly/scripts/agentadmin | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jee-agents-distribution/src/main/assembly/scripts/agentadmin b/jee-agents-distribution/src/main/assembly/scripts/agentadmin
index 6c601ec2..aad4d229 100644
--- a/jee-agents-distribution/src/main/assembly/scripts/agentadmin
+++ b/jee-agents-distribution/src/main/assembly/scripts/agentadmin
@@ -55,6 +55,6 @@ else
     AGENT_OPTS=
 fi
 
-AGENT_CLASSPATH=${AGENT_HOME}/lib/openam-installtools-${openam.version}.jar:${AGENT_HOME}/lib/commons-io-1.4.jar:${AGENT_HOME}/locale:${AGENT_HOME}/lib/openssoclientsdk.jar:${AGENT_HOME}/lib/agent.jar
+AGENT_CLASSPATH=${AGENT_HOME}/lib/openam-installtools-14.1.17-SNAPSHOT.jar:${AGENT_HOME}/lib/commons-io-1.4.jar:${AGENT_HOME}/locale:${AGENT_HOME}/lib/openssoclientsdk.jar:${AGENT_HOME}/lib/agent.jar
 
 $JAVA_VM ${JAVA_OPTS} -cp $AGENT_CLASSPATH $AGENT_OPTS com.sun.identity.install.tools.launch.AdminToolLauncher $*

From 0a0026f195277a3b2099754bcb700172a102245d Mon Sep 17 00:00:00 2001
From: Valera V Harseko <vharseko@3a-systems.ru>
Date: Sun, 10 Mar 2019 22:16:35 +0300
Subject: [PATCH 2/5] Revert "Fixed agentadmin in order to run properly,
 libraries were missing in classpath Added remote debug option (just in case)"

This reverts commit de36b2104ef397e1b528e47deee9fb1159983b62.
---
 .../src/main/assembly/scripts/agentadmin               | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/jee-agents-distribution/src/main/assembly/scripts/agentadmin b/jee-agents-distribution/src/main/assembly/scripts/agentadmin
index aad4d229..50a07f7a 100644
--- a/jee-agents-distribution/src/main/assembly/scripts/agentadmin
+++ b/jee-agents-distribution/src/main/assembly/scripts/agentadmin
@@ -30,12 +30,6 @@
 
 # Portions Copyrighted 2010-2013 ForgeRock AS.
 
-if [[ $# -ge 1 ]] && [[ $1 == "debug" ]] ; then
-   echo "Enabled debug mode"
-   shift
-   JAVA_OPTS=-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005:${JAVA_OPTS}
-fi
-
 if [ -z "$AGENT_HOME" ]; then
     AGENT_HOME=`dirname $0`/..
 fi
@@ -55,6 +49,6 @@ else
     AGENT_OPTS=
 fi
 
-AGENT_CLASSPATH=${AGENT_HOME}/lib/openam-installtools-14.1.17-SNAPSHOT.jar:${AGENT_HOME}/lib/commons-io-1.4.jar:${AGENT_HOME}/locale:${AGENT_HOME}/lib/openssoclientsdk.jar:${AGENT_HOME}/lib/agent.jar
+AGENT_CLASSPATH=\${AGENT_HOME}/lib/openam-installtools-launcher-${openam.version}.jar:\${AGENT_HOME}/lib/commons-io-1.4.jar
 
-$JAVA_VM ${JAVA_OPTS} -cp $AGENT_CLASSPATH $AGENT_OPTS com.sun.identity.install.tools.launch.AdminToolLauncher $*
+$JAVA_VM -classpath "$AGENT_CLASSPATH"  $AGENT_OPTS com.sun.identity.install.tools.launch.AdminToolLauncher $*

From d31ba4c645957de24475706de7322e45d2c6f594 Mon Sep 17 00:00:00 2001
From: Valera V Harseko <vharseko@3a-systems.ru>
Date: Sun, 10 Mar 2019 22:50:08 +0300
Subject: [PATCH 3/5] FIX MacOS does not have $JAVA_HOME/bin/java

---
 jee-agents-distribution/src/main/assembly/scripts/agentadmin | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jee-agents-distribution/src/main/assembly/scripts/agentadmin b/jee-agents-distribution/src/main/assembly/scripts/agentadmin
index 50a07f7a..603720d2 100644
--- a/jee-agents-distribution/src/main/assembly/scripts/agentadmin
+++ b/jee-agents-distribution/src/main/assembly/scripts/agentadmin
@@ -34,7 +34,7 @@ if [ -z "$AGENT_HOME" ]; then
     AGENT_HOME=`dirname $0`/..
 fi
 
-if [ -z "$JAVA_HOME" ]; then
+if [ -z "$JAVA_HOME/bin/java" ]; then
     JAVA_VM=java
 else
     JAVA_VM=\${JAVA_HOME}/bin/java

From e291b82f1f4891952949bebdbca9413997e8b5e5 Mon Sep 17 00:00:00 2001
From: Valera V Harseko <vharseko@3a-systems.ru>
Date: Sun, 10 Mar 2019 23:32:25 +0300
Subject: [PATCH 4/5] FIX add openam-installtools-launcher in lib
 https://github.com/OpenIdentityPlatform/OpenAM-JEE-Agents/issues/2
 https://github.com/OpenIdentityPlatform/OpenAM-JEE-Agents/issues/3

---
 jee-agents-sdk/pom.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/jee-agents-sdk/pom.xml b/jee-agents-sdk/pom.xml
index 8dd97bb8..892f66d8 100644
--- a/jee-agents-sdk/pom.xml
+++ b/jee-agents-sdk/pom.xml
@@ -147,5 +147,9 @@
             <groupId>org.forgerock.openam</groupId>
             <artifactId>openam-installtools</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.forgerock.openam</groupId>
+            <artifactId>openam-installtools-launcher</artifactId>
+        </dependency>
     </dependencies>
 </project>

From 19862cc2b84e72a21cdf868d1a44cbfc39427870 Mon Sep 17 00:00:00 2001
From: Valera V Harseko <vharseko@3a-systems.ru>
Date: Mon, 11 Mar 2019 11:23:01 +0300
Subject: [PATCH 5/5] <openam.version>14.2.2-SNAPSHOT</openam.version>

---
 OpenAM  |  2 +-
 pom.xml | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/OpenAM b/OpenAM
index 4a084fb5..178f0f24 160000
--- a/OpenAM
+++ b/OpenAM
@@ -1 +1 @@
-Subproject commit 4a084fb54d06d5f8274b4f9970c21076253adb3b
+Subproject commit 178f0f2497d84fa347c472a684c09d1cfcfadf7d
diff --git a/pom.xml b/pom.xml
index cfc4bf86..75555953 100755
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
     <version>4.0.6-SNAPSHOT</version>
     <packaging>pom</packaging>
     <properties>
-        <openam.version>14.1.17-SNAPSHOT</openam.version>
+        <openam.version>14.2.2-SNAPSHOT</openam.version>
 <!--         <websphere.libraries.v61.system.path>/var/tmp/extlib/websphere/v61</websphere.libraries.v61.system.path> -->
 <!--         <com.ibm.ws.runtime.v61.version>6.1.0</com.ibm.ws.runtime.v61.version> -->
 <!--         <weblogic.libraries.v10.system.path>/var/tmp/extlib/weblogic/v10</weblogic.libraries.v10.system.path> -->
@@ -87,10 +87,14 @@
                     <version>2.3</version>
                 </plugin>
                 <plugin>
-		        		<groupId>org.apache.maven.plugins</groupId>
-		        		<artifactId>maven-release-plugin</artifactId>
-		        		<version>2.5.3</version>
+	        		<groupId>org.apache.maven.plugins</groupId>
+	        		<artifactId>maven-release-plugin</artifactId>
+	        		<version>2.5.3</version>
 		      	</plugin>
+		      	<plugin>
+		          <artifactId>maven-assembly-plugin</artifactId>
+		          <version>3.1.1</version>
+		        </plugin>
             </plugins>
         </pluginManagement>
     </build>