diff options
Diffstat (limited to 'openecomp-be')
9 files changed, 91 insertions, 124 deletions
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/action-library-rest/action-library-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/action-library-rest/action-library-rest-services/pom.xml index 45707ded40..9ce5f45d7d 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/action-library-rest/action-library-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/action-library-rest/action-library-rest-services/pom.xml @@ -72,16 +72,6 @@ <artifactId>javax.ws.rs-api</artifactId> <version>${ws.rs.version}</version> </dependency> - - <!-- Other Stuff--> - <!--dependency> - <groupId>cglib</groupId> - <artifactId>cglib-nodep</artifactId> - <version>${cglib.nodep.version}</version> - <scope>runtime</scope> - </dependency--> - - <!-- Java Stuff --> <dependency> <groupId>javax.inject</groupId> <artifactId>javax.inject</artifactId> @@ -114,6 +104,12 @@ <version>${jersey.multipart.version}</version> <scope>provided</scope> </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <version>${servlet-api.version}</version> + <scope>provided</scope> + </dependency> </dependencies> </project> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-fe/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-fe/pom.xml index ccf95f2075..12c68237dc 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-fe/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-fe/pom.xml @@ -29,6 +29,7 @@ <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <version>${javax.servlet.version}</version> + <scope>provided</scope> </dependency> <!-- JSON --> <dependency> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/pom.xml index 1c9029b19f..310b5b5fbb 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/pom.xml @@ -92,8 +92,9 @@ </dependency> <dependency> <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>${javax.servlet.version}</version> + <artifactId>javax.servlet-api</artifactId> + <version>${servlet-api.version}</version> + <scope>provided</scope> </dependency> <!-- JSON --> <dependency> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/pom.xml index 2bc7d67cb8..305e307fda 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/pom.xml @@ -54,6 +54,7 @@ <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <version>${javax.servlet.version}</version> + <scope>provided</scope> </dependency> </dependencies> diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-core/pom.xml b/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-core/pom.xml index 50574a0900..01233644a0 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-core/pom.xml +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-core/pom.xml @@ -39,16 +39,6 @@ <artifactId>zusammen-collaboration-cassandra-plugin</artifactId> <version>${zusammen-collaboration-store.version}</version> <scope>runtime</scope> -<!-- <exclusions> - <exclusion> - <groupId>com.datastax.cassandra</groupId> - <artifactId>cassandra-driver-core</artifactId> - </exclusion> - <exclusion> - <groupId>com.datastax.cassandra</groupId> - <artifactId>cassandra-driver-mapping</artifactId> - </exclusion> - </exclusions>--> </dependency> <dependency> <groupId>com.amdocs.zusammen.plugin</groupId> @@ -73,11 +63,6 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> - <version>3.1.0</version> - </dependency> - <dependency> <groupId>org.openecomp.sdc.core</groupId> <artifactId>openecomp-nosqldb-core</artifactId> <version>${project.version}</version> diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-core/src/main/java/org/openecomp/core/zusammen/impl/CassandraConnectionInitializer.java b/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-core/src/main/java/org/openecomp/core/zusammen/impl/CassandraConnectionInitializer.java index 8eeeb1e27b..7944999a70 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-core/src/main/java/org/openecomp/core/zusammen/impl/CassandraConnectionInitializer.java +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-zusammen-lib/openecomp-zusammen-core/src/main/java/org/openecomp/core/zusammen/impl/CassandraConnectionInitializer.java @@ -16,85 +16,75 @@ package org.openecomp.core.zusammen.impl; +import java.util.function.Supplier; import org.apache.commons.lang3.StringUtils; - import org.openecomp.core.nosqldb.util.CassandraUtils; -import java.util.function.Supplier; - -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; - -public class CassandraConnectionInitializer implements ServletContextListener { - - private static final String CASSANDRA_PREFIX = "cassandra."; - private static final String DATA_CENTER_PROPERTY_NAME = CASSANDRA_PREFIX + "datacenter"; - private static final String CONSISTENCY_LEVEL_PROPERTY_NAME = - CASSANDRA_PREFIX + "consistency.level"; - private static final String NODES_PROPERTY_NAME = CASSANDRA_PREFIX + "nodes"; - private static final String AUTHENTICATE_PROPERTY_NAME = CASSANDRA_PREFIX + "authenticate"; - private static final String SSL_PROPERTY_NAME = CASSANDRA_PREFIX + "ssl"; - private static final String TRUSTSTORE_PROPERTY_NAME = CASSANDRA_PREFIX + "truststore"; - private static final String TRUSTSTORE_PASSWORD_PROPERTY_NAME = - CASSANDRA_PREFIX + "truststore.password"; - private static final String USER_PROPERTY_NAME = CASSANDRA_PREFIX + "user"; - private static final String PASSWORD_PROPERTY_NAME = CASSANDRA_PREFIX + "password"; - private static final String KEYSPACE_PROPERTY_NAME = CASSANDRA_PREFIX + "keyspace"; - private static final String ZUSAMMEN = "zusammen"; - - @Override - public void contextInitialized(ServletContextEvent servletContextEvent) { - setCassandraConnectionPropertiesToSystem(); - } - - public static void setCassandraConnectionPropertiesToSystem() { - DeferredInitializer.init(); - } - - @Override - public void contextDestroyed(ServletContextEvent servletContextEvent) { - // no-op, required by the interface - } - - private static class DeferredInitializer { - - static { - setSystemProperty(NODES_PROPERTY_NAME, () -> - StringUtils.join(CassandraUtils.getAddresses(), ',')); - setBooleanSystemProperty(AUTHENTICATE_PROPERTY_NAME, CassandraUtils::isAuthenticate); - setBooleanSystemProperty(SSL_PROPERTY_NAME, CassandraUtils::isSsl); - setSystemProperty(TRUSTSTORE_PROPERTY_NAME, CassandraUtils::getTruststore); - setSystemProperty(TRUSTSTORE_PASSWORD_PROPERTY_NAME, CassandraUtils::getTruststorePassword); - setSystemProperty(USER_PROPERTY_NAME, CassandraUtils::getUser); - setSystemProperty(PASSWORD_PROPERTY_NAME, CassandraUtils::getPassword); - setSystemProperty(KEYSPACE_PROPERTY_NAME, () -> ZUSAMMEN); - setNullableSystemProperty(DATA_CENTER_PROPERTY_NAME, CassandraUtils::getLocalDataCenter); - setNullableSystemProperty(CONSISTENCY_LEVEL_PROPERTY_NAME, - CassandraUtils::getConsistencyLevel); - } - - private static void setSystemProperty(String name, Supplier<String> valueSupplier) { - - if (System.getProperty(name) == null) { - System.setProperty(name, valueSupplier.get()); - } +public class CassandraConnectionInitializer { + + private static final String CASSANDRA_PREFIX = "cassandra."; + private static final String DATA_CENTER_PROPERTY_NAME = CASSANDRA_PREFIX + "datacenter"; + private static final String CONSISTENCY_LEVEL_PROPERTY_NAME = + CASSANDRA_PREFIX + "consistency.level"; + private static final String NODES_PROPERTY_NAME = CASSANDRA_PREFIX + "nodes"; + private static final String AUTHENTICATE_PROPERTY_NAME = CASSANDRA_PREFIX + "authenticate"; + private static final String SSL_PROPERTY_NAME = CASSANDRA_PREFIX + "ssl"; + private static final String TRUSTSTORE_PROPERTY_NAME = CASSANDRA_PREFIX + "truststore"; + private static final String TRUSTSTORE_PASSWORD_PROPERTY_NAME = + CASSANDRA_PREFIX + "truststore.password"; + private static final String USER_PROPERTY_NAME = CASSANDRA_PREFIX + "user"; + private static final String PASSWORD_PROPERTY_NAME = CASSANDRA_PREFIX + "password"; + private static final String KEYSPACE_PROPERTY_NAME = CASSANDRA_PREFIX + "keyspace"; + private static final String ZUSAMMEN = "zusammen"; + + private CassandraConnectionInitializer() { + // static utility class, prevent instantiation } - private static void setBooleanSystemProperty(String name, Supplier<Boolean> valueSupplier) { - setSystemProperty(name, () -> Boolean.toString(valueSupplier.get())); + public static void setCassandraConnectionPropertiesToSystem() { + DeferredInitializer.init(); } - private static void setNullableSystemProperty(String name, Supplier<String> valueSupplier) { - - if ((System.getProperty(name) == null) && (valueSupplier.get() != null)) { - System.setProperty(name, valueSupplier.get()); - } - } - - private DeferredInitializer() { } - - public static void init() { - // just to ensure static initialization + private static class DeferredInitializer { + + static { + setSystemProperty(NODES_PROPERTY_NAME, () -> + StringUtils.join(CassandraUtils.getAddresses(), ',')); + setBooleanSystemProperty(AUTHENTICATE_PROPERTY_NAME, CassandraUtils::isAuthenticate); + setBooleanSystemProperty(SSL_PROPERTY_NAME, CassandraUtils::isSsl); + setSystemProperty(TRUSTSTORE_PROPERTY_NAME, CassandraUtils::getTruststore); + setSystemProperty(TRUSTSTORE_PASSWORD_PROPERTY_NAME, CassandraUtils::getTruststorePassword); + setSystemProperty(USER_PROPERTY_NAME, CassandraUtils::getUser); + setSystemProperty(PASSWORD_PROPERTY_NAME, CassandraUtils::getPassword); + setSystemProperty(KEYSPACE_PROPERTY_NAME, () -> ZUSAMMEN); + setNullableSystemProperty(DATA_CENTER_PROPERTY_NAME, CassandraUtils::getLocalDataCenter); + setNullableSystemProperty(CONSISTENCY_LEVEL_PROPERTY_NAME, + CassandraUtils::getConsistencyLevel); + } + + private DeferredInitializer() { } + + @SuppressWarnings("EmptyMethod") + static void init() { + // no-op, just to ensure static initialization + } + + private static void setSystemProperty(String name, Supplier<String> valueSupplier) { + + if (System.getProperty(name) == null) { + System.setProperty(name, valueSupplier.get()); + } + } + + private static void setBooleanSystemProperty(String name, Supplier<Boolean> valueSupplier) { + setSystemProperty(name, () -> Boolean.toString(valueSupplier.get())); + } + + private static void setNullableSystemProperty(String name, Supplier<String> valueSupplier) { + + if ((System.getProperty(name) == null) && (valueSupplier.get() != null)) { + System.setProperty(name, valueSupplier.get()); + } + } } - } } diff --git a/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/pom.xml b/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/pom.xml index 3b6027e36d..751b3a9be0 100644 --- a/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/pom.xml +++ b/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/pom.xml @@ -18,7 +18,7 @@ <dependency> <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> + <artifactId>javax.servlet-api</artifactId> <version>${servlet-api.version}</version> <scope>provided</scope> </dependency> diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/pom.xml b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/pom.xml index 1a269ff6b5..29efa616ab 100644 --- a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/pom.xml @@ -22,7 +22,7 @@ </dependency> <dependency> <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> + <artifactId>javax.servlet-api</artifactId> <version>${servlet-api.version}</version> <scope>provided</scope> </dependency> diff --git a/openecomp-be/tools/zusammen-tools/pom.xml b/openecomp-be/tools/zusammen-tools/pom.xml index 432248853f..9e11c53806 100644 --- a/openecomp-be/tools/zusammen-tools/pom.xml +++ b/openecomp-be/tools/zusammen-tools/pom.xml @@ -1,18 +1,25 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <properties> + <artifactId>openecomp-zusammen-tools</artifactId> + <groupId>org.openecomp.sdc.core.tools</groupId> + <name>openecomp-zusammen-tools</name> + <version>1.3.0-SNAPSHOT</version> + + <parent> + <groupId>org.openecomp.sdc</groupId> + <artifactId>openecomp-sdc-lib</artifactId> + <relativePath>../../lib</relativePath> + <version>1.3.0-SNAPSHOT</version> + </parent> + <properties> <groovy.version>2.4.7</groovy.version> <janino.version>2.7.7</janino.version> - </properties> - - - <name>openecomp-zusammen-tools</name> <dependencies> <dependency> <groupId>org.openecomp.sdc</groupId> @@ -47,7 +54,7 @@ <dependency> <groupId>com.amdocs.zusammen.plugin</groupId> <artifactId>zusammen-state-store-cassandra-plugin</artifactId> - <version>${zusammen-state-store.version}</version> + <version>${zusammen-state-store.version}</version> </dependency> <dependency> <groupId>org.hibernate</groupId> @@ -76,20 +83,6 @@ <scope>test</scope> </dependency> </dependencies> - <artifactId>openecomp-zusammen-tools</artifactId> - <groupId>org.openecomp.sdc.core.tools</groupId> - <version>1.3.0-SNAPSHOT</version> - <parent> - <groupId>org.openecomp.sdc</groupId> - <artifactId>openecomp-sdc-lib</artifactId> - <relativePath>../../lib</relativePath> - <version>1.3.0-SNAPSHOT</version> - </parent> - <!--parent> - <groupId>org.openecomp.sdc</groupId> - <artifactId>openecomp-sdc</artifactId> - <version>1.0-SNAPSHOT</version> - </parent--> <build> <plugins> |