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/04/27 13:23:33 UTC
[syncope] branch 2_1_X updated: Upgrading SOAP and GoogleApps ConnId bundles; adding Okta
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 5d4112f7bf Upgrading SOAP and GoogleApps ConnId bundles; adding Okta
5d4112f7bf is described below
commit 5d4112f7bf546bdf5c8d4df168742ae2e0036f0b
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Wed Apr 27 15:23:17 2022 +0200
Upgrading SOAP and GoogleApps ConnId bundles; adding Okta
---
ext/swagger-ui/pom.xml | 30 ++++++++++++++++--------------
fit/build-tools/pom.xml | 17 ++++++++++-------
pom.xml | 14 +++++++++++---
3 files changed, 37 insertions(+), 24 deletions(-)
diff --git a/ext/swagger-ui/pom.xml b/ext/swagger-ui/pom.xml
index ba404280ac..dd8aa4023a 100644
--- a/ext/swagger-ui/pom.xml
+++ b/ext/swagger-ui/pom.xml
@@ -42,6 +42,12 @@ under the License.
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.webjars</groupId>
+ <artifactId>swagger-ui</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
@@ -49,25 +55,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 2e57e41f85..1366c90d6e 100644
--- a/fit/build-tools/pom.xml
+++ b/fit/build-tools/pom.xml
@@ -261,19 +261,22 @@ under the License.
<phase>prepare-package</phase>
<configuration>
<target>
- <unzip src="${bundles.directory}/net.tirasa.connid.bundles.soap-${connid.soap.version}.jar" dest="${bundles.directory}/soap">
+ <unzip src="${bundles.directory}/net.tirasa.connid.bundles.soap-${connid.soap.version}-bundle.jar"
+ dest="${bundles.directory}/soap">
<patternset>
- <include name="META-INF/*" />
- <include name="net/**" />
- <include name="lib/soap-utilities-${connid.soap.version}.jar" />
+ <include name="META-INF/*"/>
+ <include name="net/**"/>
+ <include name="lib/soap-utilities-${connid.soap.version}.jar"/>
</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" basedir="${bundles.directory}/soap" filesetmanifest="merge" />
+ <jar destfile="${bundles.directory}/net.tirasa.connid.bundles.soap-${connid.soap.version}-bundle.jar"
+ basedir="${bundles.directory}/soap"
+ filesetmanifest="merge"/>
- <delete dir="${bundles.directory}/soap" />
+ <delete dir="${bundles.directory}/soap"/>
</target>
</configuration>
<goals>
diff --git a/pom.xml b/pom.xml
index 7e266ce4ef..0cbec97d24 100644
--- a/pom.xml
+++ b/pom.xml
@@ -394,16 +394,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.3.13</cxf.version>
@@ -1940,12 +1941,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>
@@ -1981,6 +1982,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>
@@ -1997,6 +1999,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>