diff options
| author |   HuabingZhao <zhao.huabing@zte.com.cn> | 2018-01-18 04:36:51 +0000 |
|---|---|---|
| committer | HuabingZhao <zhao.huabing@zte.com.cn> | 2018-01-18 04:36:57 +0000 |
| commit | b767a32b7f3a238c890c7c8c9ae50fcbe74f5307 (patch) | |
| tree | 49ba869009a11b8698f3b2e705728ccde8f29463 /sdclient | |
| parent | a6cbea0d7e80dd2505415ee48f36fe7b0ee94c5e (diff) | |
Fix Nexus IQ security issue
Update dropwizard to the latest version.
Issue-ID: MSB-131
Change-Id: I011e3f069ea177468273d1c756a3797a09dee3d3
Signed-off-by: HuabingZhao <zhao.huabing@zte.com.cn>
Diffstat (limited to 'sdclient')
| -rw-r--r-- | sdclient/discovery-service/dependency-reduced-pom.xml | 4 | ||||
| -rw-r--r-- | sdclient/discovery-service/src/main/java/org/onap/msb/sdclient/DiscoverApp.java | 5 | ||||
| -rw-r--r-- | sdclient/pom.xml | 6 |
3 files changed, 9 insertions, 6 deletions
diff --git a/sdclient/discovery-service/dependency-reduced-pom.xml b/sdclient/discovery-service/dependency-reduced-pom.xml index 1560f5b..1200af2 100644 --- a/sdclient/discovery-service/dependency-reduced-pom.xml +++ b/sdclient/discovery-service/dependency-reduced-pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>sdclient</artifactId> <groupId>org.onap.msb.discovery</groupId> - <version>1.0.0-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.onap.msb.discovery.sdclient</groupId> <artifactId>discovery-service</artifactId> <name>onap/msb/discovery/sdclient/discovery-service</name> - <version>1.0.0-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> <build> <resources> <resource> diff --git a/sdclient/discovery-service/src/main/java/org/onap/msb/sdclient/DiscoverApp.java b/sdclient/discovery-service/src/main/java/org/onap/msb/sdclient/DiscoverApp.java index 77c522e..f8328a4 100644 --- a/sdclient/discovery-service/src/main/java/org/onap/msb/sdclient/DiscoverApp.java +++ b/sdclient/discovery-service/src/main/java/org/onap/msb/sdclient/DiscoverApp.java @@ -28,6 +28,7 @@ import io.dropwizard.setup.Bootstrap; import io.dropwizard.setup.Environment; import io.swagger.jaxrs.config.BeanConfig; import io.swagger.jaxrs.listing.ApiListingResource; +import java.util.Optional; public class DiscoverApp extends Application<DiscoverAppConfig> { @@ -91,7 +92,9 @@ public class DiscoverApp extends Application<DiscoverAppConfig> { SimpleServerFactory simpleServerFactory = (SimpleServerFactory) configuration.getServerFactory(); // 必须以"/"开头，结尾可有可无"/" String basePath = simpleServerFactory.getApplicationContextPath(); - String rootPath = simpleServerFactory.getJerseyRootPath(); + Optional<String> optRootPath = simpleServerFactory.getJerseyRootPath(); + + String rootPath = optRootPath.get(); rootPath = rootPath.substring(0, rootPath.indexOf("/*")); diff --git a/sdclient/pom.xml b/sdclient/pom.xml index 52c1a79..89caaf9 100644 --- a/sdclient/pom.xml +++ b/sdclient/pom.xml @@ -50,12 +50,12 @@ <!-- dependency version --> - <dropwizard.version>0.8.0</dropwizard.version> + <dropwizard.version>1.2.0</dropwizard.version> <swagger.version>1.5.3</swagger.version> <lombok.version>1.16.16</lombok.version> <jetty.version>9.2.9.v20150224</jetty.version> - <jackson-version>2.7.9</jackson-version> + <jackson-version>2.9.1</jackson-version> <jersey.version>2.16</jersey.version> <slf4j.version>1.7.12</slf4j.version> <logback.version>1.1.3</logback.version> @@ -197,7 +197,7 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>2.7.9.1</version> + <version>2.9.1</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> |