This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
The following commit(s) were added to refs/heads/main by this push:
new 4a3d7fe3 Ref #269: Remove Spring features (#270)
4a3d7fe3 is described below
commit 4a3d7fe3d5c80752148da53591ffb3a14eb35ada
Author: Nicolas Filotto <[email protected]>
AuthorDate: Fri May 3 15:10:49 2024 +0200
Ref #269: Remove Spring features (#270)
---
features/pom.xml | 6 ---
features/src/main/feature/camel-features.xml | 2 -
features/src/main/feature/spring-features.xml | 57 ---------------------------
3 files changed, 65 deletions(-)
diff --git a/features/pom.xml b/features/pom.xml
index 44f8bff3..75029136 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -70,7 +70,6 @@
<configuration>
<descriptors>
<descriptor>file:${project.build.directory}/feature/camel-features.xml</descriptor>
-
<descriptor>file:${project.build.directory}/feature/spring-features.xml</descriptor>
<descriptor>mvn:org.apache.karaf.features/specs/${karaf.version}/xml/features</descriptor>
<descriptor>mvn:org.apache.karaf.features/spring/${karaf.version}/xml/features</descriptor>
</descriptors>
@@ -111,11 +110,6 @@
<classifier>features</classifier>
<type>xml</type>
</artifact>
- <artifact>
-
<file>target/feature/spring-features.xml</file>
- <classifier>spring-features</classifier>
- <type>xml</type>
- </artifact>
</artifacts>
</configuration>
</execution>
diff --git a/features/src/main/feature/camel-features.xml
b/features/src/main/feature/camel-features.xml
index 82e75017..bd8c3d36 100644
--- a/features/src/main/feature/camel-features.xml
+++ b/features/src/main/feature/camel-features.xml
@@ -19,8 +19,6 @@
-->
<features xmlns="http://karaf.apache.org/xmlns/features/v1.5.0";
name="camel-${project.version}">
-
<repository>mvn:org.apache.camel.karaf/apache-camel/${project.version}/xml/spring-features</repository>
-
<!-- TODO: specs will be provided by Apache Karaf 4.5.x spec features
repository. However, in order to have Camel 4.x working on Karaf 4.4.x, we
define spec features here -->
<feature name="jakarta-activation" version="2.1.2">
<bundle
dependency="true">mvn:jakarta.activation/jakarta.activation-api/2.1.2</bundle>
diff --git a/features/src/main/feature/spring-features.xml
b/features/src/main/feature/spring-features.xml
deleted file mode 100644
index 6b66b04e..00000000
--- a/features/src/main/feature/spring-features.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.5.0";
name="spring-${spring-version}">
-
- <feature name="spring" version="${spring-version}">
- <bundle
start-level="30">wrap:mvn:org.springframework/spring-core/${spring-version}$Export-Package=org.springframework.*;version=${spring-version}</bundle>
- <bundle
start-level="30">wrap:mvn:org.springframework/spring-expression/${spring-version}$Export-Package=org.springframework.*;version=${spring-version}</bundle>
- <bundle
start-level="30">wrap:mvn:org.springframework/spring-beans/${spring-version}$Export-Package=org.springframework.*;version=${spring-version}</bundle>
- <bundle
start-level="30">wrap:mvn:org.springframework/spring-aop/${spring-version}$Export-Package=org.*;version=${spring-version}</bundle>
- <bundle
start-level="30">wrap:mvn:org.springframework/spring-context/${spring-version}$Export-Package=org.springframework.*;version=${spring-version}</bundle>
- <bundle
start-level="30">wrap:mvn:org.springframework/spring-context-support/${spring-version}$Export-Package=org.springframework.*;version=${spring-version}</bundle>
- </feature>
-
- <feature name="spring-jms" version="${spring-version}">
- <feature version="${camel.osgi.spring.version}">spring-tx</feature>
- <bundle dependency="true"
start-level="10">mvn:jakarta.jms/jakarta.jms-api/${jakarta-jms-api-version}</bundle>
- <bundle
start-level="30">wrap:mvn:org.springframework/spring-jms/${spring-version}$Export-Package=org.springframework.*;version=${spring-version}</bundle>
- </feature>
-
- <feature name="spring-tx" version="${spring-version}">
- <feature version="${camel.osgi.spring.version}">spring</feature>
- <bundle dependency="true"
start-level="10">mvn:jakarta.transaction/jakarta.transaction-api/${jakarta-transaction-api-version}</bundle>
- <bundle
start-level="30">wrap:mvn:org.springframework/spring-tx/${spring-version}$Export-Package=org.springframework.*;version=${spring-version}</bundle>
- </feature>
-
- <feature name="spring-orm" version="${spring-version}">
- <feature version='${camel.osgi.spring.version}'>spring-jdbc</feature>
- <bundle
start-level="30">wrap:mvn:org.springframework/spring-orm/${spring-version}$Export-Package=org.springframework.*;version=${spring-version}</bundle>
- </feature>
-
- <feature name="spring-jdbc" version="${spring-version}">
- <feature version='${camel.osgi.spring.version}'>spring-tx</feature>
- <bundle
start-level="30">wrap:mvn:org.springframework/spring-jdbc/${spring-version}$Export-Package=org.springframework.*;version=${spring-version}</bundle>
- </feature>
-
- <feature name="spring-messaging" version="${spring-version}">
- <feature version='${camel.osgi.spring.version}'>spring</feature>
- <bundle
start-level="30">wrap:mvn:org.springframework/spring-messaging/${spring-version}$Export-Package=org.springframework.*;version=${spring-version}</bundle>
- </feature>
-</features>
\ No newline at end of file
