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 2020/11/01 14:38:36 UTC

[servicemix-bundles] branch master updated: [SM-4575] Create OSGi bundle for spring-integration-core 5.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 94442f4  [SM-4575] Create OSGi bundle for spring-integration-core 5.4.0
94442f4 is described below

commit 94442f47d369fac838c35d0e2c03616bedad1564
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Sun Nov 1 15:37:58 2020 +0100

    [SM-4575] Create OSGi bundle for spring-integration-core 5.4.0
---
 pom.xml                                            |   1 +
 spring-integration-core-4.3.11.RELEASE/pom.xml     | 120 ---------------------
 .../src/main/resources/OSGI-INF/bundle.info        |  16 ---
 .../pom.xml                                        |   5 +-
 .../src/main/resources/OSGI-INF/bundle.info        |   0
 5 files changed, 3 insertions(+), 139 deletions(-)

diff --git a/pom.xml b/pom.xml
index d3f2347..09a304a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,6 +65,7 @@
       <module>postgresql-42.2.18.jre7</module>
       <module>sparkjava-core-2.9.3</module>
       <module>fastjson-1.2.74</module>
+      <module>spring-integration-core-5.4.0</module>
     </modules>
 
 </project>
diff --git a/spring-integration-core-4.3.11.RELEASE/pom.xml b/spring-integration-core-4.3.11.RELEASE/pom.xml
deleted file mode 100644
index 97bb7ac..0000000
--- a/spring-integration-core-4.3.11.RELEASE/pom.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-    <!--
-
-        Licensed to the Apache Software Foundation (ASF) under one or more
-        contributor license agreements.  See the NOTICE file distributed with
-        this work for additional information regarding copyright ownership.
-        The ASF licenses this file to You under the Apache License, Version 2.0
-        (the "License"); you may not use this file except in compliance with
-        the License.  You may obtain a copy of the License at
-
-           http://www.apache.org/licenses/LICENSE-2.0
-
-        Unless required by applicable law or agreed to in writing, software
-        distributed under the License is distributed on an "AS IS" BASIS,
-        WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-        See the License for the specific language governing permissions and
-        limitations under the License.
-    -->
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.servicemix.bundles</groupId>
-        <artifactId>bundles-pom</artifactId>
-        <version>13</version>
-        <relativePath>../bundles-pom/pom.xml</relativePath>
-    </parent>
-
-    <groupId>org.apache.servicemix.bundles</groupId>
-    <artifactId>org.apache.servicemix.bundles.spring-integration-core</artifactId>
-    <version>4.3.11.RELEASE_2-SNAPSHOT</version>
-    <packaging>bundle</packaging>
-    <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
-    <description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar file.</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.integration</pkgGroupId>
-        <pkgArtifactId>spring-integration-core</pkgArtifactId>
-        <pkgVersion>4.3.11.RELEASE</pkgVersion>
-        <servicemix.osgi.export.pkg>
-            org.springframework.integration
-        </servicemix.osgi.export.pkg>
-        <servicemix.osgi.import.pkg>
-            com.esotericsoftware.kryo;resolution:=optional,
-            com.esotericsoftware.kryo.io;resolution:=optional,
-            com.esotericsoftware.kryo.pool;resolution:=optional,
-            com.fasterxml*,
-            com.jayway*;resolution:=optional,
-            javax.xml.parsers,
-            org.aopalliance*,
-            org.apache.commons.logging;resolution:=optional,
-            org.boon.json;resolution:=optional,
-            org.codehaus.jackson*,
-            org.objenesis.strategy;resolution:=optional,
-            org.slf4j;resolution:=optional,
-            org.springframework*,
-            org.w3c.dom,
-            reactor*;resolution:=optional
-        </servicemix.osgi.import.pkg>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${pkgGroupId}</groupId>
-            <artifactId>${pkgArtifactId}</artifactId>
-            <version>${pkgVersion}</version>
-        </dependency>
-
-        <!-- sources -->
-        <dependency>
-            <groupId>${pkgGroupId}</groupId>
-            <artifactId>${pkgArtifactId}</artifactId>
-            <version>${pkgVersion}</version>
-            <classifier>sources</classifier>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <artifactSet>
-                                <includes>
-                                    <include>${pkgGroupId}:${pkgArtifactId}</include>
-                                </includes>
-                            </artifactSet>
-                            <filters>
-                                <filter>
-                                    <artifact>${pkgGroupId}:${pkgArtifactId}</artifact>
-                                    <includes>
-                                        <include>META-INF/*</include>
-                                    </includes>
-                                </filter>
-                            </filters>
-                            <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
-                            <createDependencyReducedPom>true</createDependencyReducedPom>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/spring-integration-core-4.3.11.RELEASE/src/main/resources/OSGI-INF/bundle.info b/spring-integration-core-4.3.11.RELEASE/src/main/resources/OSGI-INF/bundle.info
deleted file mode 100644
index 526acee..0000000
--- a/spring-integration-core-4.3.11.RELEASE/src/main/resources/OSGI-INF/bundle.info
+++ /dev/null
@@ -1,16 +0,0 @@
-\u001B[1mSYNOPSIS\u001B[0m
-    ${project.description}
-
-    Original Maven URL:
-        \u001B[33mmvn:${pkgGroupId}/${pkgArtifactId}/${pkgVersion}\u001B[0m
-
-\u001B[1mDESCRIPTION\u001B[0m
-    Extends the Spring programming model to support the well-known Enterprise Integration Patterns. 
-    Spring Integration enables lightweight messaging within Spring-based applications and supports integration with external systems 
-    via declarative adapters. 
-    Those adapters provide a higher-level of abstraction over Spring's support for remoting, messaging, and scheduling. 
-    Spring Integration's primary goal is to provide a simple model for building enterprise integration solutions 
-    while maintaining the separation of concerns that is essential for producing maintainable, testable code.
-
-\u001B[1mSEE ALSO\u001B[0m
-    \u001B[36mhttp://projects.spring.io/spring-integration/\u001B[0m
diff --git a/spring-integration-core-5.3.2.RELEASE/pom.xml b/spring-integration-core-5.4.0/pom.xml
similarity index 97%
rename from spring-integration-core-5.3.2.RELEASE/pom.xml
rename to spring-integration-core-5.4.0/pom.xml
index adca6cf..2843ab3 100644
--- a/spring-integration-core-5.3.2.RELEASE/pom.xml
+++ b/spring-integration-core-5.4.0/pom.xml
@@ -30,7 +30,7 @@
 
     <groupId>org.apache.servicemix.bundles</groupId>
     <artifactId>org.apache.servicemix.bundles.spring-integration-core</artifactId>
-    <version>5.3.2.RELEASE_2-SNAPSHOT</version>
+    <version>5.4.0_1-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
     <description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar file.</description>
@@ -39,13 +39,12 @@
         <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.integration</pkgGroupId>
         <pkgArtifactId>spring-integration-core</pkgArtifactId>
-        <pkgVersion>5.3.2.RELEASE</pkgVersion>
+        <pkgVersion>5.4.0</pkgVersion>
         <servicemix.osgi.export.pkg>
             org.springframework.integration
         </servicemix.osgi.export.pkg>
diff --git a/spring-integration-core-5.3.2.RELEASE/src/main/resources/OSGI-INF/bundle.info b/spring-integration-core-5.4.0/src/main/resources/OSGI-INF/bundle.info
similarity index 100%
rename from spring-integration-core-5.3.2.RELEASE/src/main/resources/OSGI-INF/bundle.info
rename to spring-integration-core-5.4.0/src/main/resources/OSGI-INF/bundle.info