This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch karaf-4.2.x
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/karaf-4.2.x by this push:
new 0ef9339 [KARAF-6977] Cleanup pom
0ef9339 is described below
commit 0ef9339cf6ec90189ddf796d0bfae12c3d4556b6
Author: jbonofre <jbono...@apache.org>
AuthorDate: Wed Dec 30 07:29:35 2020 +0100
[KARAF-6977] Cleanup pom
---
.../enterprise-legacy/src/main/feature/feature.xml | 4 ++--
.../features/spring-legacy/src/main/feature/feature.xml | 4 ++--
bom/pom.xml | 15 ---------------
pom.xml | 6 ------
4 files changed, 4 insertions(+), 25 deletions(-)
diff --git a/assemblies/features/enterprise-legacy/src/main/feature/feature.xml
b/assemblies/features/enterprise-legacy/src/main/feature/feature.xml
index 60792d5..bd2fb45 100644
--- a/assemblies/features/enterprise-legacy/src/main/feature/feature.xml
+++ b/assemblies/features/enterprise-legacy/src/main/feature/feature.xml
@@ -118,7 +118,7 @@
<bundle
dependency="true">mvn:org.apache.geronimo.specs/geronimo-jpa_2.0_spec/${geronimo.jpa-spec.version}</bundle>
<feature>http</feature>
<bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/${antlr.bundle.version}</bundle>
- <bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant.bundle.version}</bundle>
+ <bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/1.10.9_1</bundle>
<bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/${dom4j.bundle.version}</bundle>
<bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.serp/${serp.bundle.version}</bundle>
<bundle dependency="true">mvn:com.fasterxml/classmate/1.1.0</bundle>
@@ -146,7 +146,7 @@
<feature>http</feature>
<bundle
dependency="true">mvn:org.eclipse.persistence/javax.persistence/2.1.0</bundle>
<bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/${antlr.bundle.version}</bundle>
- <bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant.bundle.version}</bundle>
+ <bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/1.10.9_1</bundle>
<bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/${dom4j.bundle.version}</bundle>
<bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.serp/${serp.bundle.version}</bundle>
<bundle dependency="true">mvn:com.fasterxml/classmate/1.1.0</bundle>
diff --git a/assemblies/features/spring-legacy/src/main/feature/feature.xml
b/assemblies/features/spring-legacy/src/main/feature/feature.xml
index 7564ffc..2bb8d65 100644
--- a/assemblies/features/spring-legacy/src/main/feature/feature.xml
+++ b/assemblies/features/spring-legacy/src/main/feature/feature.xml
@@ -86,7 +86,7 @@
<feature>war</feature>
<bundle dependency="true"
start-level="30">mvn:commons-collections/commons-collections/${commons-collections.version}</bundle>
<bundle dependency="true"
start-level="30">mvn:commons-beanutils/commons-beanutils/${commons-beanutils.version}</bundle>
- <bundle dependency="true"
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.struts/${struts.bundle.version}</bundle>
+ <bundle dependency="true"
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.struts/1.3.10_1</bundle>
<bundle
start-level="30">mvn:org.springframework/spring-struts/${spring31.version}</bundle>
</feature>
@@ -163,7 +163,7 @@
<feature>war</feature>
<bundle dependency="true"
start-level="30">mvn:commons-collections/commons-collections/${commons-collections.version}</bundle>
<bundle dependency="true"
start-level="30">mvn:commons-beanutils/commons-beanutils/${commons-beanutils.version}</bundle>
- <bundle dependency="true"
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.struts/${struts.bundle.version}</bundle>
+ <bundle dependency="true"
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.struts/1.3.10_1</bundle>
<bundle
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-struts/${spring32.version}</bundle>
</feature>
diff --git a/bom/pom.xml b/bom/pom.xml
index 7f22126..55d864d 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -755,21 +755,6 @@
<version>${maven.wagon.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
-
<artifactId>org.apache.servicemix.bundles.xercesImpl</artifactId>
- <version>${xerces.bundle.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.xalan</artifactId>
- <version>${xalan.bundle.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
-
<artifactId>org.apache.servicemix.bundles.xalan-serializer</artifactId>
- <version>${xalan-serializer.bundle.version}</version>
- </dependency>
- <dependency>
<groupId>org.springframework.osgi</groupId>
<artifactId>spring-osgi-core</artifactId>
<version>${spring.osgi.version}</version>
diff --git a/pom.xml b/pom.xml
index 3be48ba..e6d0785 100644
--- a/pom.xml
+++ b/pom.xml
@@ -141,7 +141,6 @@
<activemq.version>5.15.11</activemq.version>
<aopalliance.bundle.version>1.0_6</aopalliance.bundle.version>
<aspectj.bundle.version>1.9.5_1</aspectj.bundle.version>
- <ant.bundle.version>1.10.8_1</ant.bundle.version>
<antlr.bundle.version>2.7.7_5</antlr.bundle.version>
<asm6.version>6.2.1</asm6.version>
<asm.version>9.0</asm.version>
@@ -313,17 +312,12 @@
<sshd.version>2.5.1</sshd.version>
<derby-version>10.14.2.0</derby-version>
<directory-version>2.0.0-M24</directory-version>
- <struts.bundle.version>1.3.10_1</struts.bundle.version>
<xbean.version>4.18</xbean.version>
- <xerces.bundle.version>2.12.0_1</xerces.bundle.version>
- <xalan.bundle.version>2.7.2_3</xalan.bundle.version>
-
<xalan-serializer.bundle.version>2.7.2_1</xalan-serializer.bundle.version>
<javax.mail.version>1.4.7</javax.mail.version>
<websocket.version>1.1</websocket.version>
<winsw.version>2.3.0</winsw.version>
-
<surefire.argLine />
<!-- Further used maven plugin versions; e.g. in the docs -->
