Merge pull request #104 from mlbiam/main

upgrade to 1.0.40
OpenUnison · Mar 11, 2024 · e4d9d69 · e4d9d69
2 parents 505fae6 + 28d6e08
commit e4d9d69
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 30 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
   <groupId>io.openunison</groupId>
   <artifactId>openunison-k8s</artifactId>
   <packaging>war</packaging>
-  <version>1.0.39</version>
+  <version>1.0.40</version>
   <name>openunison-k8s</name>
   <url>http://openunison.io</url>
   <repositories>
@@ -20,11 +20,11 @@
   </repositories>
 
   <properties>
-    <openunison.version>1.0.39</openunison.version>
+    <openunison.version>1.0.40</openunison.version>
     <mysql.version>8.0.33</mysql.version>
     <qpid.version>1.11.0</qpid.version>
-    <sqlserver.version>12.4.2.jre11</sqlserver.version>
-    <postgresql.version>42.7.1</postgresql.version>
+    <sqlserver.version>12.6.1.jre11</sqlserver.version>
+    <postgresql.version>42.7.2</postgresql.version>
     <mariadb.version>3.3.2</mariadb.version>
   </properties>
 
@@ -114,7 +114,7 @@
           </overlays>
           <packagingExcludes>
             WEB-INF/lib/log4j*2.14.1.jar,
-            WEB-INF/lib/jldap*2009-10-07.jar
+            WEB-INF/lib/jldap-2009-10-07.jar
           </packagingExcludes>
 
         </configuration>

diff --git a/src/main/java/com/tremolosecurity/unison/k8s/dataobjects/CreateLocalUsers.java b/src/main/java/com/tremolosecurity/unison/k8s/dataobjects/CreateLocalUsers.java
@@ -98,7 +98,7 @@ public void configure(String name, Properties props, NameSpace nameSpace) throws
 
 		Session session = sessionFactory.openSession();
 
-		List<LocalGroup> groups = session.createCriteria(LocalGroup.class).list();
+		List<LocalGroup> groups = session.createQuery("FROM LocalGroup",LocalGroup.class).list();
 		if (groups.size() == 0) {
 			session.beginTransaction();
 			LocalGroup admins = new LocalGroup();

diff --git a/src/main/java/com/tremolosecurity/unison/k8s/dataobjects/LocalGroup.java b/src/main/java/com/tremolosecurity/unison/k8s/dataobjects/LocalGroup.java
@@ -14,17 +14,17 @@
 
 import java.util.List;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.Table;
-import javax.persistence.JoinColumn;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.Table;
+import jakarta.persistence.JoinColumn;
 
 @Entity
 @Table(name = "localGroups")

diff --git a/src/main/java/com/tremolosecurity/unison/k8s/dataobjects/LocalUser.java b/src/main/java/com/tremolosecurity/unison/k8s/dataobjects/LocalUser.java
@@ -12,17 +12,17 @@
  *******************************************************************************/
 package com.tremolosecurity.unison.k8s.dataobjects;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.Table;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.Table;
 import java.util.List;
 
 @Entity

diff --git a/src/main/webapp/WEB-INF/unison.xml b/src/main/webapp/WEB-INF/unison.xml
@@ -58,7 +58,8 @@
         <params name="namespace" value="#[K8S_OPENUNISON_NS:openunison]" />
 
       </dynamicTargets>
-      <target name="k8s" className="com.tremolosecurity.unison.openshiftv3.OpenShiftTarget">
+      @[dir:targets]
+      <!-- <target name="k8s" className="com.tremolosecurity.unison.openshiftv3.OpenShiftTarget">
         <params>
           <param name="url" value="" />
           <param name="userName" value="" />
@@ -70,7 +71,7 @@
           <param name="certPath" value="/var/run/secrets/tokens/ca.crt" />
           <param name="label" value="#[K8S_DEPLOYMENT_NAME:Local Deployment]" />
         </params>
-      </target>
+      </target> -->
     </targets>
     <workflows>
       <dynamicWorkflows enabled="true" className="com.tremolosecurity.provisioning.workflows.LoadWorkflowsFromK8s">