From 089a3123073a605b14d107c72b71ad63117bf7f6 Mon Sep 17 00:00:00 2001
From: Stephan Klevenz <stephan.klevenz@sap.com>
Date: Tue, 13 May 2014 16:05:00 +0200
Subject: [PATCH] [OLINGO-266] pom maintenance

---
 lib/server-core/pom.xml   | 34 ++++++++++------------------------
 lib/server-tecsvc/pom.xml |  5 -----
 lib/server-test/pom.xml   | 21 +++------------------
 3 files changed, 13 insertions(+), 47 deletions(-)

diff --git a/lib/server-core/pom.xml b/lib/server-core/pom.xml
index d04c5fc28..f5e19f770 100644
--- a/lib/server-core/pom.xml
+++ b/lib/server-core/pom.xml
@@ -46,10 +46,17 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-      <version>${servlet.version}</version>
+      <groupId>org.antlr</groupId>
+      <artifactId>antlr4-runtime</artifactId>
     </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.5</version>
+      <scope>provided</scope>
+    </dependency>
+
+
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -58,35 +65,14 @@
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.antlr</groupId>
-      <artifactId>antlr4-runtime</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
-      <scope>test</scope>
     </dependency>
   </dependencies>
 
   <build>
     <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <configuration>
-          <skip>false</skip>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.antlr</groupId>
         <artifactId>antlr4-maven-plugin</artifactId>
diff --git a/lib/server-tecsvc/pom.xml b/lib/server-tecsvc/pom.xml
index cd345a474..99ca96569 100644
--- a/lib/server-tecsvc/pom.xml
+++ b/lib/server-tecsvc/pom.xml
@@ -93,11 +93,6 @@
       <scope>runtime</scope>
     </dependency>
 
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <scope>runtime</scope>
-    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
diff --git a/lib/server-test/pom.xml b/lib/server-test/pom.xml
index 865f75d91..334bea5a0 100644
--- a/lib/server-test/pom.xml
+++ b/lib/server-test/pom.xml
@@ -39,13 +39,15 @@
       <groupId>org.apache.olingo</groupId>
       <artifactId>olingo-server-core</artifactId>
       <version>${project.version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.olingo</groupId>
       <artifactId>olingo-server-tecsvc</artifactId>
       <version>${project.version}</version>
-<!--       <type>jar</type> -->
+      <scope>test</scope>
     </dependency>
+
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -54,11 +56,6 @@
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
     </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
@@ -71,16 +68,4 @@
     </dependency>
   </dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <configuration>
-          <skip>false</skip>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
 </project>