sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From o...@apache.org
Subject svn commit: r1724633 - in /sling/trunk/contrib/launchpad/karaf: org.apache.sling.launchpad.karaf-distribution/ org.apache.sling.launchpad.karaf-distribution/src/main/resources/etc/ org.apache.sling.launchpad.karaf-features/ org.apache.sling.launchpad.k...
Date Thu, 14 Jan 2016 15:41:18 GMT
Author: olli
Date: Thu Jan 14 15:41:18 2016
New Revision: 1724633

URL: http://svn.apache.org/viewvc?rev=1724633&view=rev
Log:
SLING-4412 Upgrade Karaf to 4.0

use Karaf 4.0.4

Modified:
    sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-distribution/pom.xml
    sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-distribution/src/main/resources/etc/startup.properties
    sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/pom.xml
    sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/pom.xml
    sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-oak-tar-integration-tests/pom.xml

Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-distribution/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-distribution/pom.xml?rev=1724633&r1=1724632&r2=1724633&view=diff
==============================================================================
--- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-distribution/pom.xml
(original)
+++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-distribution/pom.xml
Thu Jan 14 15:41:18 2016
@@ -38,6 +38,7 @@
   <!-- https://github.com/apache/karaf/blob/master/assemblies/apache-karaf/pom.xml -->
 
   <properties>
+    <org.apache.karaf.version>4.0.4</org.apache.karaf.version>
     <servicemix.specs.version>2.5.0</servicemix.specs.version>
     <xerces.version>2.11.0</xerces.version>
     <xalan.bundle.version>2.7.2_2</xalan.bundle.version>
@@ -48,13 +49,13 @@
     <dependency>
       <groupId>org.apache.karaf.features</groupId>
       <artifactId>framework</artifactId>
-      <version>4.0.3</version>
+      <version>${org.apache.karaf.version}</version>
       <type>kar</type>
     </dependency>
     <dependency>
       <groupId>org.apache.karaf.features</groupId>
       <artifactId>standard</artifactId>
-      <version>4.0.3</version>
+      <version>${org.apache.karaf.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
       <scope>runtime</scope>
@@ -81,7 +82,7 @@
       <plugin>
         <groupId>org.apache.karaf.tooling</groupId>
         <artifactId>karaf-maven-plugin</artifactId>
-        <version>4.0.3</version>
+        <version>${org.apache.karaf.version}</version>
         <extensions>true</extensions>
         <executions>
           <execution>

Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-distribution/src/main/resources/etc/startup.properties
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-distribution/src/main/resources/etc/startup.properties?rev=1724633&r1=1724632&r2=1724633&view=diff
==============================================================================
--- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-distribution/src/main/resources/etc/startup.properties
(original)
+++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-distribution/src/main/resources/etc/startup.properties
Thu Jan 14 15:41:18 2016
@@ -20,10 +20,10 @@
 # Bundles to be started on startup, with startlevel
 mvn\:org.apache.sshd/sshd-core/0.14.0 = 20
 mvn\:org.apache.felix/org.apache.felix.metatype/1.1.2 = 5
-mvn\:org.apache.karaf.services/org.apache.karaf.services.eventadmin/4.0.3 = 5
-mvn\:org.ops4j.pax.url/pax-url-aether/2.4.3 = 5
-mvn\:org.ops4j.pax.logging/pax-logging-api/1.8.4 = 8
-mvn\:org.ops4j.pax.logging/pax-logging-service/1.8.4 = 8
+mvn\:org.apache.karaf.services/org.apache.karaf.services.eventadmin/4.0.4 = 5
+mvn\:org.ops4j.pax.url/pax-url-aether/2.4.5 = 5
+mvn\:org.ops4j.pax.logging/pax-logging-api/1.8.5 = 8
+mvn\:org.ops4j.pax.logging/pax-logging-service/1.8.5 = 8
 mvn\:org.apache.felix/org.apache.felix.configadmin/1.8.8 = 10
 mvn\:org.apache.felix/org.apache.felix.fileinstall/3.5.0 = 11
-mvn\:org.apache.karaf.features/org.apache.karaf.features.core/4.0.3 = 15
+mvn\:org.apache.karaf.features/org.apache.karaf.features.core/4.0.4 = 15

Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/pom.xml?rev=1724633&r1=1724632&r2=1724633&view=diff
==============================================================================
--- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/pom.xml
(original)
+++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/pom.xml
Thu Jan 14 15:41:18 2016
@@ -36,6 +36,7 @@
   <description>Apache Sling Features for provisioning with Apache Karaf</description>
 
   <properties>
+    <org.apache.karaf.version>4.0.4</org.apache.karaf.version>
     <org.apache.jackrabbit.version>2.11.3</org.apache.jackrabbit.version>
     <org.apache.jackrabbit.oak.version>1.3.11</org.apache.jackrabbit.oak.version>
     <org.apache.tika.version>1.11</org.apache.tika.version>
@@ -47,7 +48,7 @@
       <plugin>
         <groupId>org.apache.karaf.tooling</groupId>
         <artifactId>karaf-maven-plugin</artifactId>
-        <version>4.0.3</version>
+        <version>${org.apache.karaf.version}</version>
         <extensions>true</extensions>
         <executions>
           <execution>

Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/pom.xml?rev=1724633&r1=1724632&r2=1724633&view=diff
==============================================================================
--- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/pom.xml
(original)
+++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/pom.xml
Thu Jan 14 15:41:18 2016
@@ -36,6 +36,7 @@
   <description>Integration Tests for Apache Sling Launchpad Karaf</description>
 
   <properties>
+    <org.apache.karaf.version>4.0.4</org.apache.karaf.version>
     <org.ops4j.pax.exam.version>4.8.0</org.ops4j.pax.exam.version>
   </properties>
 
@@ -67,7 +68,7 @@
     <dependency>
       <groupId>org.apache.karaf.features</groupId>
       <artifactId>org.apache.karaf.features.core</artifactId>
-      <version>4.0.3</version>
+      <version>${org.apache.karaf.version}</version>
       <scope>provided</scope>
     </dependency>
     <!-- Apache Sling -->
@@ -131,7 +132,7 @@
       <groupId>org.apache.karaf</groupId>
       <artifactId>apache-karaf</artifactId>
       <type>tar.gz</type>
-      <version>4.0.3</version>
+      <version>${org.apache.karaf.version}</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>

Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-oak-tar-integration-tests/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-oak-tar-integration-tests/pom.xml?rev=1724633&r1=1724632&r2=1724633&view=diff
==============================================================================
--- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-oak-tar-integration-tests/pom.xml
(original)
+++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-oak-tar-integration-tests/pom.xml
Thu Jan 14 15:41:18 2016
@@ -36,6 +36,7 @@
   <description>Launchpad Oak Tar Integration Tests for Apache Sling Launchpad Karaf</description>
 
   <properties>
+    <org.apache.karaf.version>4.0.4</org.apache.karaf.version>
     <org.ops4j.pax.exam.version>4.8.0</org.ops4j.pax.exam.version>
   </properties>
 
@@ -64,7 +65,7 @@
       <groupId>org.apache.karaf</groupId>
       <artifactId>apache-karaf</artifactId>
       <type>tar.gz</type>
-      <version>4.0.3</version>
+      <version>${org.apache.karaf.version}</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>



Mime
View raw message