This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicemix-bundles.git
The following commit(s) were added to refs/heads/master by this push:
new c27e27951 [SM-5466] Create OSGi bundle for spring-ldap 3.0.0
c27e27951 is described below
commit c27e2795196c728ba5f68b5ff1de75fdabf5b2f5
Author: Jean-Baptiste Onofré <[email protected]>
AuthorDate: Sun Jan 29 07:09:54 2023 +0100
[SM-5466] Create OSGi bundle for spring-ldap 3.0.0
---
pom.xml | 1 +
{spring-ldap-2.4.1 => spring-ldap-3.0.0}/pom.xml | 33 +++-------------------
.../src/main/resources/OSGI-INF/bundle.info | 0
3 files changed, 5 insertions(+), 29 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2f9171039..5f41c2f11 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,6 +56,7 @@
<module>opensearch-2.5.0</module>
<module>azure-core-http-netty-1.12.8</module>
<module>braintree-java-3.20.0</module>
+ <module>spring-ldap-3.0.0</module>
</modules>
</project>
diff --git a/spring-ldap-2.4.1/pom.xml b/spring-ldap-3.0.0/pom.xml
similarity index 87%
rename from spring-ldap-2.4.1/pom.xml
rename to spring-ldap-3.0.0/pom.xml
index 8c1fa9f37..aad143d4b 100644
--- a/spring-ldap-2.4.1/pom.xml
+++ b/spring-ldap-3.0.0/pom.xml
@@ -30,22 +30,21 @@
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.spring-ldap</artifactId>
- <version>2.4.1_2-SNAPSHOT</version>
+ <version>3.0.0_1-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache ServiceMix :: Bundles :: spring-ldap</name>
- <description>This OSGi bundle wraps spring-ldap-core,
spring-ldap-core-tiger, spring-ldap-odm, spring-ldap-ldif-core ${pkgVersion}
jar files.</description>
+ <description>This OSGi bundle wraps spring-ldap-core, spring-ldap-odm,
spring-ldap-ldif-core ${pkgVersion} jar files.</description>
<scm>
<connection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</developerConnection>
<url>https://gitbox.apache.org/repos/asf?p=servicemix-bundles.git</url>
- <tag>HEAD</tag>
</scm>
<properties>
<pkgGroupId>org.springframework.ldap</pkgGroupId>
- <pkgVersion>2.4.1</pkgVersion>
- <servicemix.osgi.source.version>2.4.1.1</servicemix.osgi.source.version>
+ <pkgVersion>3.0.0</pkgVersion>
+
<servicemix.osgi.source.version>3.0.0.1</servicemix.osgi.source.version>
<servicemix.osgi.export.pkg>
org.springframework;-split-package:=merge-first,
org.springframework.ldap
@@ -115,17 +114,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>${pkgGroupId}</groupId>
- <artifactId>spring-ldap-core-tiger</artifactId>
- <version>${pkgVersion}</version>
- <exclusions>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-tx</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>${pkgGroupId}</groupId>
<artifactId>spring-ldap-odm</artifactId>
@@ -166,12 +154,6 @@
<version>${pkgVersion}</version>
<classifier>sources</classifier>
</dependency>
- <dependency>
- <groupId>${pkgGroupId}</groupId>
- <artifactId>spring-ldap-core-tiger</artifactId>
- <version>${pkgVersion}</version>
- <classifier>sources</classifier>
- </dependency>
<dependency>
<groupId>${pkgGroupId}</groupId>
<artifactId>spring-ldap-odm</artifactId>
@@ -195,7 +177,6 @@
<artifactSet>
<includes>
<include>${pkgGroupId}:spring-ldap-core</include>
-
<include>${pkgGroupId}:spring-ldap-core-tiger</include>
<include>${pkgGroupId}:spring-ldap-odm</include>
<include>${pkgGroupId}:spring-ldap-ldif-core</include>
</includes>
@@ -207,12 +188,6 @@
<exclude>**/*</exclude>
</excludes>
</filter>
- <filter>
-
<artifact>${pkgGroupId}:spring-ldap-core-tiger</artifact>
- <excludes>
- <exclude>**/*</exclude>
- </excludes>
- </filter>
<filter>
<artifact>${pkgGroupId}:spring-ldap-odm</artifact>
<excludes>
diff --git a/spring-ldap-2.4.1/src/main/resources/OSGI-INF/bundle.info
b/spring-ldap-3.0.0/src/main/resources/OSGI-INF/bundle.info
similarity index 100%
rename from spring-ldap-2.4.1/src/main/resources/OSGI-INF/bundle.info
rename to spring-ldap-3.0.0/src/main/resources/OSGI-INF/bundle.info
