[sling-org-apache-sling-karaf-features] 02/02: SLING-10367 Update Karaf to 4.3.3

[ol...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-features.git

commit 7899c32eec1f801d7769c217a8b48675aa05832f
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Sep 7 20:54:21 2021 +0200

    SLING-10367 Update Karaf to 4.3.3
---
 pom.xml                      |  2 +-
 src/main/feature/feature.xml | 17 +----------------
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1bc7e2d..670dfb6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,7 @@
       <plugin>
         <groupId>org.apache.karaf.tooling</groupId>
         <artifactId>karaf-maven-plugin</artifactId>
-        <version>4.3.3-SNAPSHOT</version>
+        <version>4.3.3</version>
         <extensions>true</extensions>
         <executions>
           <execution>
diff --git a/src/main/feature/feature.xml b/src/main/feature/feature.xml
index e83af48..1ccc640 100644
--- a/src/main/feature/feature.xml
+++ b/src/main/feature/feature.xml
@@ -533,7 +533,7 @@
     <!-- dependencies -->
     <feature version="${project.version}">sling</feature>
     <feature version="${project.version}">sling-scripting</feature>
-    <feature version="${project.version}">spifly</feature>
+    <feature version="1.3.2">spifly</feature>
     <bundle dependency="true">mvn:org.codehaus.groovy/groovy/3.0.8</bundle>
     <bundle dependency="true">mvn:org.codehaus.groovy/groovy-json/3.0.8</bundle>
     <bundle dependency="true">mvn:org.codehaus.groovy/groovy-templates/3.0.8</bundle>
@@ -819,19 +819,4 @@
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ognl/3.2.1_1</bundle>
     <bundle dependency="true">mvn:org.javassist/javassist/3.28.0-GA</bundle>
   </feature>
-  <!-- asm (KARAF-6905) -->
-  <feature name="asm" version="${project.version}">
-    <bundle>mvn:org.ow2.asm/asm/9.2</bundle>
-    <bundle>mvn:org.ow2.asm/asm-analysis/9.2</bundle>
-    <bundle>mvn:org.ow2.asm/asm-commons/9.2</bundle>
-    <bundle>mvn:org.ow2.asm/asm-util/9.2</bundle>
-    <bundle>mvn:org.ow2.asm/asm-tree/9.2</bundle>
-  </feature>
-  <!-- spifly (KARAF-6905) -->
-  <feature name="spifly" version="${project.version}">
-    <bundle>mvn:org.apache.aries.spifly/org.apache.aries.spifly.dynamic.bundle/1.3.4</bundle>
-    <!-- dependencies -->
-    <bundle dependency="true">mvn:org.apache.aries/org.apache.aries.util/1.1.3</bundle>
-    <feature version="${project.version}">asm</feature>
-  </feature>
 </features>