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
The following commit(s) were added to refs/heads/master by this push:
new 6bb37ebde4 Upgrading SOAP and GoogleApps ConnId bundles; adding Okta
(#340)
6bb37ebde4 is described below
commit 6bb37ebde42deda53ec12e9b73749ee3f79f696a
Author: Francesco Chicchiriccò <[email protected]>
AuthorDate: Wed Apr 27 14:37:41 2022 +0200
Upgrading SOAP and GoogleApps ConnId bundles; adding Okta (#340)
---
.../provisioning/api/utils/FormatUtilsTest.java | 3 ++-
core/starter/pom.xml | 30 ++++++++++++----------
fit/build-tools/pom.xml | 6 ++---
.../syncope/fit/core/PropagationTaskITCase.java | 4 +--
pom.xml | 14 +++++++---
5 files changed, 34 insertions(+), 23 deletions(-)
diff --git
a/core/provisioning-api/src/test/java/org/apache/syncope/core/provisioning/api/utils/FormatUtilsTest.java
b/core/provisioning-api/src/test/java/org/apache/syncope/core/provisioning/api/utils/FormatUtilsTest.java
index d869d3f5d7..edcb885bc1 100644
---
a/core/provisioning-api/src/test/java/org/apache/syncope/core/provisioning/api/utils/FormatUtilsTest.java
+++
b/core/provisioning-api/src/test/java/org/apache/syncope/core/provisioning/api/utils/FormatUtilsTest.java
@@ -26,6 +26,7 @@ import java.text.DecimalFormatSymbols;
import java.text.ParseException;
import java.time.LocalDate;
import java.time.OffsetDateTime;
+import java.time.ZoneOffset;
import java.time.format.DateTimeFormatter;
import java.time.temporal.ChronoUnit;
import java.util.Locale;
@@ -87,7 +88,7 @@ public class FormatUtilsTest extends AbstractTest {
source = DATE.format(DateTimeFormatter.ofPattern(conversionPattern));
assertEquals(
LocalDate.parse(source,
DateTimeFormatter.ofPattern(conversionPattern)).
-
atStartOfDay(FormatUtils.DEFAULT_OFFSET).toOffsetDateTime(),
+ atStartOfDay(ZoneOffset.UTC).toOffsetDateTime(),
FormatUtils.parseDate(source, conversionPattern));
}
diff --git a/core/starter/pom.xml b/core/starter/pom.xml
index 3bf08a6df6..a1a6a0512d 100644
--- a/core/starter/pom.xml
+++ b/core/starter/pom.xml
@@ -73,6 +73,12 @@ under the License.
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.webjars</groupId>
+ <artifactId>swagger-ui</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
@@ -105,25 +111,21 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <inherited>true</inherited>
+ <configuration>
+
<outputDirectory>${project.build.directory}/swagger-ui</outputDirectory>
+ <includeGroupIds>org.webjars</includeGroupIds>
+ <includeArtifactIds>swagger-ui</includeArtifactIds>
+ <overWrite>true</overWrite>
+ <includes>**</includes>
+ <excludes>**/*.gz</excludes>
+ <scope>provided</scope>
+ </configuration>
<executions>
<execution>
<phase>generate-resources</phase>
<goals>
- <goal>unpack</goal>
+ <goal>unpack-dependencies</goal>
</goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.webjars</groupId>
- <artifactId>swagger-ui</artifactId>
- <version>${swagger-ui.version}</version>
- <overWrite>true</overWrite>
-
<outputDirectory>${project.build.directory}/swagger-ui</outputDirectory>
- <excludes>**/*.gz</excludes>
- </artifactItem>
- </artifactItems>
- </configuration>
</execution>
</executions>
</plugin>
diff --git a/fit/build-tools/pom.xml b/fit/build-tools/pom.xml
index 0e037d50d3..c0cad46e96 100644
--- a/fit/build-tools/pom.xml
+++ b/fit/build-tools/pom.xml
@@ -248,7 +248,7 @@ under the License.
<phase>prepare-package</phase>
<configuration>
<target>
- <unzip
src="${bundles.directory}/net.tirasa.connid.bundles.soap-${connid.soap.version}.jar"
+ <unzip
src="${bundles.directory}/net.tirasa.connid.bundles.soap-${connid.soap.version}-bundle.jar"
dest="${bundles.directory}/soap">
<patternset>
<include name="META-INF/*"/>
@@ -257,9 +257,9 @@ under the License.
</patternset>
</unzip>
- <delete
file="${bundles.directory}/net.tirasa.connid.bundles.soap-${connid.soap.version}.jar"/>
+ <delete
file="${bundles.directory}/net.tirasa.connid.bundles.soap-${connid.soap.version}-bundle.jar"/>
- <jar
destfile="${bundles.directory}/net.tirasa.connid.bundles.soap-${connid.soap.version}.jar"
+ <jar
destfile="${bundles.directory}/net.tirasa.connid.bundles.soap-${connid.soap.version}-bundle.jar"
basedir="${bundles.directory}/soap"
filesetmanifest="merge"/>
diff --git
a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PropagationTaskITCase.java
b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PropagationTaskITCase.java
index 6c46c8d15e..b68c5b4e75 100644
---
a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PropagationTaskITCase.java
+++
b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PropagationTaskITCase.java
@@ -30,6 +30,7 @@ import java.io.IOException;
import java.text.ParseException;
import java.time.LocalDate;
import java.time.OffsetDateTime;
+import java.time.ZoneOffset;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Collections;
@@ -91,7 +92,6 @@ import org.apache.syncope.common.rest.api.beans.ExecListQuery;
import org.apache.syncope.common.rest.api.beans.TaskQuery;
import org.apache.syncope.common.rest.api.service.TaskService;
import org.apache.syncope.core.provisioning.api.serialization.POJOHelper;
-import org.apache.syncope.core.provisioning.api.utils.FormatUtils;
import org.apache.syncope.fit.core.reference.DateToDateItemTransformer;
import org.apache.syncope.fit.core.reference.DateToLongItemTransformer;
import org.identityconnectors.framework.common.objects.Attribute;
@@ -531,7 +531,7 @@ public class PropagationTaskITCase extends
AbstractTaskITCase {
}
OffsetDateTime loginDate =
LocalDate.parse(user.getPlainAttr("loginDate").get().getValues().get(0)).
-
atStartOfDay(FormatUtils.DEFAULT_OFFSET).toOffsetDateTime();
+ atStartOfDay(ZoneOffset.UTC).toOffsetDateTime();
Attribute employeeNumber = AttributeUtil.find("employeeNumber",
propagationAttrs);
assertNotNull(employeeNumber);
diff --git a/pom.xml b/pom.xml
index f20587438c..8bf060b8bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -392,16 +392,17 @@ under the License.
<syncope.version>${project.version}</syncope.version>
<connid.version>1.5.1.0</connid.version>
- <connid.soap.version>1.4.3</connid.soap.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.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>
- <connid.googleapps.version>1.4.2</connid.googleapps.version>
+ <connid.googleapps.version>1.4.3</connid.googleapps.version>
<connid.azure.version>1.0.1</connid.azure.version>
<connid.scimv11.version>1.0.1</connid.scimv11.version>
<connid.servicenow.version>1.0.0</connid.servicenow.version>
+ <connid.okta.version>2.1.0</connid.okta.version>
<cxf.version>3.5.2</cxf.version>
<bouncycastle.version>1.70</bouncycastle.version>
@@ -2052,12 +2053,12 @@ under the License.
<version>3.3.0</version>
<configuration>
<outputDirectory>${bundles.directory}</outputDirectory>
- <useBaseVersion>true</useBaseVersion>
<artifactItems>
<artifactItem>
<groupId>net.tirasa.connid.bundles.soap</groupId>
<artifactId>net.tirasa.connid.bundles.soap</artifactId>
<version>${connid.soap.version}</version>
+ <classifier>bundle</classifier>
</artifactItem>
<artifactItem>
<groupId>net.tirasa.connid.bundles</groupId>
@@ -2093,6 +2094,7 @@ under the License.
<groupId>net.tirasa.connid.bundles</groupId>
<artifactId>net.tirasa.connid.bundles.googleapps</artifactId>
<version>${connid.googleapps.version}</version>
+ <classifier>bundle</classifier>
</artifactItem>
<artifactItem>
<groupId>net.tirasa.connid.bundles</groupId>
@@ -2109,6 +2111,12 @@ under the License.
<artifactId>net.tirasa.connid.bundles.servicenow</artifactId>
<version>${connid.servicenow.version}</version>
</artifactItem>
+ <artifactItem>
+ <groupId>net.tirasa.connid.bundles.okta</groupId>
+ <artifactId>net.tirasa.connid.bundles.okta</artifactId>
+ <version>${connid.okta.version}</version>
+ <classifier>bundle</classifier>
+ </artifactItem>
</artifactItems>
</configuration>
</plugin>
