Author: snoopdave
Date: Tue Jun 11 11:59:19 2013
New Revision: 1491760
URL: http://svn.apache.org/r1491760
Log:
Removing redundant dependencies
Added:
roller/trunk/app/src/test/resources/themes/
roller/trunk/app/src/test/resources/themes/dummy.txt
roller/trunk/test-utils/src/test/
roller/trunk/test-utils/src/test/java/
roller/trunk/test-utils/src/test/java/org/
roller/trunk/test-utils/src/test/java/org/apache/
roller/trunk/test-utils/src/test/java/org/apache/roller/
roller/trunk/test-utils/src/test/java/org/apache/roller/util/
roller/trunk/test-utils/src/test/java/org/apache/roller/util/DummyTest.java
Modified:
roller/trunk/app/pom.xml
Modified: roller/trunk/app/pom.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/app/pom.xml?rev=1491760&r1=1491759&r2=1491760&view=diff
==============================================================================
--- roller/trunk/app/pom.xml (original)
+++ roller/trunk/app/pom.xml Tue Jun 11 11:59:19 2013
@@ -84,6 +84,12 @@
<groupId>org.apache.roller</groupId>
<artifactId>test-utils</artifactId>
<version>${roller.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>commons-lang</artifactId>
+ <groupId>commons-lang</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- OpenJPA deps -->
@@ -101,6 +107,14 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
</exclusion>
+ <exclusion>
+ <artifactId>commons-lang</artifactId>
+ <groupId>commons-lang</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>asm</artifactId>
+ <groupId>asm</groupId>
+ </exclusion>
</exclusions>
</dependency>
@@ -145,12 +159,6 @@
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.4</version>
- </dependency>
-
- <dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.2.1</version>
@@ -186,12 +194,28 @@
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
<version>1.7</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>commons-lang</artifactId>
+ <groupId>commons-lang</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.texen</groupId>
<artifactId>texen</artifactId>
<version>1.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>velocity</artifactId>
+ <groupId>velocity</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>commons-lang</artifactId>
+ <groupId>commons-lang</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -216,29 +240,47 @@
<groupId>org.apache.ws.commons.util</groupId>
<artifactId>ws-commons-util</artifactId>
<version>1.0.2</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>xml-apis</artifactId>
+ <groupId>xml-apis</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>net.oauth.core</groupId>
<artifactId>oauth</artifactId>
<scope>compile</scope>
- <version>20100601</version>
+ <version>20100527</version>
</dependency>
<dependency>
<groupId>net.oauth.core</groupId>
<artifactId>oauth-provider</artifactId>
<scope>compile</scope>
- <version>20100601</version>
+ <version>20100527</version>
</dependency>
<!-- web -->
+ <dependency>
+ <artifactId>servlet-api</artifactId>
+ <groupId>javax.servlet</groupId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-core</artifactId>
<version>2.3.12</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>asm</artifactId>
+ <groupId>asm</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- needed by Struts, except on JBoss -->
@@ -265,6 +307,10 @@
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
</exclusion>
+ <exclusion>
+ <artifactId>spring-web</artifactId>
+ <groupId>org.springframework</groupId>
+ </exclusion>
</exclusions>
</dependency>
@@ -284,6 +330,12 @@
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-jsp</artifactId>
<version>2.0.6</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>commons-beanutils</artifactId>
+ <groupId>commons-beanutils</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -324,6 +376,18 @@
<artifactId>servlet-api</artifactId>
<groupId>javax.servlet</groupId>
</exclusion>
+ <exclusion>
+ <artifactId>commons-beanutils</artifactId>
+ <groupId>commons-beanutils</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>commons-lang</artifactId>
+ <groupId>commons-lang</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>commons-codec</artifactId>
+ <groupId>commons-codec</groupId>
+ </exclusion>
</exclusions>
</dependency>
@@ -357,6 +421,12 @@
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId>
<version>2.0.7.RELEASE</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>commons-codec</artifactId>
+ <groupId>commons-codec</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -375,6 +445,12 @@
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-taglibs</artifactId>
<version>2.0.7.RELEASE</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>spring-web</artifactId>
+ <groupId>org.springframework</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -393,6 +469,12 @@
<groupId>org.springframework.ldap</groupId>
<artifactId>spring-ldap</artifactId>
<version>1.2</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>commons-lang</artifactId>
+ <groupId>commons-lang</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- OpenID deps -->
@@ -410,6 +492,10 @@
<groupId>jug</groupId>
<artifactId>jug</artifactId>
</exclusion>
+ <exclusion>
+ <artifactId>xml-apis</artifactId>
+ <groupId>xml-apis</groupId>
+ </exclusion>
</exclusions>
</dependency>
@@ -439,6 +525,10 @@
<groupId>com.google.code.guice</groupId>
<artifactId>guice</artifactId>
</exclusion>
+ <exclusion>
+ <artifactId>httpclient</artifactId>
+ <groupId>org.apache.httpcomponents</groupId>
+ </exclusion>
</exclusions>
</dependency>
@@ -458,6 +548,12 @@
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.9.1</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>xml-apis</artifactId>
+ <groupId>xml-apis</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- Java EE deps -->
@@ -494,6 +590,12 @@
<artifactId>jetty</artifactId>
<version>6.1.10</version>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>servlet-api-2.5</artifactId>
+ <groupId>org.mortbay.jetty</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -505,6 +607,10 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
+ <exclusion>
+ <artifactId>commons-codec</artifactId>
+ <groupId>commons-codec</groupId>
+ </exclusion>
</exclusions>
</dependency>
@@ -549,8 +655,49 @@
<artifactId>commons-validator</artifactId>
<version>1.3.1</version>
<type>jar</type>
+ <exclusions>
+ <exclusion>
+ <artifactId>commons-beanutils</artifactId>
+ <groupId>commons-beanutils</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>3.1</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>commons-codec</artifactId>
+ <groupId>commons-codec</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.7.0</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.6</version>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>3.3</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.5</version>
+ </dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>1.3.04</version>
</dependency>
-
</dependencies>
<build>
Added: roller/trunk/app/src/test/resources/themes/dummy.txt
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/test/resources/themes/dummy.txt?rev=1491760&view=auto
==============================================================================
(empty)
Added:
roller/trunk/test-utils/src/test/java/org/apache/roller/util/DummyTest.java
URL:
http://svn.apache.org/viewvc/roller/trunk/test-utils/src/test/java/org/apache/roller/util/DummyTest.java?rev=1491760&view=auto
==============================================================================
--- roller/trunk/test-utils/src/test/java/org/apache/roller/util/DummyTest.java
(added)
+++ roller/trunk/test-utils/src/test/java/org/apache/roller/util/DummyTest.java
Tue Jun 11 11:59:19 2013
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. 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. For additional information regarding
+ * copyright in this work, please see the NOTICE file in the top level
+ * directory of this distribution.
+ */
+package org.apache.roller.util;
+
+import junit.framework.TestCase;
+
+public class DummyTest extends TestCase {
+
+ public void testNothing() throws Exception {
+ }
+}
