Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade to Karaf 4.2.0 #260

Merged
merged 4 commits into from
Jun 16, 2018
Merged

Upgrade to Karaf 4.2.0 #260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
47d8e64
updates for new version of Karaf
wiiitek Jun 4, 2018
c0ea925
changelog update
wiiitek Jun 4, 2018
f84613d
Merge branch 'master' into karaf-4.2.0
wiiitek Jun 16, 2018
2184f95
less changes for pull request
wiiitek Jun 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ 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.**

- [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


Expand Down
3 changes: 3 additions & 0 deletions osgi-dependencies/aet-features.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -36,6 +38,7 @@
</feature>

<feature name="aet-activemq" version="0.6.0" description="Active MQ for AET" install="auto">
<feature>aries-blueprint</feature>
<feature>activemq-client</feature>
</feature>

Expand Down
3 changes: 2 additions & 1 deletion vagrant/Vagrantfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
ENV["GEM_PATH"] = nil
ENV["GEM_HOME"] = nil

AET_VERSION = '2.1.6-artifacts-watched'
AET_VERSION = '2.1.6-new-karaf'

VAGRANTFILE_API_VERSION = '2'

Expand Down Expand Up @@ -88,6 +88,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
"aet" => {
"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" => "3072M",
"enable_debug" => true
},
Expand Down