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 2022/05/01 10:20:23 UTC
[syncope] branch 2_1_X updated: Upgrading DBTable, Scripted SQL and REST ConnId bundles
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push:
new 430168d458 Upgrading DBTable, Scripted SQL and REST ConnId bundles
430168d458 is described below
commit 430168d4583863b99669b4c50f30b4f95bcce091
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Sun May 1 12:20:06 2022 +0200
Upgrading DBTable, Scripted SQL and REST ConnId bundles
---
fit/build-tools/src/main/resources/buildToolsContext.xml | 8 ++++----
fit/core-reference/src/test/resources/rest/SyncScript.groovy | 2 +-
pom.xml | 7 +++++--
3 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/fit/build-tools/src/main/resources/buildToolsContext.xml b/fit/build-tools/src/main/resources/buildToolsContext.xml
index 719386ef45..5ef9785f2b 100644
--- a/fit/build-tools/src/main/resources/buildToolsContext.xml
+++ b/fit/build-tools/src/main/resources/buildToolsContext.xml
@@ -45,16 +45,16 @@ under the License.
<constructor-arg value="${testconnectorserver.key}"/>
</bean>
<bean id="testconnectorserver.soap.bundle" class="java.lang.String">
- <constructor-arg value="net.tirasa.connid.bundles.soap-${connid.soap.version}.jar"/>
+ <constructor-arg value="net.tirasa.connid.bundles.soap-${connid.soap.version}-bundle.jar"/>
</bean>
<bean id="testconnectorserver.rest.bundle" class="java.lang.String">
- <constructor-arg value="net.tirasa.connid.bundles.rest-${connid.rest.version}.jar"/>
+ <constructor-arg value="net.tirasa.connid.bundles.rest-${connid.rest.version}-bundle.jar"/>
</bean>
<bean id="testconnectorserver.dbtable.bundle" class="java.lang.String">
- <constructor-arg value="net.tirasa.connid.bundles.db.table-${connid.database.version}.jar"/>
+ <constructor-arg value="net.tirasa.connid.bundles.db.table-${connid.database.version}-bundle.jar"/>
</bean>
<bean id="testconnectorserver.scriptedsql.bundle" class="java.lang.String">
- <constructor-arg value="net.tirasa.connid.bundles.db.scriptedsql-${connid.database.version}.jar"/>
+ <constructor-arg value="net.tirasa.connid.bundles.db.scriptedsql-${connid.database.version}-bundle.jar"/>
</bean>
<bean id="testconnectorserver.csvdir.bundle" class="java.lang.String">
<constructor-arg value="net.tirasa.connid.bundles.csvdir-${connid.csvdir.version}.jar"/>
diff --git a/fit/core-reference/src/test/resources/rest/SyncScript.groovy b/fit/core-reference/src/test/resources/rest/SyncScript.groovy
index 69116143cd..67a8107f9e 100644
--- a/fit/core-reference/src/test/resources/rest/SyncScript.groovy
+++ b/fit/core-reference/src/test/resources/rest/SyncScript.groovy
@@ -109,7 +109,7 @@ if (action.equalsIgnoreCase("GET_LATEST_SYNC_TOKEN")) {
operation:"DELETE",
uid:node.get(i).get("user").get("key").textValue(),
token:node.get(i).get("lastChangeDate").longValue(),
- attributes:[]
+ attributes:[:]
]);
} else {
result.add([
diff --git a/pom.xml b/pom.xml
index 8ad009fbff..d3ffee7231 100644
--- a/pom.xml
+++ b/pom.xml
@@ -395,8 +395,8 @@ under the License.
<connid.version>1.5.1.0</connid.version>
<connid.soap.version>1.4.5</connid.soap.version>
- <connid.rest.version>1.0.5</connid.rest.version>
- <connid.database.version>2.2.7</connid.database.version>
+ <connid.rest.version>1.0.6</connid.rest.version>
+ <connid.database.version>2.2.8</connid.database.version>
<connid.csvdir.version>0.8.8</connid.csvdir.version>
<connid.ldap.version>1.5.4</connid.ldap.version>
<connid.ad.version>1.3.6</connid.ad.version>
@@ -1953,6 +1953,7 @@ under the License.
<groupId>net.tirasa.connid.bundles</groupId>
<artifactId>net.tirasa.connid.bundles.rest</artifactId>
<version>${connid.rest.version}</version>
+ <classifier>bundle</classifier>
</artifactItem>
<artifactItem>
<groupId>net.tirasa.connid.bundles</groupId>
@@ -1963,11 +1964,13 @@ under the License.
<groupId>net.tirasa.connid.bundles.db</groupId>
<artifactId>net.tirasa.connid.bundles.db.table</artifactId>
<version>${connid.database.version}</version>
+ <classifier>bundle</classifier>
</artifactItem>
<artifactItem>
<groupId>net.tirasa.connid.bundles.db</groupId>
<artifactId>net.tirasa.connid.bundles.db.scriptedsql</artifactId>
<version>${connid.database.version}</version>
+ <classifier>bundle</classifier>
</artifactItem>
<artifactItem>
<groupId>net.tirasa.connid.bundles</groupId>