Grouper docker container - Fix conflicting jar issue

Author: Vivek Sachdeva

grouper-misc/grouper-azure/pom.xml

@@ -30,7 +30,6 @@
     <dependency>
       <groupId>com.squareup.okhttp3</groupId>
       <artifactId>logging-interceptor</artifactId>
-      <version>3.14.7</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>

grouper-misc/grouper-duo/pom.xml

@@ -45,6 +45,12 @@
             <groupId>com.duosecurity</groupId>
             <artifactId>duo-client</artifactId>
             <version>0.2.1</version>
+            <exclusions>
+            	<exclusion>
+            		<groupId>com.squareup.okhttp</groupId>
+            		<artifactId>okhttp</artifactId>
+            	</exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>commons-lang</groupId>
@@ -59,6 +65,10 @@
             <artifactId>json-lib</artifactId>
             <classifier>jdk15</classifier>
         </dependency>
+        <dependency>
+	        <groupId>com.squareup.okhttp3</groupId>
+	        <artifactId>logging-interceptor</artifactId>
+	    </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>grouper</artifactId>

grouper-misc/grouper-installer/src/java/edu/internet2/middleware/grouperInstaller/GrouperInstaller.java

@@ -13118,8 +13118,8 @@ private void downloadGrouperJarsIntoLibDirectory(File webInfDir) {
       List<String> urlsToDownload = new ArrayList<String>();
       urlsToDownload.add(basePath+"grouper-messaging-aws/"+this.version+"/grouper-messaging-aws-"+this.version+".jar");
       urlsToDownload.add(basePath+"grouper-messaging-rabbitmq/"+this.version+"/grouper-messaging-rabbitmq-"+this.version+".jar");
-      urlsToDownload.add(basePath+"grouper-activemq/"+this.version+"/grouper-activemq-"+this.version+".jar");
-      
+      urlsToDownload.add(basePath+"grouper-messaging-activemq/"+this.version+"/grouper-messaging-activemq-"+this.version+".jar");
+      urlsToDownload.add(basePath+"grouper-ui/"+this.version+"/grouper-ui-"+this.version+".jar");
       urlsToDownload.add(basePath+"grouper-pspng/"+this.version+"/grouper-pspng-"+this.version+".jar");
       urlsToDownload.add(basePath+"grouper-box/"+this.version+"/grouper-box-"+this.version+".jar");
       urlsToDownload.add(basePath+"grouper-duo/"+this.version+"/grouper-duo-"+this.version+".jar");
@@ -13137,13 +13137,6 @@ private void downloadGrouperJarsIntoLibDirectory(File webInfDir) {
       downloadFile(wsUrlToDownload, libWsDir.getAbsolutePath() + File.separator+ wsJarfileName, "grouperInstaller.autorun.buildContainerUseExistingJarIfExists");
     }
 
-    {
-      File libUiAndDaemonDir = new File(webInfDir+File.separator+"libUiAndDaemon");
-      String uiUrlToDownload = basePath+"grouper-ui/"+this.version+"/grouper-ui-"+this.version+".jar";
-      String uiJarfileName = uiUrlToDownload.substring(uiUrlToDownload.lastIndexOf(File.separator)+1, uiUrlToDownload.length());
-      downloadFile(uiUrlToDownload, libUiAndDaemonDir.getAbsolutePath() + File.separator+ uiJarfileName, "grouperInstaller.autorun.buildContainerUseExistingJarIfExists");
-    }
-    
     {
       File libScimDir = new File(webInfDir+File.separator+"libScim");
       String scimUrlToDownload = basePath+"grouper-ws-scim/"+this.version+"/grouper-ws-scim-"+this.version+".jar";

grouper-parent/pom.xml

@@ -185,6 +185,7 @@
         <taglibs.standard.version>1.1.2</taglibs.standard.version>
         <jsp.version>2.3.2-b02</jsp.version>
         <xercesimpl.version>2.11.0</xercesimpl.version>
+        <okhttp.version>3.14.7</okhttp.version>
     </properties>
 
     <repositories>
@@ -679,6 +680,11 @@
                 <artifactId>xml-apis</artifactId>
                 <version>${xml.apis.version}</version>
             </dependency>
+            <dependency>
+		      <groupId>com.squareup.okhttp3</groupId>
+		      <artifactId>logging-interceptor</artifactId>
+		      <version>${okhttp.version}</version>
+		    </dependency>
 
 
             <!-- Provided Dependencies -->