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/06/13 22:39:53 UTC
[2/2] git commit: SM-2328 Upgrade to ActiveMQ 5.10.0
SM-2328 Upgrade to ActiveMQ 5.10.0
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/38825db0
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/38825db0
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/38825db0
Branch: refs/heads/servicemix-5.1.x
Commit: 38825db0a770cbe1eb55a0471b8f91a084a8f156
Parents: aebf7f2
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Thu Jun 12 20:56:11 2014 +0200
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Fri Jun 13 22:27:00 2014 +0200
----------------------------------------------------------------------
activemq/activemq-web/.gitignore | 2 -
activemq/activemq-web/pom.xml | 107 -------------------
activemq/pom.xml | 1 -
.../src/main/filtered-resources/internal.xml | 8 --
parent/pom.xml | 2 +-
5 files changed, 1 insertion(+), 119 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/38825db0/activemq/activemq-web/.gitignore
----------------------------------------------------------------------
diff --git a/activemq/activemq-web/.gitignore b/activemq/activemq-web/.gitignore
deleted file mode 100644
index c1eab3c..0000000
--- a/activemq/activemq-web/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-overlays/
-dependency-reduced-pom.xml
http://git-wip-us.apache.org/repos/asf/servicemix/blob/38825db0/activemq/activemq-web/pom.xml
----------------------------------------------------------------------
diff --git a/activemq/activemq-web/pom.xml b/activemq/activemq-web/pom.xml
deleted file mode 100644
index c27d6e1..0000000
--- a/activemq/activemq-web/pom.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?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.1.1-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/38825db0/activemq/pom.xml
----------------------------------------------------------------------
diff --git a/activemq/pom.xml b/activemq/pom.xml
index b714e77..2ca7be0 100644
--- a/activemq/pom.xml
+++ b/activemq/pom.xml
@@ -35,7 +35,6 @@
<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/38825db0/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 26ebbe6..76da7fe 100644
--- a/assembly/src/main/filtered-resources/internal.xml
+++ b/assembly/src/main/filtered-resources/internal.xml
@@ -31,12 +31,4 @@
<bundle start-level='10'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.joda-time/${jodatime.bundle.version}</bundle>
</feature>
- <!-- workaround for SM-2303 -->
- <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/38825db0/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 24174b3..05e5387 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -37,7 +37,7 @@
<!-- Properties -->
<properties>
- <activemq.version>5.9.1</activemq.version>
+ <activemq.version>5.10.0</activemq.version>
<activiti.version>5.15.1</activiti.version>
<camel.version>2.13.1</camel.version>
<cxf.version>2.7.11</cxf.version>