You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2021/10/01 10:14:55 UTC
[syncope] branch master updated (8202484 -> 5ec4e92)
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git.
from 8202484 Adjusting with currently available tag for AdoptOpenJDK 11
new 00df5ad Upgrading Swagger
new 5ec4e92 [SYNCOPE-1644] Fixing job reporting
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/job/SyncopeSpringBeanJobFactory.java | 16 ++++++++++++++++
pom.xml | 4 ++--
2 files changed, 18 insertions(+), 2 deletions(-)
[syncope] 02/02: [SYNCOPE-1644] Fixing job reporting
Posted by il...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
commit 5ec4e92bf7f996f28cc2c655aa9671ef2889c137
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Fri Oct 1 12:14:29 2021 +0200
[SYNCOPE-1644] Fixing job reporting
---
.../java/job/SyncopeSpringBeanJobFactory.java | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/SyncopeSpringBeanJobFactory.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/SyncopeSpringBeanJobFactory.java
index c690f39..6565f27 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/SyncopeSpringBeanJobFactory.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/SyncopeSpringBeanJobFactory.java
@@ -21,11 +21,17 @@ package org.apache.syncope.core.provisioning.java.job;
import java.util.Optional;
import org.apache.syncope.core.provisioning.api.job.JobManager;
import org.apache.syncope.core.provisioning.java.job.report.ReportJob;
+import org.apache.syncope.core.spring.ApplicationContextProvider;
import org.quartz.spi.TriggerFiredBundle;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.scheduling.quartz.SpringBeanJobFactory;
public class SyncopeSpringBeanJobFactory extends SpringBeanJobFactory {
+ private static final Logger LOG = LoggerFactory.getLogger(SyncopeSpringBeanJobFactory.class);
+
@Override
protected Object createJobInstance(final TriggerFiredBundle bundle) throws Exception {
Object job = super.createJobInstance(bundle);
@@ -40,6 +46,16 @@ public class SyncopeSpringBeanJobFactory extends SpringBeanJobFactory {
}
}
+ DefaultListableBeanFactory factory = ApplicationContextProvider.getBeanFactory();
+ try {
+ if (factory.containsSingleton(bundle.getJobDetail().getKey().getName())) {
+ factory.destroySingleton(bundle.getJobDetail().getKey().getName());
+ }
+ factory.registerSingleton(bundle.getJobDetail().getKey().getName(), job);
+ } catch (Exception e) {
+ LOG.error("While attempting to replace job instance as singleton Spring bean", e);
+ }
+
return job;
}
}
[syncope] 01/02: Upgrading Swagger
Posted by il...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
commit 00df5ad54c7ddf2627c88bcc6a2010a89c94cd11
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Thu Sep 30 07:59:02 2021 +0200
Upgrading Swagger
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1eb83dc..fbe433f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -455,7 +455,7 @@ under the License.
<h2.version>1.4.200</h2.version>
- <swagger-core.version>2.1.10</swagger-core.version>
+ <swagger-core.version>2.1.11</swagger-core.version>
<swagger-ui.version>3.52.1</swagger-ui.version>
<jquery-slimscroll.version>1.3.8</jquery-slimscroll.version>
@@ -2565,7 +2565,7 @@ under the License.
<link>https://docs.spring.io/spring-security/site/docs/current/api/</link>
<link>http://www.flowable.org/docs/javadocs/</link>
<link>https://build.shibboleth.net/nexus/content/sites/site/java-opensaml/4.1.1/apidocs/</link>
- <link>http://docs.swagger.io/swagger-core/v2.1.10/apidocs/</link>
+ <link>http://docs.swagger.io/swagger-core/v2.1.11/apidocs/</link>
</links>
</configuration>
<reportSets>