From 47d8e6423dcc74f96bd3cf3ef65aade98505511b Mon Sep 17 00:00:00 2001
From: Wiiitek <kubiczak.jakub@gmail.com>
Date: Mon, 4 Jun 2018 17:41:48 +0200
Subject: [PATCH 1/3] updates for new version of Karaf

see http://mail-archives.apache.org/mod_mbox/karaf-user/201805.mbox/%3C7bede6b9-d282-ddb5-52fc-dca74f698381@nanthrax.net%3E
---
 osgi-dependencies/templates/aet-features.xml | 21 +++++++++++---------
 vagrant/Vagrantfile                          |  6 ++++--
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/osgi-dependencies/templates/aet-features.xml b/osgi-dependencies/templates/aet-features.xml
index 9c25fd360..0e62e3f29 100644
--- a/osgi-dependencies/templates/aet-features.xml
+++ b/osgi-dependencies/templates/aet-features.xml
@@ -23,6 +23,8 @@
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.3.0 http://karaf.apache.org/xmlns/features/v1.3.0">
 
+    <!-- older version of spring required for ActiveMQ -->
+    <repository>mvn:org.apache.karaf.features/spring-legacy/4.2.0/xml/features</repository>
     <repository>mvn:org.apache.activemq/activemq-karaf/5.15.2/xml/features</repository>
     <repository>mvn:org.apache.cxf.karaf/apache-cxf/3.2.0/xml/features</repository>
 
@@ -36,7 +38,8 @@
     </feature>
 
     <feature name="aet-activemq" version="0.6.0" description="Active MQ for AET" install="auto">
-        <feature dependency="true" >activemq-client</feature>
+        <feature>aries-blueprint</feature>
+        <feature>activemq-client</feature>
     </feature>
 
     <feature name="aet-crypto" version="0.6.0" description="Cryptography libraries for AET" install="auto">
@@ -137,14 +140,14 @@
 
     <feature name="aet-bundles" version="0.6.0" description="AET Bundles" install="auto">
 
-        <feature dependency="true" prerequisite="true">aet-scr-and-war</feature>
-        <feature dependency="true" prerequisite="true">aet-cxf</feature>
-        <feature dependency="true" prerequisite="true">aet-activemq</feature>
-        <feature dependency="true" prerequisite="true">aet-crypto</feature>
-        <feature dependency="true" prerequisite="true">aet-apache-commons</feature>
-        <feature dependency="true" prerequisite="true">aet-guice</feature>
-        <feature dependency="true" prerequisite="true">aet-jackson</feature>
-        <feature dependency="true" prerequisite="true">aet-dependencies</feature>
+        <feature>aet-scr-and-war</feature>
+        <feature>aet-cxf</feature>
+        <feature>aet-activemq</feature>
+        <feature>aet-crypto</feature>
+        <feature>aet-apache-commons</feature>
+        <feature>aet-guice</feature>
+        <feature>aet-jackson</feature>
+        <feature>aet-dependencies</feature>
 
         <bundle>file:./../aet_bundles/current/com.cognifide.aet.communication-api-${project.version}.jar</bundle>
         <bundle>file:./../aet_bundles/current/com.cognifide.aet.datastorage-api-${project.version}.jar</bundle>
diff --git a/vagrant/Vagrantfile b/vagrant/Vagrantfile
index 7fe1dace5..b3a84383f 100644
--- a/vagrant/Vagrantfile
+++ b/vagrant/Vagrantfile
@@ -24,7 +24,7 @@
 ENV["GEM_PATH"] = nil
 ENV["GEM_HOME"] = nil
 
-AET_VERSION = '2.1.5'
+AET_VERSION = '2.1.6-SNAPSHOT'
 
 VAGRANTFILE_API_VERSION = '2'
 
@@ -86,8 +86,10 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
         }
       },
       "aet" => {
+        "base_link" => "https://www.kubiczak.pl/aet",
         "karaf" => {
-          "java_max_mem" => "3072M",
+          "source" => "https://archive.apache.org/dist/karaf/4.2.0/apache-karaf-4.2.0.tar.gz",
+          "java_max_mem" => "4096M",
           "enable_debug" => true
         },
         "version" => AET_VERSION

From c0ea925ff8380cfa4551fff764c07ec81148644c Mon Sep 17 00:00:00 2001
From: Wiiitek <kubiczak.jakub@gmail.com>
Date: Mon, 4 Jun 2018 18:13:47 +0200
Subject: [PATCH 2/3] changelog update

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 260a9b401..667a4c864 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,8 +10,9 @@ All notable changes to AET will be documented in this file.
 ## Unreleased
 **List of changes that are finished but not yet released in any final version.**
 
-## Version 2.1.5
+- [PR-260](https://github.com/Cognifide/aet/pull/260) Upgrade to Karaf 4.2.0
 
+## Version 2.1.5
 
 - [PR-252](https://github.com/Cognifide/aet/pull/252) Bug fix for JS Error table
 - [PR-244](https://github.com/Cognifide/aet/pull/244) Side panel scrolled automatically when navigating under specific test/url on first application load.

From 2184f956727f15b7234820520fa1f062e1009447 Mon Sep 17 00:00:00 2001
From: Wiiitek <kubiczak.jakub@gmail.com>
Date: Sat, 16 Jun 2018 12:00:24 +0200
Subject: [PATCH 3/3] less changes for pull request

---
 CHANGELOG.md        | 1 +
 vagrant/Vagrantfile | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 58e16128c..aecae0c69 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ All notable changes to AET will be documented in this file.
 - [PR-260](https://github.com/Cognifide/aet/pull/260) Upgrade to Karaf 4.2.0
 - [PR-261](https://github.com/Cognifide/aet/pull/261) AET artifacts folders watched for new files
 
+
 ## Version 2.1.5
 
 - [PR-252](https://github.com/Cognifide/aet/pull/252) Bug fix for JS Error table
diff --git a/vagrant/Vagrantfile b/vagrant/Vagrantfile
index c4a6861fd..570e627c8 100644
--- a/vagrant/Vagrantfile
+++ b/vagrant/Vagrantfile
@@ -89,7 +89,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
         "base_link" => "https://www.kubiczak.pl/aet",
         "karaf" => {
           "source" => "https://archive.apache.org/dist/karaf/4.2.0/apache-karaf-4.2.0.tar.gz",
-          "java_max_mem" => "4096M",
+          "java_max_mem" => "3072M",
           "enable_debug" => true
         },
         "version" => AET_VERSION