aboutsummaryrefslogtreecommitdiff
path: root/id
diff options
context:
space:
mode:
Diffstat (limited to 'id')
-rw-r--r--id/pom.xml11
-rw-r--r--id/server/idserverlib/pom.xml11
2 files changed, 22 insertions, 0 deletions
diff --git a/id/pom.xml b/id/pom.xml
index 0753a7805..6b296e84a 100644
--- a/id/pom.xml
+++ b/id/pom.xml
@@ -77,5 +77,16 @@
</plugin>
</plugins>
</build>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>3.0.1</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
</project>
diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index ba06ce142..530e00d74 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -370,6 +370,12 @@
<artifactId>google-oauth-client-jetty</artifactId>
<version>1.19.0</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- TestNG -->
@@ -405,6 +411,11 @@
<artifactId>dti-process-engine-spring-web</artifactId>
<version>${com.datentechnik.process-engine.version}</version>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>