Author: tabish
Date: Fri Sep 14 10:18:34 2012
New Revision: 1384713
URL: http://svn.apache.org/viewvc?rev=1384713&view=rev
Log:
Polish: don't need to specify versions of the plugins that are managed by our
parent pom.
Modified:
activemq/trunk/activemq-blueprint/pom.xml
activemq/trunk/activemq-karaf/pom.xml
activemq/trunk/activemq-openwire-generator/pom.xml
activemq/trunk/activemq-optional/pom.xml
activemq/trunk/activemq-spring/pom.xml
activemq/trunk/activemq-web-console/pom.xml
activemq/trunk/kahadb/pom.xml
Modified: activemq/trunk/activemq-blueprint/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-blueprint/pom.xml?rev=1384713&r1=1384712&r2=1384713&view=diff
==============================================================================
--- activemq/trunk/activemq-blueprint/pom.xml (original)
+++ activemq/trunk/activemq-blueprint/pom.xml Fri Sep 14 10:18:34 2012
@@ -68,7 +68,6 @@
</plugin>
<plugin>
<artifactId>maven-install-plugin</artifactId>
- <version>${maven-install-plugin-version}</version>
</plugin>
</plugins>
</build>
Modified: activemq/trunk/activemq-karaf/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-karaf/pom.xml?rev=1384713&r1=1384712&r2=1384713&view=diff
==============================================================================
--- activemq/trunk/activemq-karaf/pom.xml (original)
+++ activemq/trunk/activemq-karaf/pom.xml Fri Sep 14 10:18:34 2012
@@ -6,9 +6,9 @@
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.
@@ -16,7 +16,7 @@
limitations under the License.
-->
<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/maven-v4_0_0.xsd";>
-
+
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -29,7 +29,7 @@
<packaging>bundle</packaging>
<name>ActiveMQ :: Apache Karaf</name>
<description>Provides resources for running ActiveMQ in Apache
Karaf</description>
-
+
<properties>
<xpp3-bundle-version>1.1.4c_5</xpp3-bundle-version>
<jodatime-bundle-version>1.6.2</jodatime-bundle-version>
@@ -76,87 +76,68 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>${slf4j-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j-version}</version>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
<version>1.0.0</version>
</dependency>
-
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.bundlerepository</artifactId>
<version>1.2.1</version>
</dependency>
-
<dependency>
<groupId>org.apache.karaf.tooling</groupId>
<artifactId>org.apache.karaf.tooling.testing</artifactId>
<version>${karaf-version}</version>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.apache.karaf.features</groupId>
<artifactId>org.apache.karaf.features.command</artifactId>
<version>${karaf-version}</version>
<scope>test</scope>
</dependency>
-
- <dependency>
- <groupId>org.apache.karaf.shell</groupId>
- <artifactId>org.apache.karaf.shell.console</artifactId>
- <version>${karaf-version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-optional</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-console</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-pool</artifactId>
- </dependency>
-
+ <dependency>
+ <groupId>org.apache.karaf.shell</groupId>
+ <artifactId>org.apache.karaf.shell.console</artifactId>
+ <version>${karaf-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-optional</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-console</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-pool</artifactId>
+ </dependency>
<!-- used for testing -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
-
-
-
-
-
- </dependencies>
-
+ </dependencies>
<build>
<resources>
<resource>
@@ -227,5 +208,4 @@
</plugin>
</plugins>
</build>
-
</project>
Modified: activemq/trunk/activemq-openwire-generator/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-openwire-generator/pom.xml?rev=1384713&r1=1384712&r2=1384713&view=diff
==============================================================================
--- activemq/trunk/activemq-openwire-generator/pom.xml (original)
+++ activemq/trunk/activemq-openwire-generator/pom.xml Fri Sep 14 10:18:34 2012
@@ -6,9 +6,9 @@
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.
@@ -16,7 +16,7 @@
limitations under the License.
-->
<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/maven-v4_0_0.xsd";>
-
+
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -43,7 +43,6 @@
<dependency>
<groupId>annogen</groupId>
<artifactId>annogen</artifactId>
- <version>0.1.0</version>
</dependency>
<dependency>
<groupId>ant</groupId>
@@ -51,7 +50,7 @@
<version>1.6.2</version>
</dependency>
</dependencies>
-
+
<profiles>
<profile>
<id>default-tools.jar</id>
@@ -72,7 +71,7 @@
</dependencies>
</profile>
</profiles>
-
+
<build>
<plugins>
<plugin>
Modified: activemq/trunk/activemq-optional/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/pom.xml?rev=1384713&r1=1384712&r2=1384713&view=diff
==============================================================================
--- activemq/trunk/activemq-optional/pom.xml (original)
+++ activemq/trunk/activemq-optional/pom.xml Fri Sep 14 10:18:34 2012
@@ -49,22 +49,18 @@
<groupId>${project.groupId}</groupId>
<artifactId>activemq-console</artifactId>
</dependency>
-
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>${spring-version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jms</artifactId>
- <version>${spring-version}</version>
</dependency>
<dependency>
<groupId>aopalliance</groupId>
<artifactId>aopalliance</artifactId>
</dependency>
-
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
@@ -73,7 +69,6 @@
<groupId>xpp3</groupId>
<artifactId>xpp3</artifactId>
</dependency>
-
<dependency>
<groupId>org.eclipse.jetty.aggregate</groupId>
<artifactId>jetty-all-server</artifactId>
@@ -88,41 +83,33 @@
<artifactId>jetty-websocket</artifactId>
<version>${jetty-version}</version>
</dependency>
-
<dependency>
<groupId>axis</groupId>
<artifactId>axis</artifactId>
<optional>true</optional>
</dependency>
-
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>${httpclient-version}</version>
</dependency>
-
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
</dependency>
-
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
</dependency>
-
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>compile</scope>
</dependency>
-
<dependency>
<groupId>org.apache.xmlbeans</groupId>
<artifactId>xmlbeans</artifactId>
@@ -133,11 +120,11 @@
<artifactId>xmlbeans-xpath</artifactId>
<optional>true</optional>
<exclusions>
- <exclusion>
- <groupId>net.sf.saxon</groupId>
- <artifactId>saxon</artifactId>
- </exclusion>
- </exclusions>
+ <exclusion>
+ <groupId>net.sf.saxon</groupId>
+ <artifactId>saxon</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>net.sf.saxon</groupId>
@@ -151,13 +138,11 @@
<version>${xerces-version}</version>
<optional>true</optional>
</dependency>
-
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
<optional>true</optional>
</dependency>
-
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
@@ -184,7 +169,6 @@
<artifactId>jettison</artifactId>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
@@ -193,15 +177,14 @@
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.josql</artifactId>
</dependency>
-<!--
- TODO: Not needed, but OSGi bundle on the way:
https://issues.apache.org/jira/browse/SMX4-1238
+<!--
+ TODO: Not needed, but OSGi bundle on the way:
https://issues.apache.org/jira/browse/SMX4-1238
<dependency>
<groupId>net.sf.josql</groupId>
<artifactId>gentlyweb-utils</artifactId>
<version>1.5</version>
</dependency>
-->
-
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-java</artifactId>
@@ -220,9 +203,7 @@
<version>2.21.0</version>
<scope>test</scope>
</dependency>
-
</dependencies>
-
<build>
<plugins>
<plugin>
@@ -269,8 +250,6 @@
<configuration>
</configuration>
</plugin>
-
</plugins>
</build>
-
</project>
Modified: activemq/trunk/activemq-spring/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-spring/pom.xml?rev=1384713&r1=1384712&r2=1384713&view=diff
==============================================================================
--- activemq/trunk/activemq-spring/pom.xml (original)
+++ activemq/trunk/activemq-spring/pom.xml Fri Sep 14 10:18:34 2012
@@ -86,7 +86,6 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
- <version>${spring-version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
Modified: activemq/trunk/activemq-web-console/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/pom.xml?rev=1384713&r1=1384712&r2=1384713&view=diff
==============================================================================
--- activemq/trunk/activemq-web-console/pom.xml (original)
+++ activemq/trunk/activemq-web-console/pom.xml Fri Sep 14 10:18:34 2012
@@ -6,9 +6,9 @@
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.
@@ -29,13 +29,12 @@
<packaging>war</packaging>
<name>ActiveMQ :: Web Console</name>
<description>Web Console for ActiveMQ</description>
-
+
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>2.1.1</version>
<configuration>
<outputFileNameMapping>@{artifactId}@-@{baseVersion}@@{dashClassifier?}@.@{extension}@</outputFileNameMapping>
<packagingExcludes>
@@ -44,7 +43,7 @@
</packagingExcludes>
<archive>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
+ </archive>
</configuration>
</plugin>
<plugin>
@@ -121,28 +120,28 @@
<Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
<Embed-Transitive>true</Embed-Transitive>
<Import-Package>
- org.xml.sax,
- org.xml.sax.helpers,
- javax.xml.parsers,
- javax.xml.transform,
- javax.management.remote,
- javax.naming,
- org.w3c.dom,
- javax.servlet,
+ org.xml.sax,
+ org.xml.sax.helpers,
+ javax.xml.parsers,
+ javax.xml.transform,
+ javax.management.remote,
+ javax.naming,
+ org.w3c.dom,
+ javax.servlet,
javax.servlet.http,
javax.servlet.resources,
- javax.servlet.jsp,
- javax.servlet.jsp.tagext,
- javax.servlet.jsp.el,
- javax.management,
- javax.management.openmbean,
- javax.net,
-
org.apache.commons.logging;version="[1.1,2)";resolution:=optional,
-
org.slf4j;version="[1.5,2)";resolution:=optional,
-
org.slf4j.spi;version="[1.5,2)";resolution:=optional,
-
org.apache.log4j;version="[1.2.14,2)";resolution:=optional,
-
org.apache.log4j.spi;version="[1.2.14,2)";resolution:=optional,
- </Import-Package>
+ javax.servlet.jsp,
+ javax.servlet.jsp.tagext,
+ javax.servlet.jsp.el,
+ javax.management,
+ javax.management.openmbean,
+ javax.net,
+
org.apache.commons.logging;version="[1.1,2)";resolution:=optional,
+ org.slf4j;version="[1.5,2)";resolution:=optional,
+ org.slf4j.spi;version="[1.5,2)";resolution:=optional,
+ org.apache.log4j;version="[1.2.14,2)";resolution:=optional,
+
org.apache.log4j.spi;version="[1.2.14,2)";resolution:=optional,
+ </Import-Package>
</instructions>
</configuration>
</plugin>
@@ -156,7 +155,7 @@
<artifactId>geronimo-servlet_2.5_spec</artifactId>
<scope>provided</scope>
</dependency>
-
+
<!-- j2ee jars -->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -238,7 +237,7 @@
<artifactId>core</artifactId>
<version>3.1.1</version>
</dependency>
-
+
<!-- enable commons-logging when inside jetty6:run -->
<!--
<dependency>
@@ -273,7 +272,7 @@
<groupId>opensymphony</groupId>
<artifactId>sitemesh</artifactId>
</dependency>
-
+
<!-- JSTL support -->
<dependency>
<groupId>javax.servlet</groupId>
Modified: activemq/trunk/kahadb/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/trunk/kahadb/pom.xml?rev=1384713&r1=1384712&r2=1384713&view=diff
==============================================================================
--- activemq/trunk/kahadb/pom.xml (original)
+++ activemq/trunk/kahadb/pom.xml Fri Sep 14 10:18:34 2012
@@ -6,9 +6,9 @@
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.
@@ -25,7 +25,6 @@
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.activemq</groupId>
<artifactId>kahadb</artifactId>
<packaging>bundle</packaging>
<name>ActiveMQ :: KahaDB</name>
@@ -39,13 +38,11 @@
org.apache.kahadb*;version=${project.version};-noimport:=true
</activemq.osgi.export>
</properties>
-
<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
-
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
@@ -57,36 +54,14 @@
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
-
</dependencies>
-
-
<build>
<plugins>
- <!--
- <plugin>
- <groupId>org.apache.xbean</groupId>
- <artifactId>maven-xbean-plugin</artifactId>
- <version>3.4</version>
- <executions>
- <execution>
- <configuration>
- <strictXsdOrder>false</strictXsdOrder>
- <namespace>http://activemq.apache.org/schema/kahadb</namespace>
- </configuration>
- <goals>
- <goal>mapping</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
@@ -102,14 +77,12 @@
<childDelegation>false</childDelegation>
<useFile>true</useFile>
<argLine>-Xmx512M</argLine>
-
- <systemProperties>
+ <systemProperties>
<property>
<name>org.apache.activemq.default.directory.prefix</name>
<value>target/</value>
</property>
</systemProperties>
-
<includes>
<include>**/*Test.*</include>
</includes>
