You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2022/03/06 10:40:16 UTC

[sling-org-apache-sling-karaf-features] branch master updated (a7d8ebc -> bde724f)

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

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


    from a7d8ebc  SLING-11051 - Fixing JavaDoc badge
     new 884aeed  SLING-11185 Update to Sling (Bundle) Parent 47
     new bde724f  SLING-11186 Update Karaf to 4.3.6

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 pom.xml                      | 4 ++--
 src/main/feature/feature.xml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

[sling-org-apache-sling-karaf-features] 02/02: SLING-11186 Update Karaf to 4.3.6

Posted by 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 bde724f4f9a832fe551d563adf693b2238d3b2b4
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sun Mar 6 11:34:03 2022 +0100

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

diff --git a/pom.xml b/pom.xml
index 8e248dd..253efb9 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.5</version>
+        <version>4.3.6</version>
         <extensions>true</extensions>
         <executions>
           <execution>
diff --git a/src/main/feature/feature.xml b/src/main/feature/feature.xml
index 8931e2a..762e829 100644
--- a/src/main/feature/feature.xml
+++ b/src/main/feature/feature.xml
@@ -531,7 +531,7 @@
     <!-- dependencies -->
     <feature version="${project.version}">sling</feature>
     <feature version="${project.version}">sling-scripting</feature>
-    <feature version="1.3.2">spifly</feature>
+    <feature>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>

[sling-org-apache-sling-karaf-features] 01/02: SLING-11185 Update to Sling (Bundle) Parent 47

Posted by 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 884aeed5673a41589d011d31d6c140171e79325f
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sun Mar 6 11:29:56 2022 +0100

    SLING-11185 Update to Sling (Bundle) Parent 47
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 6e244d3..8e248dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.sling</groupId>
     <artifactId>sling</artifactId>
-    <version>46</version>
+    <version>47</version>
     <relativePath/>
   </parent>