You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ks...@apache.org on 2014/07/28 22:52:37 UTC
[1/2] git commit: SM-2345: Upgrade to ActiveMQ 5.9.1
Repository: servicemix
Updated Branches:
refs/heads/servicemix-5.0.x 991f33895 -> ed81ccb8a
SM-2345: Upgrade to ActiveMQ 5.9.1
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/7d0d89b6
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/7d0d89b6
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/7d0d89b6
Branch: refs/heads/servicemix-5.0.x
Commit: 7d0d89b6104284bd226466382cdb26dc945650f8
Parents: 991f338
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Mon Jul 28 22:20:14 2014 +0200
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Mon Jul 28 22:20:14 2014 +0200
----------------------------------------------------------------------
activemq/activemq-camel/pom.xml | 2 +-
activemq/activemq-service/pom.xml | 2 +-
assembly/pom.xml | 1 +
.../main/filtered-resources/etc/org.apache.karaf.features.cfg | 2 +-
assembly/src/main/filtered-resources/features.xml | 1 +
assembly/src/main/filtered-resources/internal.xml | 5 +++++
parent/pom.xml | 6 +++---
pom.xml | 4 ++--
8 files changed, 15 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/7d0d89b6/activemq/activemq-camel/pom.xml
----------------------------------------------------------------------
diff --git a/activemq/activemq-camel/pom.xml b/activemq/activemq-camel/pom.xml
index 758f8f5..ef543c4 100644
--- a/activemq/activemq-camel/pom.xml
+++ b/activemq/activemq-camel/pom.xml
@@ -35,7 +35,7 @@
<dependencies>
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-osgi</artifactId>
+ <artifactId>activemq-camel</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/7d0d89b6/activemq/activemq-service/pom.xml
----------------------------------------------------------------------
diff --git a/activemq/activemq-service/pom.xml b/activemq/activemq-service/pom.xml
index af7d0c6..628b735 100644
--- a/activemq/activemq-service/pom.xml
+++ b/activemq/activemq-service/pom.xml
@@ -34,7 +34,7 @@
<dependencies>
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-osgi</artifactId>
+ <artifactId>activemq-camel</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/7d0d89b6/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index f677d10..cf82736 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -153,6 +153,7 @@
<descriptor>file:${basedir}/target/classes/examples.xml</descriptor>
</descriptors>
<features>
+ <feature>joda-time</feature>
<feature>cxf</feature>
<feature>obr</feature>
<feature>config</feature>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/7d0d89b6/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
----------------------------------------------------------------------
diff --git a/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg b/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
index 3ae6292..c9f5b8f 100644
--- a/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
+++ b/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
@@ -30,7 +30,7 @@ featuresRepositories=mvn:org.apache.karaf.assemblies.features/standard/${karaf.v
#
# Comma separated list of features to install at startup
#
-featuresBoot=config,kar,ssh,management,eventadmin,activemq-broker-noweb,jaxrs-api,activemq-camel,camel-cxf,camel-blueprint,activemq-service,war
+featuresBoot=config,kar,ssh,management,joda-time,eventadmin,activemq-broker-noweb,jaxrs-api,activemq-camel,camel-cxf,camel-blueprint,activemq-service,war
#
# Defines if the boot features are started in asynchronous mode (in a dedicated thread)
http://git-wip-us.apache.org/repos/asf/servicemix/blob/7d0d89b6/assembly/src/main/filtered-resources/features.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/filtered-resources/features.xml b/assembly/src/main/filtered-resources/features.xml
index 3ebfd2b..3950903 100644
--- a/assembly/src/main/filtered-resources/features.xml
+++ b/assembly/src/main/filtered-resources/features.xml
@@ -24,6 +24,7 @@
<feature name="activemq-service" version="${version}" resolver="(obr)" start-level="50">
<feature version="${activemq.version}">activemq-broker-noweb</feature>
+ <feature version="${activemq.version}">activemq-camel</feature>
<bundle>mvn:org.apache.servicemix.activemq/org.apache.servicemix.activemq.service/${version}</bundle>
<bundle>mvn:org.apache.servicemix.activemq/org.apache.servicemix.activemq.camel/${version}</bundle>
</feature>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/7d0d89b6/assembly/src/main/filtered-resources/internal.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/filtered-resources/internal.xml b/assembly/src/main/filtered-resources/internal.xml
index 6c81d1d..76da7fe 100644
--- a/assembly/src/main/filtered-resources/internal.xml
+++ b/assembly/src/main/filtered-resources/internal.xml
@@ -26,4 +26,9 @@
<bundle start-level='10'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr339-api-m10/${servicemix.specs.version}</bundle>
</feature>
+ <!-- workaround for SM-2301 -->
+ <feature name="joda-time">
+ <bundle start-level='10'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.joda-time/${jodatime.bundle.version}</bundle>
+ </feature>
+
</features>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/7d0d89b6/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 528f06f..8a0eb6d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -37,7 +37,7 @@
<!-- Properties -->
<properties>
- <activemq.version>5.9.0</activemq.version>
+ <activemq.version>5.9.1</activemq.version>
<activiti.version>5.15.1</activiti.version>
<camel.version>2.12.4</camel.version>
<cxf.version>2.7.11</cxf.version>
@@ -55,7 +55,7 @@
<fasterxml.jackson.version>2.2.1</fasterxml.jackson.version>
<typesafe-config.version>1.0.2</typesafe-config.version>
<mvel2.version>2.1.7.Final</mvel2.version>
- <mybatis.version>3.2.5</mybatis.version>
+ <mybatis.version>3.2.7</mybatis.version>
<jodatime.bundle.version>2.3_1</jodatime.bundle.version>
<jpa.version>1.0.1</jpa.version>
@@ -106,7 +106,7 @@
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-osgi</artifactId>
+ <artifactId>activemq-camel</artifactId>
<version>${activemq.version}</version>
</dependency>
<!-- Activiti-->
http://git-wip-us.apache.org/repos/asf/servicemix/blob/7d0d89b6/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 264f4f8..711f67b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,7 +86,7 @@
<jaxb.api.version>2.2</jaxb.api.version>
<osgi.version>4.3.1</osgi.version>
<scala.bundle.version>2.10.2_1</scala.bundle.version>
- <wsdl4j.bundle.version>1.6.2_3</wsdl4j.bundle.version>
+ <wsdl4j.bundle.version>1.6.2_6</wsdl4j.bundle.version>
<swagger.bundle.version>1.3.0_1</swagger.bundle.version>
<javassist.bundle.version>3.12.1.GA_2</javassist.bundle.version>
<reflections.bundle.version>0.9.8_1</reflections.bundle.version>
@@ -130,7 +130,7 @@
<postgresql.version>9.1-901</postgresql.version>
<slf4j.version>1.7.5</slf4j.version>
<spring.version>3.2.4.RELEASE</spring.version>
- <wss4j.version>1.6.7</wss4j.version>
+ <wss4j.version>1.6.15</wss4j.version>
</properties>
<pluginRepositories>
[2/2] git commit: SM-2356: ActiveMQ web console not installable after
upgrade to 5.9.1
Posted by ks...@apache.org.
SM-2356: ActiveMQ web console not installable after upgrade to 5.9.1
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/ed81ccb8
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/ed81ccb8
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/ed81ccb8
Branch: refs/heads/servicemix-5.0.x
Commit: ed81ccb8a6dd1b5c4888efdde6bfb661139fe304
Parents: 7d0d89b
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Mon Jul 28 22:28:20 2014 +0200
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Mon Jul 28 22:28:20 2014 +0200
----------------------------------------------------------------------
activemq/activemq-web/.gitignore | 2 +
activemq/activemq-web/pom.xml | 109 +++++++++++++++++++
activemq/pom.xml | 1 +
.../src/main/filtered-resources/internal.xml | 8 ++
parent/pom.xml | 6 +
5 files changed, 126 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/ed81ccb8/activemq/activemq-web/.gitignore
----------------------------------------------------------------------
diff --git a/activemq/activemq-web/.gitignore b/activemq/activemq-web/.gitignore
new file mode 100644
index 0000000..c1eab3c
--- /dev/null
+++ b/activemq/activemq-web/.gitignore
@@ -0,0 +1,2 @@
+overlays/
+dependency-reduced-pom.xml
http://git-wip-us.apache.org/repos/asf/servicemix/blob/ed81ccb8/activemq/activemq-web/pom.xml
----------------------------------------------------------------------
diff --git a/activemq/activemq-web/pom.xml b/activemq/activemq-web/pom.xml
new file mode 100644
index 0000000..5382183
--- /dev/null
+++ b/activemq/activemq-web/pom.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <artifactId>activemq</artifactId>
+ <groupId>org.apache.servicemix</groupId>
+ <version>5.0.4-SNAPSHOT</version>
+ </parent>
+
+
+ <groupId>org.apache.servicemix.activemq</groupId>
+ <artifactId>org.apache.servicemix.activemq.web</artifactId>
+ <packaging>war</packaging>
+ <name>Apache ServiceMix :: ActiveMQ :: Web Console</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-web-console</artifactId>
+ <type>war</type>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <outputFileNameMapping>@{artifactId}@-@{baseVersion}@@{dashClassifier?}@.@{extension}@</outputFileNameMapping>
+ <packagingExcludes>
+ WEB-INF/lib/jetty*.jar,
+ WEB-INF/lib/servlet*.jar
+ </packagingExcludes>
+ <archive>
+ <manifestFile>target/war/work/org.apache.activemq/activemq-web-console/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>cleanVersions</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>cleanVersions</goal>
+ </goals>
+ <configuration>
+ <versions>
+ <servicemix.osgi.version>${project.version}</servicemix.osgi.version>
+ </versions>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>2.3</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <transformers>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+ <manifestEntries>
+ <Bundle-Name>Apache ServiceMix :: ActiveMQ :: Web Console</Bundle-Name>
+ <Bundle-Version>${servicemix.osgi.version}</Bundle-Version>
+ <Bundle-Description>Web Console for ServiceMix</Bundle-Description>
+ <Bundle-SymbolicName>org.apache.servicemix.activemq.web</Bundle-SymbolicName>
+ <DynamicImport-Package>*</DynamicImport-Package>
+ </manifestEntries>
+ </transformer>
+ </transformers>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/ed81ccb8/activemq/pom.xml
----------------------------------------------------------------------
diff --git a/activemq/pom.xml b/activemq/pom.xml
index 131d1b9..8057b81 100644
--- a/activemq/pom.xml
+++ b/activemq/pom.xml
@@ -35,6 +35,7 @@
<modules>
<module>activemq-service</module>
<module>activemq-camel</module>
+ <module>activemq-web</module>
</modules>
</project>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/ed81ccb8/assembly/src/main/filtered-resources/internal.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/filtered-resources/internal.xml b/assembly/src/main/filtered-resources/internal.xml
index 76da7fe..f590419 100644
--- a/assembly/src/main/filtered-resources/internal.xml
+++ b/assembly/src/main/filtered-resources/internal.xml
@@ -31,4 +31,12 @@
<bundle start-level='10'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.joda-time/${jodatime.bundle.version}</bundle>
</feature>
+ <!-- workaround for SM-2356 -->
+ <feature name="activemq-web-console" version="${activemq.version}.SMX" resolver="(obr)" start-level="50">
+ <feature start-level="10">war</feature>
+ <feature start-level="10">eventadmin</feature>
+ <configfile finalname="/etc/org.apache.activemq.webconsole.cfg">mvn:org.apache.activemq/activemq-karaf/${activemq.version}/cfg/activemq-webconsole</configfile>
+ <bundle>mvn:org.apache.servicemix.activemq/org.apache.servicemix.activemq.web/${version}/war</bundle>
+ </feature>
+
</features>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/ed81ccb8/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 8a0eb6d..389d358 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -109,6 +109,12 @@
<artifactId>activemq-camel</artifactId>
<version>${activemq.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-web-console</artifactId>
+ <version>${activemq.version}</version>
+ <type>war</type>
+ </dependency>
<!-- Activiti-->
<dependency>
<groupId>org.activiti</groupId>