You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ha...@apache.org on 2014/03/20 18:44:31 UTC
[20/29] git commit: Remove sitemesh jar from assembly,
not needed anymore
Remove sitemesh jar from assembly, not needed anymore
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/91a262d1
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/91a262d1
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/91a262d1
Branch: refs/heads/activemq-5.9
Commit: 91a262d1446c71c9ea223c321e6936c3292a85e1
Parents: 52200d8
Author: Daniel Kulp <dk...@apache.org>
Authored: Mon Feb 3 14:37:46 2014 -0500
Committer: Hadrian Zbarcea <ha...@apache.org>
Committed: Thu Mar 20 13:11:55 2014 -0400
----------------------------------------------------------------------
assembly/pom.xml | 4 ----
assembly/src/main/descriptors/common-bin.xml | 3 ---
pom.xml | 6 ------
3 files changed, 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/91a262d1/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 3fcc8d1..304adae 100755
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -354,10 +354,6 @@
<artifactId>jcl-over-slf4j</artifactId>
</dependency>
<dependency>
- <groupId>opensymphony</groupId>
- <artifactId>sitemesh</artifactId>
- </dependency>
- <dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/activemq/blob/91a262d1/assembly/src/main/descriptors/common-bin.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/descriptors/common-bin.xml b/assembly/src/main/descriptors/common-bin.xml
index 4eb7381..e08078e 100644
--- a/assembly/src/main/descriptors/common-bin.xml
+++ b/assembly/src/main/descriptors/common-bin.xml
@@ -252,9 +252,6 @@
<include>org.mortbay.jetty:jsp-api-2.1-glassfish</include>
<include>org.eclipse.jdt:core</include>
- <!-- JSTL and other web stuff -->
- <include>opensymphony:sitemesh</include>
-
<!-- Atom/RSS support -->
<include>rome:rome</include>
<include>jdom:jdom</include>
http://git-wip-us.apache.org/repos/asf/activemq/blob/91a262d1/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b725a9a..02152bf 100755
--- a/pom.xml
+++ b/pom.xml
@@ -92,7 +92,6 @@
<log4j-version>1.2.17</log4j-version>
<mqtt-client-version>1.7</mqtt-client-version>
<openjpa-version>1.2.0</openjpa-version>
- <opensymphony-version>2.4.2</opensymphony-version>
<org-apache-derby-version>10.10.1.1</org-apache-derby-version>
<org.osgi.core-version>4.3.1</org.osgi.core-version>
<p2psockets-version>1.1.2</p2psockets-version>
@@ -1034,11 +1033,6 @@
<version>${slf4j-version}</version>
</dependency>
<dependency>
- <groupId>opensymphony</groupId>
- <artifactId>sitemesh</artifactId>
- <version>${opensymphony-version}</version>
- </dependency>
- <dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<version>${jstl-version}</version>