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/127f82a4 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/127f82a4 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/127f82a4 Branch: refs/heads/trunk Commit: 127f82a4392caeec2913144a72a61f53c79d5625 Parents: cbc227c Author: Daniel Kulp <[email protected]> Authored: Mon Feb 3 14:37:46 2014 -0500 Committer: Daniel Kulp <[email protected]> Committed: Mon Feb 3 14:37:46 2014 -0500 ---------------------------------------------------------------------- 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/127f82a4/assembly/pom.xml ---------------------------------------------------------------------- diff --git a/assembly/pom.xml b/assembly/pom.xml index 96593b88..a25c085 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/127f82a4/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/127f82a4/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 474d00c..ec6b936 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> @@ -1040,11 +1039,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>
