diff options
| author |   sonicke <10112215@zte.com.cn> | 2019-07-19 16:55:50 +0800 |
|---|---|---|
| committer | sonicke <10112215@zte.com.cn> | 2019-07-19 16:55:50 +0800 |
| commit | fe0419ddd4bfaa45397b8610131d3569a999c016 (patch) | |
| tree | 2510c608f4840d214fe62257991cc6dae3675a67 | |
| parent | 2d71c618f9c04d4f0819f0d7c93b5302d3177774 (diff) | |
Fix sfcDriver Jenkins job failureelalto
Issue-ID: VFC-1425
Change-Id: I12bedc8110b98f2c64bdecf98917b44afcbeb554
Signed-off-by: Zhuoyao Huang <10112215@zte.com.cn>
| -rw-r--r-- | zte/sfc-driver/plugin-standalone/src/main/assembly/conf/console.yml | 1 | ||||
| -rw-r--r-- | zte/sfc-driver/sfc-driver/pom.xml | 62 |
2 files changed, 50 insertions, 13 deletions
diff --git a/zte/sfc-driver/plugin-standalone/src/main/assembly/conf/console.yml b/zte/sfc-driver/plugin-standalone/src/main/assembly/conf/console.yml index ef194ff..6ff2664 100644 --- a/zte/sfc-driver/plugin-standalone/src/main/assembly/conf/console.yml +++ b/zte/sfc-driver/plugin-standalone/src/main/assembly/conf/console.yml @@ -55,6 +55,7 @@ logging: timeZone: UTC logFormat: "%-6level [%d{HH:mm:ss.SSS}] [%t] %logger{5} - %X{code} %msg %n" - type: file + maxFileSize: 100MB threshold: INFO logFormat: "%-6level [%d{HH:mm:ss.SSS}] [%t] %logger{5} - %X{code} %msg %n" currentLogFilename: ./logs/application.log diff --git a/zte/sfc-driver/sfc-driver/pom.xml b/zte/sfc-driver/sfc-driver/pom.xml index bbd7e46..41d01d2 100644 --- a/zte/sfc-driver/sfc-driver/pom.xml +++ b/zte/sfc-driver/sfc-driver/pom.xml @@ -29,10 +29,10 @@ <packaging>jar</packaging> <version>1.3.0-SNAPSHOT</version> <properties> - <dropwizard.version>0.8.0</dropwizard.version> - <jetty.version>9.4.17.v20190418</jetty.version> - <jackson-version>2.5.1</jackson-version> - <jersey.version>2.16</jersey.version> + <dropwizard.version>1.3.9</dropwizard.version> + <jetty.version>9.4.18.v20190429</jetty.version> + <jackson-version>2.5.1</jackson-version> + <jersey.version>2.22.2</jersey.version> <swagger.version>1.5.3</swagger.version> <junit.version>4.11</junit.version> <powermock.version>1.6.6</powermock.version> @@ -41,13 +41,14 @@ <dependencyManagement> <dependencies> - <dependency> + +<!-- <dependency> <groupId>org.glassfish.jersey.media</groupId> <artifactId>jersey-media-multipart</artifactId> <version>${jersey.version}</version> - </dependency> + </dependency>--> - <dependency> +<!-- <dependency> <groupId>org.glassfish.jersey.containers</groupId> <artifactId>jersey-container-servlet-core</artifactId> <version>${jersey.version}</version> @@ -67,13 +68,25 @@ <groupId>org.glassfish.jersey.core</groupId> <artifactId>jersey-common</artifactId> <version>2.16</version> - </dependency> + </dependency>--> - <dependency> +<!-- <dependency> <groupId>com.fasterxml.jackson.dataformat</groupId> <artifactId>jackson-dataformat-xml</artifactId> <version>${jackson-version}</version> - </dependency> + </dependency>--> + +<!-- <dependency> + <groupId>org.glassfish.jersey.containers</groupId> + <artifactId>jersey-container-servlet-core</artifactId> + <version>${jersey.version}</version> + </dependency> + + <dependency> + <groupId>org.glassfish.jersey.core</groupId> + <artifactId>jersey-common</artifactId> + <version>${jersey.version}</version> + </dependency>--> <dependency> <groupId>org.codehaus.jackson</groupId> @@ -81,16 +94,17 @@ <version>1.9.11</version> </dependency> - <dependency> +<!-- <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-annotations</artifactId> <version>${jackson-version}</version> - </dependency> + </dependency>--> </dependencies> </dependencyManagement> <dependencies> + <dependency> <groupId>io.dropwizard</groupId> <artifactId>dropwizard-core</artifactId> @@ -148,11 +162,33 @@ <artifactId>lombok</artifactId> <version>1.16.8</version> </dependency> + + <dependency> + <groupId>org.glassfish.jersey.core</groupId> + <artifactId>jersey-server</artifactId> + <version>${jersey.version}</version> + </dependency> + <dependency> + <groupId>org.glassfish.jersey.core</groupId> + <artifactId>jersey-client</artifactId> + <version>${jersey.version}</version> + </dependency> <dependency> + <groupId>org.glassfish.jersey.core</groupId> + <artifactId>jersey-common</artifactId> + <version>${jersey.version}</version> + </dependency> + <dependency> + <groupId>org.glassfish.jersey.containers</groupId> + <artifactId>jersey-container-servlet-core</artifactId> + <version>${jersey.version}</version> + </dependency> + +<!-- <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> <version>1.1.2</version> - </dependency> + </dependency>--> </dependencies> <build> <plugins> |