ops / monitor-service · Commits

Go to a project

Authored by qinchao
Commit f07be1ab83bb10f6bb9ca33dae978a3ef5f49966 1 parent db9af97b

升级serverlet版本到3.1.0

Inline Side-by-side
Showing 8 changed files with 41 additions and 31 deletions
... ... @@ -135,8 +135,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
<artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
... ...
... ... @@ -44,8 +44,7 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
<artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
... ...
... ... @@ -96,9 +96,7 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
<scope>provided</scope>
<artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
... ...
... ... @@ -39,8 +39,7 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
<artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
... ...
... ... @@ -108,9 +108,7 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
<scope>provided</scope>
<artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
... ...
... ... @@ -45,7 +45,7 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
</dependencies>
... ...
... ... @@ -14,7 +14,7 @@
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet.jsp</groupId>
... ...
... ... @@ -27,12 +27,44 @@
<jackson-version>1.9.13</jackson-version>
<awsjavasdk.version>1.11.155</awsjavasdk.version>
<c3p0.version>0.9.1.2</c3p0.version>
<!-- web -->
<servlet-api-version>3.1.0</servlet-api-version>
<jsp-api-version>2.1</jsp-api-version>
<jstl-version>1.2</jstl-version>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>${servlet-api-version}</version>
<scope>provided</scope>
</dependency>
<!--<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
<scope>provided</scope>
</dependency>-->
<dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
<version>${jsp-api-version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<version>${jstl-version}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>16.0</version>
... ... @@ -59,18 +91,7 @@
<artifactId>snakeyaml</artifactId>
<version>${org.yaml-version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
<version>2.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
... ... @@ -86,11 +107,7 @@
<artifactId>activation</artifactId>
<version>1.1</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<version>1.2</version>
</dependency>
<dependency>
<groupId>monitor-service</groupId>
<artifactId>monitor-service-cmdb</artifactId>
... ...