You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by jb...@apache.org on 2022/05/30 09:28:29 UTC
[servicemix-bundles] branch master updated: [SM-5154] Create OSGi bundle for spring-ldap 2.4.0
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 1ef136ada [SM-5154] Create OSGi bundle for spring-ldap 2.4.0
1ef136ada is described below
commit 1ef136ada932a619ddc23202dcd00304a6605070
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Mon May 30 11:28:07 2022 +0200
[SM-5154] Create OSGi bundle for spring-ldap 2.4.0
---
pom.xml | 1 +
.../pom.xml | 32 ++++------------------
.../src/main/resources/OSGI-INF/bundle.info | 0
3 files changed, 6 insertions(+), 27 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7cd847e11..4d7a80386 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,6 +71,7 @@
<module>spring-data-commons-2.7.0</module>
<module>spring-data-keyvalue-2.7.0</module>
<module>spring-data-redis-2.7.0</module>
+ <module>spring-ldap-2.4.0</module>
</modules>
</project>
diff --git a/spring-ldap-2.3.7.RELEASE/pom.xml b/spring-ldap-2.4.0/pom.xml
similarity index 88%
rename from spring-ldap-2.3.7.RELEASE/pom.xml
rename to spring-ldap-2.4.0/pom.xml
index ec9772706..6d6331d94 100644
--- a/spring-ldap-2.3.7.RELEASE/pom.xml
+++ b/spring-ldap-2.4.0/pom.xml
@@ -24,27 +24,27 @@
<parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>bundles-pom</artifactId>
- <version>14</version>
+ <version>15-SNAPSHOT</version>
<relativePath>../bundles-pom/pom.xml</relativePath>
</parent>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.spring-ldap</artifactId>
- <version>2.3.7.RELEASE_2-SNAPSHOT</version>
+ <version>2.4.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, spring-ldap-ldif-batch ${pkgVersion} jar files.</description>
+ <description>This OSGi bundle wraps spring-ldap-core, spring-ldap-core-tiger, 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.3.7.RELEASE</pkgVersion>
+ <pkgVersion>2.4.0</pkgVersion>
+ <servicemix.osgi.source.version>2.4.0.1</servicemix.osgi.source.version>
<servicemix.osgi.export.pkg>
org.springframework;-split-package:=merge-first,
org.springframework.ldap
@@ -157,21 +157,6 @@
<artifactId>spring-ldap-ldif-core</artifactId>
<version>${pkgVersion}</version>
</dependency>
- <dependency>
- <groupId>${pkgGroupId}</groupId>
- <artifactId>spring-ldap-ldif-batch</artifactId>
- <version>${pkgVersion}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework.batch</groupId>
- <artifactId>spring-batch-infrastructure</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<!-- sources-->
<dependency>
@@ -212,7 +197,6 @@
<include>${pkgGroupId}:spring-ldap-core-tiger</include>
<include>${pkgGroupId}:spring-ldap-odm</include>
<include>${pkgGroupId}:spring-ldap-ldif-core</include>
- <include>${pkgGroupId}:spring-ldap-ldif-batch</include>
</includes>
</artifactSet>
<filters>
@@ -240,12 +224,6 @@
<exclude>**/*</exclude>
</excludes>
</filter>
- <filter>
- <artifact>${pkgGroupId}:spring-ldap-ldif-batch</artifact>
- <excludes>
- <exclude>**/*</exclude>
- </excludes>
- </filter>
</filters>
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
<createDependencyReducedPom>true</createDependencyReducedPom>
diff --git a/spring-ldap-2.3.7.RELEASE/src/main/resources/OSGI-INF/bundle.info b/spring-ldap-2.4.0/src/main/resources/OSGI-INF/bundle.info
similarity index 100%
rename from spring-ldap-2.3.7.RELEASE/src/main/resources/OSGI-INF/bundle.info
rename to spring-ldap-2.4.0/src/main/resources/OSGI-INF/bundle.info