You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by sk...@apache.org on 2014/05/13 16:05:20 UTC
git commit: [OLINGO-266] pom maintenance
Repository: olingo-odata4
Updated Branches:
refs/heads/olingo-266-ref 7f1717411 -> a7301b210
[OLINGO-266] pom maintenance
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/a7301b21
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/a7301b21
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/a7301b21
Branch: refs/heads/olingo-266-ref
Commit: a7301b210f2a9f9876f1684c85b491ef432987dc
Parents: 7f17174
Author: Stephan Klevenz <st...@sap.com>
Authored: Tue May 13 16:05:00 2014 +0200
Committer: Stephan Klevenz <st...@sap.com>
Committed: Tue May 13 16:05:00 2014 +0200
----------------------------------------------------------------------
lib/server-core/pom.xml | 32 +++++++++-----------------------
lib/server-tecsvc/pom.xml | 5 -----
lib/server-test/pom.xml | 21 +++------------------
3 files changed, 12 insertions(+), 46 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/a7301b21/lib/server-core/pom.xml
----------------------------------------------------------------------
diff --git a/lib/server-core/pom.xml b/lib/server-core/pom.xml
index d04c5fc..f5e19f7 100644
--- a/lib/server-core/pom.xml
+++ b/lib/server-core/pom.xml
@@ -46,10 +46,17 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>org.antlr</groupId>
+ <artifactId>antlr4-runtime</artifactId>
+ </dependency>
+ <dependency>
<groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${servlet.version}</version>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
</dependency>
+
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -59,35 +66,14 @@
<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>
<version>${antlr.version}</version>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/a7301b21/lib/server-tecsvc/pom.xml
----------------------------------------------------------------------
diff --git a/lib/server-tecsvc/pom.xml b/lib/server-tecsvc/pom.xml
index cd345a4..99ca965 100644
--- a/lib/server-tecsvc/pom.xml
+++ b/lib/server-tecsvc/pom.xml
@@ -94,11 +94,6 @@
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<scope>runtime</scope>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/a7301b21/lib/server-test/pom.xml
----------------------------------------------------------------------
diff --git a/lib/server-test/pom.xml b/lib/server-test/pom.xml
index 865f75d..334bea5 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>
@@ -55,11 +57,6 @@
<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>
<scope>test</scope>
@@ -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>