syncope git commit: Trying with OpenJDK 10 on Travis CI
Repository: syncope Updated Branches: refs/heads/master e851b2818 -> fed7c97c8 Trying with OpenJDK 10 on Travis CI Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/fed7c97c Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/fed7c97c Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/fed7c97c Branch: refs/heads/master Commit: fed7c97c87afefc6ac6de170e4d89be78bb147e0 Parents: e851b28 Author: Francesco Chicchiriccò Authored: Tue Oct 23 14:40:30 2018 +0200 Committer: Francesco Chicchiriccò Committed: Tue Oct 23 14:40:30 2018 +0200 -- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/fed7c97c/.travis.yml -- diff --git a/.travis.yml b/.travis.yml index d510cf4..03cf1ec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,11 +16,11 @@ sudo: false language: java jdk: - - openjdk11 + - openjdk10 before_install: - echo 'MAVEN_OPTS="-Xms512m -Xmx1024m -XX:+TieredCompilation -XX:TieredStopAtLevel=1"' >~/.mavenrc # default install is mvn install --quiet -DskipTests=true -install: travis_wait mvn --show-version --quiet -T 1C -P java9-plus,all,skipTests,without-eclipse +install: travis_wait mvn --show-version --quiet -T 1C -P all,skipTests,without-eclipse before_script: - cd fit/core-reference script:
[3/3] syncope git commit: [SYNCOPE-1387] Clearing up calls between link() and update()
[SYNCOPE-1387] Clearing up calls between link() and update()
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/5e854e11
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/5e854e11
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/5e854e11
Branch: refs/heads/2_0_X
Commit: 5e854e117594da3a1ba78c0af8d53d89a66a9c5a
Parents: 5eb9585
Author: Francesco Chicchiriccò
Authored: Tue Oct 23 14:26:52 2018 +0200
Committer: Francesco Chicchiriccò
Committed: Tue Oct 23 14:27:06 2018 +0200
--
.../pushpull/DefaultRealmPullResultHandler.java | 28 ++--
1 file changed, 14 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/5e854e11/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultRealmPullResultHandler.java
--
diff --git
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultRealmPullResultHandler.java
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultRealmPullResultHandler.java
index ad45010..c315343 100644
---
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultRealmPullResultHandler.java
+++
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultRealmPullResultHandler.java
@@ -274,7 +274,7 @@ public class DefaultRealmPullResultHandler
finalize(operation, resultStatus, null, output, delta);
}
-private List update(final SyncDelta delta, final
List keys)
+private List update(final SyncDelta delta, final
List keys, final boolean inLink)
throws JobExecutionException {
if (!profile.getTask().isPerformUpdate()) {
@@ -314,8 +314,10 @@ public class DefaultRealmPullResultHandler
output = null;
} else {
try {
-for (PullActions action : profile.getActions()) {
-action.beforeUpdate(profile, delta, before, null);
+if (!inLink) {
+for (PullActions action : profile.getActions()) {
+action.beforeUpdate(profile, delta, before,
null);
+}
}
PropagationByResource propByRes = binder.update(realm,
before);
@@ -414,15 +416,17 @@ public class DefaultRealmPullResultHandler
propByRes.add(ResourceOperation.DELETE,
profile.getTask().getResource().getKey());
taskExecutor.execute(propagationManager.createTasks(realm, propByRes, null),
false);
+RealmTO realmTO;
if (unlink) {
realm.getResources().remove(profile.getTask().getResource());
-output = binder.getRealmTO(realmDAO.save(realm),
true);
+realmTO = binder.getRealmTO(realmDAO.save(realm),
true);
} else {
-output = binder.getRealmTO(realm, true);
+realmTO = binder.getRealmTO(realm, true);
}
+output = realmTO;
for (PullActions action : profile.getActions()) {
-action.after(profile, delta,
RealmTO.class.cast(output), result);
+action.after(profile, delta, realmTO, result);
}
resultStatus = Result.SUCCESS;
@@ -510,11 +514,7 @@ public class DefaultRealmPullResultHandler
} else {
realm.add(profile.getTask().getResource());
}
-output = update(delta, Collections.singletonList(key));
-
-for (PullActions action : profile.getActions()) {
-action.after(profile, delta,
RealmTO.class.cast(output), result);
-}
+output = update(delta, Collections.singletonList(key),
true);
resultStatus = Result.SUCCESS;
@@ -687,8 +687,8 @@ public class DefaultRealmPullResultHandler
if (keys.size() > 1) {
switch (profile.getResAct()) {
case IGNORE:
-throw new IgnoreProvisionException("More than one
match found for "
-+ processed.getObject().getUid().getUidValue()
+ ": " + keys);
+throw new IgnoreProvisionException("More than one match
found for "
+
[1/3] syncope git commit: [SYNCOPE-1387] Clearing up calls between link() and update()
Repository: syncope
Updated Branches:
refs/heads/2_0_X 5eb958549 -> 5e854e117
refs/heads/2_1_X 292006e4c -> 6bb67afe2
refs/heads/master d9a879af8 -> e851b2818
[SYNCOPE-1387] Clearing up calls between link() and update()
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/6bb67afe
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/6bb67afe
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/6bb67afe
Branch: refs/heads/2_1_X
Commit: 6bb67afe241f5bfb584db0a2bb14f007997e5427
Parents: 292006e
Author: Francesco Chicchiriccò
Authored: Tue Oct 23 14:26:52 2018 +0200
Committer: Francesco Chicchiriccò
Committed: Tue Oct 23 14:26:52 2018 +0200
--
.../pushpull/DefaultRealmPullResultHandler.java | 28 ++--
1 file changed, 14 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/6bb67afe/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultRealmPullResultHandler.java
--
diff --git
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultRealmPullResultHandler.java
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultRealmPullResultHandler.java
index fb29bd4..1e1fdd2 100644
---
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultRealmPullResultHandler.java
+++
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultRealmPullResultHandler.java
@@ -274,7 +274,7 @@ public class DefaultRealmPullResultHandler
finalize(operation, resultStatus, null, output, delta);
}
-private List update(final SyncDelta delta, final
List keys)
+private List update(final SyncDelta delta, final
List keys, final boolean inLink)
throws JobExecutionException {
if (!profile.getTask().isPerformUpdate()) {
@@ -314,8 +314,10 @@ public class DefaultRealmPullResultHandler
output = null;
} else {
try {
-for (PullActions action : profile.getActions()) {
-action.beforeUpdate(profile, delta, before, null);
+if (!inLink) {
+for (PullActions action : profile.getActions()) {
+action.beforeUpdate(profile, delta, before,
null);
+}
}
PropagationByResource propByRes = binder.update(realm,
before);
@@ -414,15 +416,17 @@ public class DefaultRealmPullResultHandler
propByRes.add(ResourceOperation.DELETE,
profile.getTask().getResource().getKey());
taskExecutor.execute(propagationManager.createTasks(realm, propByRes, null),
false);
+RealmTO realmTO;
if (unlink) {
realm.getResources().remove(profile.getTask().getResource());
-output = binder.getRealmTO(realmDAO.save(realm),
true);
+realmTO = binder.getRealmTO(realmDAO.save(realm),
true);
} else {
-output = binder.getRealmTO(realm, true);
+realmTO = binder.getRealmTO(realm, true);
}
+output = realmTO;
for (PullActions action : profile.getActions()) {
-action.after(profile, delta,
RealmTO.class.cast(output), result);
+action.after(profile, delta, realmTO, result);
}
resultStatus = Result.SUCCESS;
@@ -510,11 +514,7 @@ public class DefaultRealmPullResultHandler
} else {
realm.add(profile.getTask().getResource());
}
-output = update(delta, Collections.singletonList(key));
-
-for (PullActions action : profile.getActions()) {
-action.after(profile, delta,
RealmTO.class.cast(output), result);
-}
+output = update(delta, Collections.singletonList(key),
true);
resultStatus = Result.SUCCESS;
@@ -687,8 +687,8 @@ public class DefaultRealmPullResultHandler
if (keys.size() > 1) {
switch (profile.getConflictResolutionAction()) {
case IGNORE:
-throw new IgnoreProvisionException("More than one
match found for "
-
[2/3] syncope git commit: [SYNCOPE-1387] Clearing up calls between link() and update()
[SYNCOPE-1387] Clearing up calls between link() and update()
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/e851b281
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/e851b281
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/e851b281
Branch: refs/heads/master
Commit: e851b2818d72137f5e049d4b810504f51d6a0d70
Parents: d9a879a
Author: Francesco Chicchiriccò
Authored: Tue Oct 23 14:26:52 2018 +0200
Committer: Francesco Chicchiriccò
Committed: Tue Oct 23 14:27:01 2018 +0200
--
.../pushpull/DefaultRealmPullResultHandler.java | 28 ++--
1 file changed, 14 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/e851b281/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultRealmPullResultHandler.java
--
diff --git
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultRealmPullResultHandler.java
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultRealmPullResultHandler.java
index fb29bd4..1e1fdd2 100644
---
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultRealmPullResultHandler.java
+++
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultRealmPullResultHandler.java
@@ -274,7 +274,7 @@ public class DefaultRealmPullResultHandler
finalize(operation, resultStatus, null, output, delta);
}
-private List update(final SyncDelta delta, final
List keys)
+private List update(final SyncDelta delta, final
List keys, final boolean inLink)
throws JobExecutionException {
if (!profile.getTask().isPerformUpdate()) {
@@ -314,8 +314,10 @@ public class DefaultRealmPullResultHandler
output = null;
} else {
try {
-for (PullActions action : profile.getActions()) {
-action.beforeUpdate(profile, delta, before, null);
+if (!inLink) {
+for (PullActions action : profile.getActions()) {
+action.beforeUpdate(profile, delta, before,
null);
+}
}
PropagationByResource propByRes = binder.update(realm,
before);
@@ -414,15 +416,17 @@ public class DefaultRealmPullResultHandler
propByRes.add(ResourceOperation.DELETE,
profile.getTask().getResource().getKey());
taskExecutor.execute(propagationManager.createTasks(realm, propByRes, null),
false);
+RealmTO realmTO;
if (unlink) {
realm.getResources().remove(profile.getTask().getResource());
-output = binder.getRealmTO(realmDAO.save(realm),
true);
+realmTO = binder.getRealmTO(realmDAO.save(realm),
true);
} else {
-output = binder.getRealmTO(realm, true);
+realmTO = binder.getRealmTO(realm, true);
}
+output = realmTO;
for (PullActions action : profile.getActions()) {
-action.after(profile, delta,
RealmTO.class.cast(output), result);
+action.after(profile, delta, realmTO, result);
}
resultStatus = Result.SUCCESS;
@@ -510,11 +514,7 @@ public class DefaultRealmPullResultHandler
} else {
realm.add(profile.getTask().getResource());
}
-output = update(delta, Collections.singletonList(key));
-
-for (PullActions action : profile.getActions()) {
-action.after(profile, delta,
RealmTO.class.cast(output), result);
-}
+output = update(delta, Collections.singletonList(key),
true);
resultStatus = Result.SUCCESS;
@@ -687,8 +687,8 @@ public class DefaultRealmPullResultHandler
if (keys.size() > 1) {
switch (profile.getConflictResolutionAction()) {
case IGNORE:
-throw new IgnoreProvisionException("More than one
match found for "
-+ processed.getObject().getUid().getUidValue()
+ ": " + keys);
+throw new IgnoreProvisionException("More than one
[1/3] syncope git commit: Upgrading Swagger UI
Repository: syncope
Updated Branches:
refs/heads/2_0_X 73aed0a74 -> 5eb958549
refs/heads/2_1_X b25a8834d -> 292006e4c
refs/heads/master 36fb466af -> d9a879af8
Upgrading Swagger UI
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/5eb95854
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/5eb95854
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/5eb95854
Branch: refs/heads/2_0_X
Commit: 5eb95854960c9758e5c16f607e089343483b001e
Parents: 73aed0a
Author: Francesco Chicchiriccò
Authored: Tue Oct 23 08:19:45 2018 +0200
Committer: Francesco Chicchiriccò
Committed: Tue Oct 23 08:19:45 2018 +0200
--
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/5eb95854/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 43af407..b34d013 100644
--- a/pom.xml
+++ b/pom.xml
@@ -446,7 +446,7 @@ under the License.
${project.build.directory}/flowable-modeler
1.5.17
-3.19.0
+3.19.4
20.0
3.3.1-1
[3/3] syncope git commit: Upgrading Swagger UI
Upgrading Swagger UI
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/d9a879af
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/d9a879af
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/d9a879af
Branch: refs/heads/master
Commit: d9a879af89a98fc170ea211b0e2f769ddb8c8a5c
Parents: 36fb466
Author: Francesco Chicchiriccò
Authored: Tue Oct 23 08:19:58 2018 +0200
Committer: Francesco Chicchiriccò
Committed: Tue Oct 23 08:20:07 2018 +0200
--
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/d9a879af/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 8efb1c1..1ca2866 100644
--- a/pom.xml
+++ b/pom.xml
@@ -441,7 +441,7 @@ under the License.
${project.build.directory}/log
2.0.5
-3.19.0
+3.19.4
20.0
3.3.1-1
[2/3] syncope git commit: Upgrading Swagger UI
Upgrading Swagger UI
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/292006e4
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/292006e4
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/292006e4
Branch: refs/heads/2_1_X
Commit: 292006e4c2016ac015363c1e6c9d977577cb727c
Parents: b25a883
Author: Francesco Chicchiriccò
Authored: Tue Oct 23 08:19:58 2018 +0200
Committer: Francesco Chicchiriccò
Committed: Tue Oct 23 08:19:58 2018 +0200
--
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/292006e4/pom.xml
--
diff --git a/pom.xml b/pom.xml
index f49902e..a4d518c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -441,7 +441,7 @@ under the License.
${project.build.directory}/log
2.0.5
-3.19.0
+3.19.4
20.0
3.3.1-1
