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/karaf.git
The following commit(s) were added to refs/heads/master by this push:
new f385d49 Remove Spring 4.2
new 57557a4 Merge pull request #1130 from skitt/remove-spring-4.2
f385d49 is described below
commit f385d493dc3df4fb3321920092e759fc9899477e
Author: Stephen Kitt <[email protected]>
AuthorDate: Wed May 20 16:16:32 2020 +0200
Remove Spring 4.2
This is part of KARAF-6722, but doesn’t fix it entirely.
Spring 4.2 is obsolete, no longer maintained upstream.
https://github.com/spring-projects/spring-framework/wiki/Upgrading-to-Spring-Framework-4.x
documents how to upgrade to 4.3, the currently-supported line in the
4.x family.
Signed-off-by: Stephen Kitt <[email protected]>
---
.../spring-legacy/src/main/feature/feature.xml | 78 --------------
itests/test/pom.xml | 2 -
.../java/org/apache/karaf/itests/BaseTest.java | 1 -
.../itests/features/Spring42FeaturesTest.java | 117 ---------------------
pom.xml | 1 -
5 files changed, 199 deletions(-)
diff --git a/assemblies/features/spring-legacy/src/main/feature/feature.xml
b/assemblies/features/spring-legacy/src/main/feature/feature.xml
index 8e45f27..39c005c 100644
--- a/assemblies/features/spring-legacy/src/main/feature/feature.xml
+++ b/assemblies/features/spring-legacy/src/main/feature/feature.xml
@@ -201,84 +201,6 @@
<bundle
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-webmvc-portlet/${spring32.version}</bundle>
</feature>
- <!-- Spring 4.2.x support -->
-
- <feature name="spring" description="Spring 4.2.x support"
version="${spring42.version}">
- <bundle dependency="true"
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance.bundle.version}</bundle>
- <bundle
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-core/${spring42.version}</bundle>
- <bundle
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-expression/${spring42.version}</bundle>
- <bundle
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-beans/${spring42.version}</bundle>
- <bundle
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aop/${spring42.version}</bundle>
- <bundle
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context/${spring42.version}</bundle>
- <bundle
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context-support/${spring42.version}</bundle>
- </feature>
-
- <feature name="spring-aspects" description="Spring 4.2.x AOP support"
version="${spring42.version}">
- <feature version="[${spring42.version},4.3)">spring</feature>
- <bundle
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aspects/${spring42.version}</bundle>
- </feature>
-
- <feature name="spring-instrument" description="Spring 4.2.x Instrument
support" version="${spring42.version}">
- <feature version="[${spring42.version},4.3)">spring</feature>
- <bundle
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-instrument/${spring42.version}</bundle>
- </feature>
-
- <feature name="spring-jdbc" description="Spring 4.2.x JDBC support"
version="${spring42.version}">
- <feature version="[${spring42.version},4.3)">spring-tx</feature>
- <bundle
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jdbc/${spring42.version}</bundle>
- </feature>
-
- <feature name="spring-jms" description="Spring 4.2.x JMS support"
version="${spring42.version}">
- <feature version="[${spring42.version},4.3)">spring-tx</feature>
- <bundle dependency="true"
start-level="10">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
- <bundle dependency="true"
start-level="10">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms-spec.version}</bundle>
- <bundle
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jms/${spring42.version}</bundle>
- </feature>
-
- <feature name="spring-messaging" description="Spring 4.2.x Messaging
support" version="${spring42.version}">
- <feature version="[${spring42.version},4.3)">spring</feature>
- <bundle
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-messaging/${spring42.version}</bundle>
- </feature>
-
- <feature name="spring-test" description="Spring 4.2.x Test support"
version="${spring42.version}">
- <feature version="[${spring42.version},4.3)">spring</feature>
- <bundle
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-test/${spring42.version}</bundle>
- </feature>
-
- <feature name="spring-orm" description="Spring 4.2.x ORM support"
version="${spring42.version}">
- <feature version="[${spring42.version},4.3)">spring-jdbc</feature>
- <bundle
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-orm/${spring42.version}</bundle>
- </feature>
-
- <feature name="spring-oxm" description="Spring 4.2.x OXM support"
version="${spring42.version}">
- <feature version="[${spring42.version},4.3)">spring</feature>
- <bundle
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-oxm/${spring42.version}</bundle>
- </feature>
-
- <feature name="spring-tx" description="Spring 4.2.x Transaction (TX)
support" version="${spring42.version}">
- <feature version="[${spring42.version},4.3)">spring</feature>
- <bundle
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-tx/${spring42.version}</bundle>
- </feature>
-
- <feature name="spring-web" description="Spring 4.2.x Web support"
version="${spring42.version}">
- <feature version="[${spring42.version},4.3)">spring</feature>
- <feature>http</feature>
- <bundle
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-web/${spring42.version}</bundle>
- <bundle
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-webmvc/${spring42.version}</bundle>
- </feature>
-
- <feature name="spring-web-portlet" description="Spring 4.2.x Web Portlet
support" version="${spring42.version}">
- <feature prerequisite="true">wrap</feature>
- <feature version="[${spring42.version},4.3)">spring-web</feature>
- <bundle dependency="true"
start-level="30">wrap:mvn:javax.portlet/portlet-api/${portlet-api.version}$Export-Package=javax.portlet.*;version=2.0</bundle>
- <bundle
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-webmvc-portlet/${spring42.version}</bundle>
- </feature>
-
- <feature name="spring-websocket" description="Spring 4.2.x WebSocket
support" version="${spring42.version}">
- <feature version="[${spring42.version},4.3)">spring-web</feature>
- <bundle
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-websocket/${spring42.version}</bundle>
- </feature>
-
<!-- Spring 4.3.x support -->
<feature name="spring" description="Spring 4.3.x support"
version="${spring43.version}">
diff --git a/itests/test/pom.xml b/itests/test/pom.xml
index 8615507..953585d 100644
--- a/itests/test/pom.xml
+++ b/itests/test/pom.xml
@@ -307,7 +307,6 @@
<org.ops4j.pax.logging.DefaultServiceLog.level>INFO</org.ops4j.pax.logging.DefaultServiceLog.level>
<spring31.version>${spring31.version}</spring31.version>
<spring32.version>${spring32.version}</spring32.version>
-
<spring42.version>${spring42.version}</spring42.version>
<spring43.version>${spring43.version}</spring43.version>
<spring50.version>${spring50.version}</spring50.version>
<spring51.version>${spring51.version}</spring51.version>
@@ -369,7 +368,6 @@
<karaf.version>${project.version}</karaf.version>
<spring31.version>${spring31.version}</spring31.version>
<spring32.version>${spring32.version}</spring32.version>
-
<spring42.version>${spring42.version}</spring42.version>
<spring43.version>${spring43.version}</spring43.version>
<spring50.version>${spring50.version}</spring50.version>
<spring51.version>${spring51.version}</spring51.version>
diff --git a/itests/test/src/test/java/org/apache/karaf/itests/BaseTest.java
b/itests/test/src/test/java/org/apache/karaf/itests/BaseTest.java
index 2328109..a340ff3 100644
--- a/itests/test/src/test/java/org/apache/karaf/itests/BaseTest.java
+++ b/itests/test/src/test/java/org/apache/karaf/itests/BaseTest.java
@@ -27,7 +27,6 @@ public class BaseTest extends KarafTestSupport {
KarafDistributionOption.replaceConfigurationFile("etc/org.ops4j.pax.logging.cfg",
getConfigFile("/etc/org.ops4j.pax.logging.cfg")),
KarafDistributionOption.editConfigurationFilePut("etc/system.properties",
"spring31.version", System.getProperty("spring31.version")),
KarafDistributionOption.editConfigurationFilePut("etc/system.properties",
"spring32.version", System.getProperty("spring32.version")),
-
KarafDistributionOption.editConfigurationFilePut("etc/system.properties",
"spring42.version", System.getProperty("spring42.version")),
KarafDistributionOption.editConfigurationFilePut("etc/system.properties",
"spring43.version", System.getProperty("spring43.version")),
KarafDistributionOption.editConfigurationFilePut("etc/system.properties",
"spring50.version", System.getProperty("spring50.version")),
KarafDistributionOption.editConfigurationFilePut("etc/system.properties",
"spring51.version", System.getProperty("spring51.version")),
diff --git
a/itests/test/src/test/java/org/apache/karaf/itests/features/Spring42FeaturesTest.java
b/itests/test/src/test/java/org/apache/karaf/itests/features/Spring42FeaturesTest.java
deleted file mode 100644
index cd2b7d3..0000000
---
a/itests/test/src/test/java/org/apache/karaf/itests/features/Spring42FeaturesTest.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Licensed 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.
- */
-package org.apache.karaf.itests.features;
-
-import org.apache.karaf.itests.BaseTest;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.MavenUtils;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerClass;
-
-import java.util.Arrays;
-import java.util.LinkedList;
-import java.util.List;
-
-import static
org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
-
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerClass.class)
-public class Spring42FeaturesTest extends BaseTest {
-
- @Configuration
- public Option[] config() {
- String version = MavenUtils.getArtifactVersion("org.apache.karaf",
"apache-karaf");
- List<Option> result = new LinkedList<>(Arrays.asList(super.config()));
-
result.add(editConfigurationFilePut("etc/org.apache.karaf.features.cfg",
"featuresRepositories",
- "mvn:org.apache.karaf.features/framework/" + version +
"/xml/features, " +
- "mvn:org.apache.karaf.features/spring/" + version +
"/xml/features, " +
- "mvn:org.apache.karaf.features/spring-legacy/" +
version + "/xml/features, " +
- "mvn:org.apache.karaf.features/enterprise/" + version
+ "/xml/features, " +
- "mvn:org.apache.karaf.features/enterprise-legacy/" +
version + "/xml/features, " +
- "mvn:org.apache.karaf.features/standard/" + version +
"/xml/features"));
- return result.toArray(new Option[result.size()]);
- }
-
- @Test
- public void installSpringFeature() throws Exception {
- installAssertAndUninstallFeature("spring",
System.getProperty("spring42.version"));
- }
-
- @Test
- public void installSpringAspectsFeature() throws Exception {
- installAssertAndUninstallFeature("spring-aspects",
System.getProperty("spring42.version"));
- }
-
- @Test
- public void installSpringInstrumentFeature() throws Exception {
- installAssertAndUninstallFeature("spring-instrument",
System.getProperty("spring42.version"));
- }
-
- @Test
- public void installSpringJdbcFeature() throws Exception {
- installAssertAndUninstallFeature("spring-jdbc",
System.getProperty("spring42.version"));
- }
-
- @Test
- public void installSpringJmsFeature() throws Exception {
- installAssertAndUninstallFeature("spring-jms",
System.getProperty("spring42.version"));
- }
-
- @Test
- public void installSpringMessagingFeature() throws Exception {
- installAssertAndUninstallFeature("spring-messaging",
System.getProperty("spring42.version"));
- }
-
- @Test
- public void installSpringTestFeature() throws Exception {
- installAssertAndUninstallFeature("spring-test",
System.getProperty("spring42.version"));
- }
-
- @Test
- public void installSpringOrmFeature() throws Exception {
- installAssertAndUninstallFeature("spring-orm",
System.getProperty("spring42.version"));
- }
-
- @Test
- public void installSpringOxmFeature() throws Exception {
- installAssertAndUninstallFeature("spring-oxm",
System.getProperty("spring42.version"));
- }
-
- @Test
- public void installSpringTxFeature() throws Exception {
- installAssertAndUninstallFeature("spring-tx",
System.getProperty("spring42.version"));
- }
-
- @Test
- public void installSpringWebFeature() throws Exception {
- installAssertAndUninstallFeature("spring-web",
System.getProperty("spring42.version"));
- }
-
- @Test
- public void installSpringWebPortletFeature() throws Exception {
- installAssertAndUninstallFeature("spring-web-portlet",
System.getProperty("spring42.version"));
- }
-
- @Test
- public void installSpringWebSocketFeature() throws Exception {
- installAssertAndUninstallFeature("spring-websocket",
System.getProperty("spring42.version"));
- }
-
-}
diff --git a/pom.xml b/pom.xml
index bda9055..92bf272 100644
--- a/pom.xml
+++ b/pom.xml
@@ -297,7 +297,6 @@
<spring.osgi.version>1.2.1</spring.osgi.version>
<spring31.version>3.1.4.RELEASE</spring31.version>
<spring32.version>3.2.18.RELEASE_1</spring32.version>
- <spring42.version>4.2.9.RELEASE_1</spring42.version>
<spring43.version>4.3.25.RELEASE_1</spring43.version>
<spring50.version>5.0.15.RELEASE_1</spring50.version>
<spring51.version>5.1.14.RELEASE_1</spring51.version>
