[camel] branch master updated: Upgrade Freemarker to version 2.3.28

[pa...@apache.org]

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

pascalschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new 6217ba0  Upgrade Freemarker to version 2.3.28
6217ba0 is described below

commit 6217ba02eb8fab1bea2a7252aa00a1d659c0ea3e
Author: Pascal Schumacher <pa...@gmx.net>
AuthorDate: Tue May 1 11:07:55 2018 +0200

    Upgrade Freemarker to version 2.3.28
    
    Recent Freemarker versions are OSGI bundles, therefore remove usage of the Freemarker Service Mix Bundle.
---
 parent/pom.xml                                           | 3 +--
 platforms/karaf/features/src/main/resources/features.xml | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 41105a4..6cc4b05 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -235,8 +235,7 @@
     <fop-bundle-version>2.2_1</fop-bundle-version>
     <fop-version>2.2</fop-version>
     <ftpserver-version>1.1.1</ftpserver-version>
-    <freemarker-bundle-version>2.3.23_1</freemarker-bundle-version>
-    <freemarker-version>2.3.23</freemarker-version>
+    <freemarker-version>2.3.28</freemarker-version>
     <generex-bundle-version>1.0.1_2</generex-bundle-version>
     <gentlyweb-bundle-version>1.5_1</gentlyweb-bundle-version>
     <geocoder-java-version>0.16</geocoder-java-version>
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 97ab154..d17b3db 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -722,7 +722,7 @@
   </feature>
   <feature name='camel-freemarker' version='${project.version}' resolver='(obr)' start-level='50'>
     <feature version='${project.version}'>camel-core</feature>
-    <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.freemarker/${freemarker-bundle-version}</bundle>
+    <bundle dependency='true'>mvn:org.freemarker/freemarker/${freemarker-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-freemarker/${project.version}</bundle>
   </feature>
   <feature name='camel-ftp' version='${project.version}' resolver='(obr)' start-level='50'>

-- 
To stop receiving notification emails like this one, please contact
pascalschumacher@apache.org.