You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by jo...@apache.org on 2014/08/24 00:05:12 UTC
git commit: DELTASPIKE-696 Clean up cdictrl servlet pom.
Repository: deltaspike
Updated Branches:
refs/heads/master a9254ee54 -> 298de6f22
DELTASPIKE-696 Clean up cdictrl servlet pom.
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/298de6f2
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/298de6f2
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/298de6f2
Branch: refs/heads/master
Commit: 298de6f2251a1bfe36493c6821b7620955b664c8
Parents: a9254ee
Author: John D. Ament <jo...@apache.org>
Authored: Sat Aug 23 18:05:08 2014 -0400
Committer: John D. Ament <jo...@apache.org>
Committed: Sat Aug 23 18:05:08 2014 -0400
----------------------------------------------------------------------
deltaspike/cdictrl/servlet/pom.xml | 63 ++++++++-------------------------
1 file changed, 15 insertions(+), 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/298de6f2/deltaspike/cdictrl/servlet/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/cdictrl/servlet/pom.xml b/deltaspike/cdictrl/servlet/pom.xml
index a4b0efa..428801c 100644
--- a/deltaspike/cdictrl/servlet/pom.xml
+++ b/deltaspike/cdictrl/servlet/pom.xml
@@ -35,13 +35,14 @@
<jetty.version>8.1.9.v20130131</jetty.version>
<version.org.apache.tomcat>7.0.54</version.org.apache.tomcat>
<tomcat.home>${project.build.directory}/apache-tomcat-${version.org.apache.tomcat}</tomcat.home>
+ <httpclient.components.version>4.2.5</httpclient.components.version>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.2.5</version>
+ <version>${httpclient.components.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -50,44 +51,14 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>2.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.deltaspike.test</groupId>
- <artifactId>test-utils</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jcdi_1.0_spec</artifactId>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-library</artifactId>
- <version>1.3</version>
- <scope>test</scope>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
</dependency>
+ <!-- jetty test -->
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
@@ -100,35 +71,42 @@
<version>${jetty.version}</version>
<scope>test</scope>
</dependency>
+ <!-- tomcat test -->
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
<version>${version.org.apache.tomcat}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-logging-juli</artifactId>
<version>${version.org.apache.tomcat}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-jasper</artifactId>
<version>${version.org.apache.tomcat}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jasper</artifactId>
<version>${version.org.apache.tomcat}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jasper-el</artifactId>
<version>${version.org.apache.tomcat}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jsp-api</artifactId>
<version>${version.org.apache.tomcat}</version>
+ <scope>test</scope>
</dependency>
</dependencies>
<profiles>
@@ -160,6 +138,10 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-atinject_1.0_spec</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-impl</artifactId>
<scope>provided</scope>
@@ -177,19 +159,4 @@
</dependencies>
</profile>
</profiles>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</project>