diff options
| author |   liamfallon <liam.fallon@est.tech> | 2023-02-17 19:12:26 +0000 |
|---|---|---|
| committer | liamfallon <liam.fallon@est.tech> | 2023-02-20 19:05:27 +0000 |
| commit | 9cd5f32432c1f4d16abd0eb6c2ae9f495156f4b9 (patch) | |
| tree | 806a71280f72fd8ca765be9ffdbb6d121ee4eb3d /policy-endpoints | |
| parent | ccdc1b0814aa5609ade406a791128eb89bbc76e0 (diff) | |
Clean up dependencies for London Release
Issue-ID: POLICY-4482
Change-Id: Ibc0833313bf8eb5330c414ff00a31313500959e6
Signed-off-by: liamfallon <liam.fallon@est.tech>
Diffstat (limited to 'policy-endpoints')
| -rw-r--r-- | policy-endpoints/pom.xml | 3 | ||||
| -rw-r--r-- | policy-endpoints/src/main/java/org/onap/policy/common/endpoints/http/server/internal/JettyServletServer.java | 12 |
2 files changed, 6 insertions, 9 deletions
diff --git a/policy-endpoints/pom.xml b/policy-endpoints/pom.xml index b39943d4..6f70754d 100644 --- a/policy-endpoints/pom.xml +++ b/policy-endpoints/pom.xml @@ -39,8 +39,6 @@ <properties> <cambria.version>1.2.1-oss</cambria.version> - <http.client.version>4.5.5</http.client.version> - <http.core.version>4.4.4</http.core.version> </properties> <dependencies> @@ -187,7 +185,6 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-collections4</artifactId> - <version>4.4</version> </dependency> <dependency> diff --git a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/http/server/internal/JettyServletServer.java b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/http/server/internal/JettyServletServer.java index c5af20cb..d74760b6 100644 --- a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/http/server/internal/JettyServletServer.java +++ b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/http/server/internal/JettyServletServer.java @@ -239,32 +239,32 @@ public abstract class JettyServletServer implements HttpServletServer, Runnable * @return the server connector */ public ServerConnector httpsConnector() { - SslContextFactory sslContextFactory = new SslContextFactory.Server(); + SslContextFactory.Server sslContextFactoryServer = new SslContextFactory.Server(); String keyStore = System.getProperty(SYSTEM_KEYSTORE_PROPERTY_NAME); if (keyStore != null) { - sslContextFactory.setKeyStorePath(keyStore); + sslContextFactoryServer.setKeyStorePath(keyStore); String ksPassword = System.getProperty(SYSTEM_KEYSTORE_PASSWORD_PROPERTY_NAME); if (ksPassword != null) { - sslContextFactory.setKeyStorePassword(ksPassword); + sslContextFactoryServer.setKeyStorePassword(ksPassword); } } String trustStore = System.getProperty(SYSTEM_TRUSTSTORE_PROPERTY_NAME); if (trustStore != null) { - sslContextFactory.setTrustStorePath(trustStore); + sslContextFactoryServer.setTrustStorePath(trustStore); String tsPassword = System.getProperty(SYSTEM_TRUSTSTORE_PASSWORD_PROPERTY_NAME); if (tsPassword != null) { - sslContextFactory.setTrustStorePassword(tsPassword); + sslContextFactoryServer.setTrustStorePassword(tsPassword); } } var https = new HttpConfiguration(); https.addCustomizer(new SecureRequestCustomizer()); - return new ServerConnector(jettyServer, sslContextFactory, new HttpConnectionFactory(https)); + return new ServerConnector(jettyServer, sslContextFactoryServer, new HttpConnectionFactory(https)); } public ServerConnector httpConnector() { |