for #474 last round of updates

TremoloSecurity · Mar 17, 2021 · ef2daab · ef2daab
1 parent 3670c8f
commit ef2daab
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 12 deletions.
diff --git a/unison/open-unison-webapp-webservices/pom.xml b/unison/open-unison-webapp-webservices/pom.xml
@@ -66,16 +66,16 @@
    <artifactId>maven-compiler-plugin</artifactId>
    <version>3.1</version>
    <configuration>
-    <source>1.7</source>
-    <target>1.7</target>
+    <source>11</source>
+    <target>11</target>
    </configuration>
   </plugin>
   <plugin>
    <groupId>org.apache.maven.plugins</groupId>
    <artifactId>maven-war-plugin</artifactId>
-   <version>2.6</version>
+   <version>3.3.1</version>
    <configuration>
-
+	<packagingExcludes>WEB-INF/lib/slf4j-log4j12-*.jar</packagingExcludes>
     <overlays>
      <overlay>
       <groupId>com.tremolosecurity.unison</groupId>

diff --git a/unison/open-unison-webapp/pom.xml b/unison/open-unison-webapp/pom.xml
@@ -82,7 +82,17 @@
 		</dependency>  -->
 	</dependencies>
 
-
+	<build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>3.3.1</version>
+        <configuration>
+          <packagingExcludes>WEB-INF/lib/slf4j-log4j12-*.jar</packagingExcludes>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 
 
 

diff --git a/unison/pom.xml b/unison/pom.xml
@@ -29,9 +29,9 @@
 		<c3p0.version>0.9.5.5</c3p0.version>
 		<google-api-services-plus.version>v1-rev20190328-1.30.10</google-api-services-plus.version>
 		<google-api-services-oauth2.version>v2-rev20200213-1.31.0</google-api-services-oauth2.version>
-		<google-api-services-admin-directory.version>directory_v1-rev20210309-1.31.0</google-api-services-admin-directory.version>
+		<google-api-services-admin-directory.version>directory_v1-rev20210316-1.31.0</google-api-services-admin-directory.version>
 		<json-simple.version>1.1.1</json-simple.version>
-		<twilio-java-sdk.version>8.8.0</twilio-java-sdk.version>
+		<twilio-java-sdk.version>8.9.0</twilio-java-sdk.version>
 		<restfb.version>3.15.0</restfb.version>
 		<jbosssx-bare.version>4.1.6.Final</jbosssx-bare.version>
 		<jbosssx-client.version>4.1.6.Final</jbosssx-client.version>
@@ -52,7 +52,7 @@
 		<quartz.version>2.3.2</quartz.version>
 		<quartz-jobs.version>2.3.2</quartz-jobs.version>
 		<json-io.version>4.12.0</json-io.version>
-		<log4j.version>2.14.0</log4j.version>
+		<log4j.version>2.14.1</log4j.version>
 		<joda-time.version>2.10.10</joda-time.version>
 		<javax.mail-api.version>1.6.2</javax.mail-api.version>
 		<sun.mail-api.version>1.6.2</sun.mail-api.version>
@@ -63,7 +63,7 @@
 		<googleauth.version>1.5.0</googleauth.version>
 		<activemq.version>5.16.1</activemq.version>
 		<commons-pool2.version>2.9.0</commons-pool2.version>
-		<aws-java-sdk.version>1.11.972</aws-java-sdk.version>
+		<aws-java-sdk.version>1.11.976</aws-java-sdk.version>
 		<amazon-sqs-java-messaging-lib.version>1.0.8</amazon-sqs-java-messaging-lib.version>
 		<stringtemplate.version>4.0.2</stringtemplate.version>
 		<hibernate.version>5.4.29.Final</hibernate.version>
@@ -82,7 +82,7 @@
 	  	<snakeyaml.version>1.28</snakeyaml.version>
 	  	<prometheus.version>0.10.0</prometheus.version>
 	  	<ibm-mq.version>9.2.1.0</ibm-mq.version>
-	  	<okta.version>3.0.3</okta.version>
+	  	<okta.version>3.1.0</okta.version>
 	  	<azure-auth.version>1.9.1</azure-auth.version>
 	  	<cryptacular.version>1.2.4</cryptacular.version>
 	  	<santuario-xmlsec.version>2.2.1</santuario-xmlsec.version>
@@ -92,7 +92,7 @@
 		<commons-beanutils.version>1.9.4</commons-beanutils.version>
 		<swagger-core.version>2.1.5</swagger-core.version>
 		<k8sapi.version>10.0.0</k8sapi.version>
-		<jgit.version>5.10.0.202012080955-r</jgit.version>
+		<jgit.version>5.11.0.202103091610-r</jgit.version>
 		<json-patch.version>1.13</json-patch.version>
 		<batik-svgbrowser.version>1.14</batik-svgbrowser.version>
 		<xmlgraphics-commons.version>2.6</xmlgraphics-commons.version>
@@ -101,7 +101,7 @@
 		<okta-authn.version>2.0.2</okta-authn.version>
 		<jersey.version>3.0.1</jersey.version>
 		<woodstox.version>6.2.4</woodstox.version>
-		<spring.version>5.3.4</spring.version>
+		<spring.version>5.3.5</spring.version>
 		<activation.version>1.2.0</activation.version>
 	</properties>