diff --git a/perun-auditlogger/pom.xml b/perun-auditlogger/pom.xml
index 5a184ea998..903046339b 100644
--- a/perun-auditlogger/pom.xml
+++ b/perun-auditlogger/pom.xml
@@ -6,7 +6,7 @@
perun
cz.metacentrum
- 0.0.0-development
+ 3.29.4
cz.metacentrum.perun
diff --git a/perun-auditparser/pom.xml b/perun-auditparser/pom.xml
index 88f706526f..1001bdb8fe 100644
--- a/perun-auditparser/pom.xml
+++ b/perun-auditparser/pom.xml
@@ -6,7 +6,7 @@
perun
cz.metacentrum
- 0.0.0-development
+ 3.29.4
cz.metacentrum.perun
diff --git a/perun-base/pom.xml b/perun-base/pom.xml
index 55ba4e794f..806f69be18 100644
--- a/perun-base/pom.xml
+++ b/perun-base/pom.xml
@@ -6,7 +6,7 @@
perun
cz.metacentrum
- 0.0.0-development
+ 3.29.4
cz.metacentrum.perun
diff --git a/perun-cabinet/pom.xml b/perun-cabinet/pom.xml
index 47a41b7c99..f4558e6a20 100644
--- a/perun-cabinet/pom.xml
+++ b/perun-cabinet/pom.xml
@@ -6,7 +6,7 @@
perun
cz.metacentrum
- 0.0.0-development
+ 3.29.4
cz.metacentrum.perun
diff --git a/perun-cli-java/pom.xml b/perun-cli-java/pom.xml
index b34181cb17..11f22d70fa 100644
--- a/perun-cli-java/pom.xml
+++ b/perun-cli-java/pom.xml
@@ -7,7 +7,7 @@
perun
cz.metacentrum
- 0.0.0-development
+ 3.29.4
cz.metacentrum.perun
diff --git a/perun-cli/Perun/Agent.pm b/perun-cli/Perun/Agent.pm
index a6d06f31b5..43d5255580 100644
--- a/perun-cli/Perun/Agent.pm
+++ b/perun-cli/Perun/Agent.pm
@@ -1,5 +1,5 @@
package Perun::Agent;
-my $agentVersion = '0.0.0';
+my $agentVersion = '3.29.4';
my $agentVersionMajor;
if ($agentVersion !~ /^(\d+)(?{ $agentVersionMajor = $^N })\..*/i)
{
diff --git a/perun-core/pom.xml b/perun-core/pom.xml
index fd38ee8379..8c9812f6eb 100644
--- a/perun-core/pom.xml
+++ b/perun-core/pom.xml
@@ -6,7 +6,7 @@
perun
cz.metacentrum
- 0.0.0-development
+ 3.29.4
cz.metacentrum.perun
diff --git a/perun-core/src/main/java/cz/metacentrum/perun/core/blImpl/ExtSourcesManagerBlImpl.java b/perun-core/src/main/java/cz/metacentrum/perun/core/blImpl/ExtSourcesManagerBlImpl.java
index 26cb39f328..bc454b81f3 100644
--- a/perun-core/src/main/java/cz/metacentrum/perun/core/blImpl/ExtSourcesManagerBlImpl.java
+++ b/perun-core/src/main/java/cz/metacentrum/perun/core/blImpl/ExtSourcesManagerBlImpl.java
@@ -180,6 +180,16 @@ public List getInvalidUsers(PerunSession sess, ExtSource source) {
invalidUsers.add(user);
} catch (ExtSourceUnsupportedOperationException e) {
log.warn("ExtSource {} doesn't support getSubjectByLogin", source.getName());
+ } finally {
+ if (source instanceof ExtSourceSimpleApi) {
+ try {
+ ((ExtSourceSimpleApi) source).close();
+ } catch (ExtSourceUnsupportedOperationException e) {
+ // silently skip
+ } catch (Exception e) {
+ log.error("Failed to close connection to extsource", e);
+ }
+ }
}
}
diff --git a/perun-core/src/main/java/cz/metacentrum/perun/core/blImpl/GroupsManagerBlImpl.java b/perun-core/src/main/java/cz/metacentrum/perun/core/blImpl/GroupsManagerBlImpl.java
index 02058cfdde..ef4930129a 100644
--- a/perun-core/src/main/java/cz/metacentrum/perun/core/blImpl/GroupsManagerBlImpl.java
+++ b/perun-core/src/main/java/cz/metacentrum/perun/core/blImpl/GroupsManagerBlImpl.java
@@ -1787,45 +1787,57 @@ public List synchronizeGroupStructure(PerunSession sess, Group baseGroup
//get extSource for group structure
ExtSource source = getGroupExtSourceForSynchronization(sess, baseGroup);
+ try {
- //get login attribute for structure
- AttributeDefinition loginAttributeDefinition = getLoginAttributeForGroupStructure(sess, baseGroup);
- //get login prefix if exists
- String loginPrefix = getLoginPrefixForGroupStructure(sess, baseGroup);
+ //get login attribute for structure
+ AttributeDefinition loginAttributeDefinition = getLoginAttributeForGroupStructure(sess, baseGroup);
+ //get login prefix if exists
+ String loginPrefix = getLoginPrefixForGroupStructure(sess, baseGroup);
- List candidateGroupsToAdd = new ArrayList<>();
- Map groupsToUpdate = new HashMap<>();
- List groupsToRemove = new ArrayList<>();
+ List candidateGroupsToAdd = new ArrayList<>();
+ Map groupsToUpdate = new HashMap<>();
+ List groupsToRemove = new ArrayList<>();
- Map actualGroups = getAllSubGroupsWithLogins(sess, baseGroup, loginAttributeDefinition);
- List