#------------------------------------------------------------
#------------------------------------------------------------
catalog-ui/app/dist/*
-catalog-ui/package-lock.json
catalog-ui/dist
catalog-ui/*.tmp.txt
catalog-ui/tests/Coverage/*
<finalName>${project.artifactId}-${project.version}-jar-with-dependencies</finalName>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
- <version>3.0.0</version>
<executions>
<execution>
<id>clean-static-files</id>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.7</version>
<configuration>
<skip>true</skip>
</configuration>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>3.1.0</version>
<executions>
<execution>
<phase>package</phase>
<plugin>
<groupId>ru.yaal.maven</groupId>
<artifactId>write-text-files-maven-plugin</artifactId>
- <version>1.1</version>
<configuration>
<charset>UTF-8</charset>
<files>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>3.0.2</version>
<executions>
<execution>
<id>copy-tosca-folder</id>
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>3.0.2</version>
<executions>
<execution>
<id>copy-sdctool</id>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>${fabric8.version}</version>
<configuration>
- <verbose>true</verbose>
<apiVersion>1.23</apiVersion>
<registry>nexus3.onap.org:10001</registry>
<authConfig>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>2.6</version>
<configuration>
<packagingExcludes>WEB-INF\lib\slf4j-log4j*.jar,
WEB-INF/classes/elasticsearch.yml,
<attachClasses>true</attachClasses>
</configuration>
</plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-dependencies</id>
- <phase>package</phase>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <configuration>
- <includeScope>compile</includeScope>
- </configuration>
- </execution>
- <execution>
- <id>copy-installed</id>
- <phase>install</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>${project.groupId}</groupId>
- <artifactId>${project.artifactId}</artifactId>
- <version>${project.version}</version>
- <type>${project.packaging}</type>
- </artifactItem>
- </artifactItems>
- <outputDirectory>${project.parent.basedir}/sdc-os-chef/sdc-backend/</outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
<plugin>
<groupId>com.jcabi</groupId>
<artifactId>jcabi-maven-plugin</artifactId>
- <version>${jcabi.plugin.version}</version>
+ <version>${jcabi.maven.plugin.version}</version>
<executions>
<execution>
<goals>
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
- <version>3.0.0</version>
<executions>
<execution>
<id>clean.sdc.backend.folder</id>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>3.0.2</version>
<executions>
<execution>
<id>copy-static-configuration-files</id>
</lifecycleMappingMetadata>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>2.7</version>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
</plugins>
</pluginManagement>
<!-- Swagger Plugins End -->
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>3.0.2</version>
<executions>
<execution>
<id>copy-resources-apidocs</id>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>${fabric8.version}</version>
-
<configuration>
- <verbose>true</verbose>
<apiVersion>1.23</apiVersion>
<registry>nexus3.onap.org:10001</registry>
<authConfig>
</lifecycleMappingMetadata>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>2.7</version>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
</plugins>
</pluginManagement>
</build>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>2.6</version>
<configuration>
<archive>
<manifest>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>${jetty.version}</version>
- <!--<version>9.0.6.v20130930</version>-->
<configuration>
<webApp>
<contextPath>/</contextPath>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.7</version>
<configuration>
<skip>true</skip>
</configuration>
<plugin>
<groupId>com.jcabi</groupId>
<artifactId>jcabi-maven-plugin</artifactId>
- <version>${jcabi.plugin.version}</version>
+ <version>${jcabi.maven.plugin.version}</version>
<executions>
<execution>
<goals>
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
- <version>3.0.0</version>
<executions>
<execution>
<id>clean.catalog.fe.folder</id>
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>3.0.2</version>
<executions>
<execution>
<id>copy-resources-fe</id>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>${fabric8.version}</version>
-
<configuration>
- <verbose>true</verbose>
<apiVersion>1.23</apiVersion>
<registry>nexus3.onap.org:10001</registry>
<authConfig>
<!-- only one line, shut up logback ! -->
-<configuration />
\ No newline at end of file
+<configuration>
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <Pattern>
+ %d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n
+ </Pattern>
+ </encoder>
+ </appender>
+ <root level="OFF">
+ <appender-ref ref="STDOUT" />
+ </root>
+</configuration>
\ No newline at end of file
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.7</version>
<configuration>
<skip>true</skip>
</configuration>
<build>
<plugins>
-
- <!-- ============================================= -->
- <!-- Clean webapps folder -->
- <!-- ============================================= -->
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
- <version>2.6.1</version>
<executions>
<execution>
<id>clean.fe.webapp.folder</id>
</filesets>
</configuration>
</execution>
- <!-- <execution>
- <id>clean.dist.folder</id>
- <phase>clean</phase>
- <goals>
- <goal>clean</goal>
- </goals>
- <configuration>
- <filesets>
- <fileset>
- <directory>${basedir}/node_modules</directory>
- </fileset>
- <fileset>
- <directory>${basedir}/dist</directory>
- </fileset>
- </filesets>
- </configuration>
- </execution> -->
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.7</version>
<executions>
<execution>
<id>copy-resources</id>
<plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
- <version>1.4</version>
-
<configuration>
<installDirectory>${project.parent.basedir}</installDirectory>
</configuration>
</goals>
<!-- Optional configuration which provides for running any npm command -->
<configuration>
- <arguments>install</arguments>
+ <arguments>install --registry ${npm.registry}</arguments>
</configuration>
</execution>
</plugins>
</build>
-
-
-
- <profiles>
- <profile>
- <id>CI</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.7</version>
- <executions>
- <execution>
- <id>copy-resources</id>
- <phase>package</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
-
- <configuration>
- <outputDirectory>${project.parent.basedir}/catalog-fe/src/main/webapp</outputDirectory>
- <resources>
- <resource>
- <directory>${project.basedir}/dist</directory>
- <filtering>false</filtering>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
-
-
- <!-- ============================================= -->
- <!-- Build the UI module node code -->
- <!-- ============================================= -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.4.0</version>
- <executions>
-
- <!-- Set execution permissions for the build script -->
- <execution>
- <id>set.script.permissions</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>exec</goal>
- </goals>
-
- <configuration>
- <workingDirectory>${project.basedir}</workingDirectory>
- <executable>/bin/chmod</executable>
- <arguments>
- <argument>755</argument>
- <argument>./build_catalog_ui.sh</argument>
- </arguments>
- </configuration>
- </execution>
-
- <!-- Run the build script -->
- <execution>
- <id>execute grant build</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>exec</goal>
- </goals>
-
- <configuration>
- <workingDirectory>${project.basedir}</workingDirectory>
- <executable>./build_catalog_ui.sh</executable>
- </configuration>
- </execution>
-
- <!-- Undo checkout the build script -->
- <execution>
- <id>undo.checkout.script</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>exec</goal>
- </goals>
-
- <configuration>
- <workingDirectory>${project.basedir}</workingDirectory>
- <executable>/usr/bin/git</executable>
- <arguments>
- <argument>checkout</argument>
- <argument>--</argument>
- <argument>./build_catalog_ui.sh</argument>
- </arguments>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
-
-
- <profile>
- <id>not-minified</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.7</version>
- <executions>
- <execution>
- <id>copy-resources</id>
- <phase>package</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.parent.basedir}/catalog-fe/src/main/webapp</outputDirectory>
- <resources>
- <resource>
- <directory>${project.basedir}/app</directory>
- <includes>
- <include>languages/**</include>
- <include>scripts/**</include>
- <include>styles/**</include>
- <include>third-party/**</include>
- <include>index.html</include>
- <include>robots.txt</include>
- <include>favicon.png</include>
- </includes>
- <filtering>false</filtering>
- </resource>
- <resource>
- <directory>${project.basedir}</directory>
- <includes>
- <include>bower_components/**</include>
- </includes>
- <filtering>false</filtering>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.7</version>
<configuration>
<skip>true</skip>
</configuration>
this.resourcesForUpgrade = resourcesForUpgrade;
}
+ @SuppressWarnings("unchecked")
public static <K,V> Map<K,V> safeGetCapsInsensitiveMap(Map<K,V> map) {
return map == null ? emptyMap() : new CaseInsensitiveMap(map);
}
import org.openecomp.sdc.common.http.client.api.HttpResponse;
import org.openecomp.sdc.common.http.config.HttpClientConfig;
import org.openecomp.sdc.common.http.config.Timeouts;
+import org.openecomp.sdc.common.log.enums.EcompLoggerErrorCode;
import org.openecomp.sdc.common.log.wrappers.Logger;
import org.openecomp.sdc.common.monitoring.MonitoringEvent;
import org.openecomp.sdc.common.monitoring.MonitoringMetricsFetcher;
HttpResponse<String> httpResponse = HttpRequest.post(redirectedUrl, myEntity, new HttpClientConfig(new Timeouts(timeout, timeout)));
int beResponseStatus = httpResponse.getStatusCode();
if (beResponseStatus != HttpStatus.SC_OK) {
- monitoringLogger.error("Unexpected HTTP response from BE : {}", beResponseStatus);
+ monitoringLogger.error(EcompLoggerErrorCode.UNKNOWN_ERROR,"","","Unexpected HTTP response from BE : {}", beResponseStatus);
}
} catch (Exception e) {
- monitoringLogger.error("Monitoring BE failed with exception ", e);
+ monitoringLogger.error(EcompLoggerErrorCode.UNKNOWN_ERROR,"","","Monitoring BE failed with exception ", e);
}
}
}
import org.apache.commons.jci.listeners.FileChangeListener;
import org.openecomp.sdc.common.api.BasicConfiguration;
import org.openecomp.sdc.common.api.ConfigurationListener;
+import org.openecomp.sdc.common.log.enums.EcompLoggerErrorCode;
import org.openecomp.sdc.common.log.wrappers.Logger;
import org.openecomp.sdc.common.util.YamlToObjectConverter;
BasicConfiguration basicConfiguration = yamlToObjectConverter.convert(pFile.getAbsolutePath(), configClass);
if (basicConfiguration == null) {
- log.warn("Cannot update the listeners for file Change since the file content is invalid");
+ log.warn(EcompLoggerErrorCode.UNKNOWN_ERROR,"","","Cannot update the listeners for file Change since the file content is invalid");
continue;
}
log.debug("Loaded configuration after converting is {}", basicConfiguration);
- // System.out.println("New configuration is " +
- // basicConfiguration);
+
configurationListener.getCallBack().reconfigure(basicConfiguration);
}
} else {
- log.warn("Cannot calculate id from file {}", pFile.getName());
+ log.warn(EcompLoggerErrorCode.UNKNOWN_ERROR,"","","Cannot calculate id from file {}", pFile.getName());
}
}
import org.apache.commons.codec.binary.Base64;
import org.openecomp.sdc.common.api.Constants;
+import org.openecomp.sdc.common.log.enums.EcompLoggerErrorCode;
import org.openecomp.sdc.common.log.wrappers.Logger;
import javax.servlet.http.HttpServletRequest;
headersMap.put(requiredHeader, headerVal);
log.debug("found header - {} : {}", requiredHeader, headerVal);
} else {
- log.error("missing identification header: {}", requiredHeader);
+ log.error(EcompLoggerErrorCode.UNKNOWN_ERROR,"","","missing identification header: {}", requiredHeader);
throw new RestRequestValidationException("missing identification header: " + requiredHeader);
}
}
import org.openecomp.sdc.be.config.DistributionEngineConfiguration.DistributionNotificationTopicConfig;
import org.openecomp.sdc.be.config.DistributionEngineConfiguration.DistributionStatusTopicConfig;
import org.openecomp.sdc.be.config.validation.DeploymentArtifactHeatConfiguration;
+import org.openecomp.sdc.common.log.enums.EcompLoggerErrorCode;
import org.openecomp.sdc.common.log.wrappers.Logger;
import org.openecomp.sdc.fe.config.Configuration.FeMonitoringConfig;
import org.yaml.snakeyaml.TypeDescription;
config = convert(fullFileName, className);
} catch (Exception e) {
- log.error("Failed to convert yaml file {} to object.", configFileName,e);
+ log.error(EcompLoggerErrorCode.UNKNOWN_ERROR,"","","Failed to convert yaml file {} to object.", configFileName,e);
}
return config;
File f = new File(fullFileName);
if (!f.exists()) {
- log.warn("The file " + fullFileName + " cannot be found. Ignore reading configuration.");
+ log.warn(EcompLoggerErrorCode.UNKNOWN_ERROR,"","","The file {} cannot be found. Ignore reading configuration.",fullFileName);
return null;
}
in = Files.newInputStream(Paths.get(fullFileName));
// System.out.println(config.toString());
} catch (Exception e) {
- log.error("Failed to convert yaml file {} to object.", fullFileName, e);
+ log.error(EcompLoggerErrorCode.UNKNOWN_ERROR,"","","Failed to convert yaml file {} to object.", fullFileName, e);
} finally {
if (in != null) {
try {
config = yaml.loadAs(in, className);
} catch (Exception e) {
- log.error("Failed to convert yaml file to object", e);
+ log.error(EcompLoggerErrorCode.UNKNOWN_ERROR,"","","Failed to convert yaml file to object", e);
} finally {
if (in != null) {
try {
return isValidYaml(decodedFileContents);
}
-
+ @SuppressWarnings("unchecked")
public boolean isValidYaml(byte[] fileContents) {
try {
}
} catch (Exception e) {
- log.error("Failed to convert yaml file to object - yaml is invalid", e);
+ log.error(EcompLoggerErrorCode.UNKNOWN_ERROR,"","","Failed to convert yaml file to object - yaml is invalid", e);
return false;
}
return true;
package org.openecomp.sdc.exception;
+import org.openecomp.sdc.common.log.enums.EcompLoggerErrorCode;
import org.openecomp.sdc.common.log.wrappers.Logger;
import java.util.Arrays;
}
int actualParamsNum = (variables != null) ? variables.length : 0;
if (actualParamsNum < expectedParamsNum) {
- log.warn(
+ log.warn(EcompLoggerErrorCode.UNKNOWN_ERROR,"","",
"Received less parameters than expected for error with messageId {}, expected: {}, actual: {}. Missing parameters are padded with null values.",
messageId, expectedParamsNum, actualParamsNum);
} else if (actualParamsNum > expectedParamsNum) {
- log.warn(
+ log.warn(EcompLoggerErrorCode.UNKNOWN_ERROR,"","","",
"Received more parameters than expected for error with messageId {}, expected: {}, actual: {}. Extra parameters are ignored.",
messageId, expectedParamsNum, actualParamsNum);
}
public class WrapperTest {
private Wrapper createTestSubject() {
- return new Wrapper(null);
+ return new Wrapper("test");
}
</dependency>
</dependencies>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>2.7</version>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
+
</project>
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>3.0.0</version>
<configuration>
<property scope="system" name="ECOMP-component-name" value="SDC" />
<property scope="system" name="ECOMP-subcomponent-name" value="SDC-BE" />
<property file="${config.home}/catalog-be/configuration.yaml" />
- <property scope="context" name="enable-all-log" value="true" />
+ <property scope="context" name="enable-all-log" value="false" />
<!-- value used by pattern field list (| - is inter-field separator, || - unavailable or not applicable field value) (m - mandatory, o- optional)-->
<!--timestamp(m)| requestID(m)| serviceInstanceID(o)| threadID(m)| physicalServerName(o)| serviceName(m)| userID(m)| logLevel(m)| severity(o)| serverIpAddress(m)| serverName(m)| clientIpAddress(o)| className(m)| timer(o)| detailedMessage(o)-->
</if>
</root>
- <logger name="org.openecomp.sdc" level="DEBUG" />
+ <logger name="org.openecomp.sdc" level="INFO" />
</configuration>
\ No newline at end of file
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>${fabric8.version}</version>
-
<configuration>
- <verbose>true</verbose>
<apiVersion>1.23</apiVersion>
<registry>nexus3.onap.org:10001</registry>
<authConfig>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>${fabric8.version}</version>
<configuration>
- <verbose>true</verbose>
<apiVersion>1.23</apiVersion>
<registry>nexus3.onap.org:10001</registry>
<authConfig>
js-base64 "^2.1.8"
source-map "^0.4.2"
-sdc-ui@1.6.53:
- version "1.6.53"
- resolved "https://registry.yarnpkg.com/sdc-ui/-/sdc-ui-1.6.53.tgz#acb6faba9a7d5f64702f4a19c4efbc5fae331f63"
+sdc-ui@1.6.57:
+ version "1.6.57"
+ resolved "https://registry.yarnpkg.com/sdc-ui/-/sdc-ui-1.6.57.tgz#9250faa279163e13f36bb91c835b8fe78f77ebaf"
dependencies:
"@angular/common" "~2.4.8"
"@angular/core" "~2.4.8"
<packaging>pom</packaging>
<name>sdc</name>
<properties>
-
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
-
- <!-- ==================== -->
- <!-- Generic properties -->
- <!-- ==================== -->
- <build.type>-SNAPSHOT</build.type>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <sprint.number>74</sprint.number>
<!-- 3rd parties versions -->
<lang3.version>3.3.2</lang3.version>
<jcabi.version>0.20.1</jcabi.version>
<aspectjrt.version>1.8.4</aspectjrt.version>
<aspectj.version>1.7.4</aspectj.version>
- <jcabi.plugin.version>0.13.2</jcabi.plugin.version>
+ <jcabi.maven.plugin.version>0.13.2</jcabi.maven.plugin.version>
<!-- Logging end -->
<!-- System Metrics -->
<!--TESTING-->
<mockito.version>2.18.3</mockito.version>
- <jmockit.version>1.33</jmockit.version>
+ <jmockit.version>1.33</jmockit.version>
<junit.version>4.12</junit.version>
<assertj.version>3.10.0</assertj.version>
<testng.version>6.9.10</testng.version>
<nexus.id.snapshot>nexus</nexus.id.snapshot>
<!--nexus-->
+ <npm.registry>https://registry.npmjs.org/</npm.registry>
+ <!-- https://nexus.onap.org/content/repositories/npm/ -->
<nexus.proxy>https://nexus.onap.org</nexus.proxy>
<sitePath>/content/sites/site/org/openecomp/sdc/${project.version}</sitePath>
<staging.profile.id>176c31dfe190a</staging.profile.id>
<!--maven-->
<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
- <!--io.fabric8-->
- <fabric8.version>0.23.0</fabric8.version>
<!--docker tags-->
<docker.tag>${project.version}-${maven.build.timestamp}</docker.tag>
- <!--<docker.latest.tag>${project.version}-latest</docker.latest.tag>-->
+
</properties>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>3.0.0</version>
+ <version>3.0.1</version>
<configuration>
<failOnError>false</failOnError>
<doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.1</version>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>3.4</version>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-webdav-jackrabbit</artifactId>
- <version>2.10</version>
- </dependency>
- </dependencies>
- </plugin>
-
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>1.4.0</version>
+ <version>1.6.0</version>
</plugin>
<plugin>
<groupId>org.sonarsource.scanner.maven</groupId>
<artifactId>sonar-maven-plugin</artifactId>
- <version>3.0.2</version>
+ <version>3.4.1.1168</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>3.1.0</version>
+ </plugin>
+ <plugin>
+ <groupId>ru.yaal.maven</groupId>
+ <artifactId>write-text-files-maven-plugin</artifactId>
+ <version>1.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.gmaven</groupId>
+ <artifactId>gmaven-plugin</artifactId>
+ <version>1.5</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>3.0.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>2.8.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>3.1.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>3.1.0</version>
+ </plugin>
+ <plugin>
+ <groupId>io.fabric8</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <version>0.26.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>3.2.2</version>
+ </plugin>
+ <plugin>
+ <groupId>com.github.eirslett</groupId>
+ <artifactId>frontend-maven-plugin</artifactId>
+ <version>1.6</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.22.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.8.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.sonatype.plugins</groupId>
+ <artifactId>nexus-staging-maven-plugin</artifactId>
+ <version>1.6.8</version>
</plugin>
</plugins>
</pluginManagement>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
- <version>1.6.7</version>
<extensions>true</extensions>
<configuration>
<nexusUrl>${nexus.proxy}</nexusUrl>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.8</version>
<executions>
<execution>
<id>parse-version</id>
+ <phase>pre-clean</phase>
<goals>
<goal>parse-version</goal>
</goals>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
+ <version>3.7.1</version>
<dependencies>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-webdav-jackrabbit</artifactId>
- <version>2.10</version>
+ <version>3.0.0</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.codehaus.gmaven</groupId>
<artifactId>gmaven-plugin</artifactId>
- <version>1.4</version>
<executions>
<execution>
<inherited>false</inherited>
</execution>
</executions>
</plugin>
-
- <!-- license plugin -->
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>license-maven-plugin</artifactId>
- <version>1.10</version>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage>
- <processStartTag>============LICENSE_START=======================================================</processStartTag>
- <processEndTag>============LICENSE_END=========================================================</processEndTag>
- <sectionDelimiter>================================================================================</sectionDelimiter>
- <sectionDelimiter>================================================================================</sectionDelimiter>
- <licenseName>apache_v2</licenseName>
- <inceptionYear>2017</inceptionYear>
- <organizationName>AT&T Intellectual Property. All rights
- reserved.
- </organizationName>
- <projectName>SDC</projectName>
- <canUpdateCopyright>true</canUpdateCopyright>
- <canUpdateDescription>true</canUpdateDescription>
- <canUpdateLicense>true</canUpdateLicense>
- <emptyLineAfterHeader>true</emptyLineAfterHeader>
- <verbose>false</verbose>
- <includes>
- <include>**/*.java</include>
- <include>**/*.ts</include>
- </includes>
- <excludes>
- <exclude>**/*.d.ts</exclude>
- </excludes>
- <roots>
- <root>src</root>
- <root>app</root>
- <root>server-mock</root>
- <root>typings</root>
- </roots>
- <extraExtensions>
- <ts>java</ts>
- </extraExtensions>
+ <source>1.8</source>
+ <target>1.8</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <printSummary>false</printSummary>
</configuration>
- <executions>
- <execution>
- <id>first</id>
- <goals>
- <goal>update-file-header</goal>
- </goals>
- <!--phase>process-sources</phase -->
- </execution>
- </executions>
</plugin>
</plugins>
</build>
<activeByDefault>true</activeByDefault>
</activation>
<modules>
- <module>security-utils</module>
- <module>common-app-api</module>
<module>onboarding</module>
<module>services/activity-spec</module>
+ <module>security-utils</module>
+ <module>common-app-api</module>
<module>common-be</module>
<module>catalog-dao</module>
<module>catalog-model</module>
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
- <version>3.0.0</version>
<executions>
<execution>
<id>clean.tosca.chef.os.folder</id>
<plugin>
<groupId>ru.yaal.maven</groupId>
<artifactId>write-text-files-maven-plugin</artifactId>
- <version>1.1</version>
<configuration>
<charset>UTF-8</charset>
<files>
</build>
<profiles>
- <!--<profile>-->
- <!--<id>docker-staging</id>-->
- <!--<properties>-->
- <!--<docker.tag>${project.version}-STAGING-${maven.build.timestamp}</docker.tag>-->
- <!--<docker.latest.tag>${project.version}-STAGING-latest</docker.latest.tag>-->
- <!--</properties>-->
- <!--</profile>-->
-
<profile>
<id>docker</id>
<activation>
</activation>
<build>
<plugins>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>3.0.2</version>
-
- </plugin>
-
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>${fabric8.version}</version>
-
<configuration>
- <verbose>true</verbose>
<apiVersion>1.23</apiVersion>
<registry>nexus3.onap.org:10001</registry>
<authConfig>
function usage {
- echo "usage: docker_run.sh [ -r|--release <RELEASE-NAME> ] [ -e|--environment <ENV-NAME> ] [ -p|--port <Docker-hub-port>] [ -l|--local <Run-without-pull>] [ -t|--runTests <Run-with-sanityDocker>] [ -dcae|--dcae <Run-with-DCAE>][ -h|--help ]"
- echo "example: sudo bash docker_run.sh -e AUTO -r 1.2-STAGING-latest -dcae"
+ echo "usage: docker_run.sh [ -r|--release <RELEASE-NAME> ] [ -e|--environment <ENV-NAME> ] [ -p|--port <Docker-hub-port>] [ -l|--local <Run-without-pull>] [ -t|--runTests <Run-with-sanityDocker>] [ -sim|--simulator <Run-with-simulator>] [ -ta <run api tests with the supplied test suit>] [ -tu <run ui tests with the supplied test suit>] [ -ta <run api tests with the supplied test suit>] [ -tu <run ui tests with the supplied test suit>] [ -tad <run api tests with the default test suit>] [ -tu <run ui tests with the default test suit>] [ -dcae|--dcae <Run-with-DCAE>][ -h|--help ]"
+ echo "start dockers built locally example: docker_run.sh -l"
+ echo "start dockers built locally and simulator example: docker_run.sh -l -sim"
+ echo "start dockers, pull from onap nexus according to release and simulator example: docker_run.sh -r 1.3-STAGING-latest -sim"
+ echo "start dockers built locally and run api tests docker example: docker_run.sh -l -tad"
+ echo "start dockers built locally and run only the catalog be example: docker_run.sh -l -d sdc-BE "
}
#
}
#
+# check simulator status
+function probe_sim {
+ if lsof -Pi :8285 -sTCP:LISTEN -t >/dev/null ; then
+ echo "running"
+ sim_stat=true
+ else
+ echo "not running"
+ sim_stat=false
+ fi
+}
+#
+
function monitor_docker {
DOCKER_NAME=$1
if [ ${LOCAL} = false ]; then
docker pull ${PREFIX}/sdc-ui-tests:${RELEASE}
fi
-
+ RUN_SIMULATOR=true;
sdc-sim
docker run --detach --name sdc-ui-tests --env HOST_IP=${IP} --env ENVNAME="${DEP_ENV}" --env JAVA_OPTIONS="${UI_TESTS_JAVA_OPTIONS}" --env SUITE_NAME=${UI_SUITE} --log-driver=json-file --log-opt max-size=100m --log-opt max-file=10 --ulimit memlock=-1:-1 --ulimit nofile=4096:100000 ${LOCAL_TIME_MOUNT_CMD} --volume ${WORKSPACE}/data/logs/sdc-ui-tests/target:/var/lib/tests/target --volume ${WORKSPACE}/data/logs/sdc-ui-tests/ExtentReport:/var/lib/tests/ExtentReport --volume ${WORKSPACE}/data/environments:/root/chef-solo/environments --publish 5901:5901 --publish 6901:6901 ${PREFIX}/sdc-ui-tests:${RELEASE}
echo "please wait while SDC-UI-TESTS is starting....."
# SDC-Simulator
function sdc-sim {
- echo "docker run sdc-webSimulator..."
- if [ ${LOCAL} = false ]; then
- docker pull ${PREFIX}/sdc-simulator:${RELEASE}
- fi
+ if [ ${RUN_SIMULATOR} = true ]; then
+ echo "docker run sdc-webSimulator..."
+ if [ ${LOCAL} = false ]; then
+ docker pull ${PREFIX}/sdc-simulator:${RELEASE}
+ fi
- probe_sim
- if [ sim_stat=false ]; then
- docker run --detach --name sdc-sim --env JAVA_OPTIONS="${SIM_JAVA_OPTIONS}" --env ENVNAME="${DEP_ENV}" ${LOCAL_TIME_MOUNT_CMD} --volume ${WORKSPACE}/data/logs/WS/:/var/lib/jetty/logs --volume ${WORKSPACE}/data/environments:/root/chef-solo/environments --publish 8285:8080 --publish 8286:8443 ${PREFIX}/sdc-simulator:${RELEASE}
- echo "please wait while SDC-WEB-SIMULATOR is starting....."
- monitor_docker sdc-sim
+ probe_sim
+ sim_stat=$?
+ if [ sim_stat=1 ]; then
+ docker run \
+ --detach \
+ --name sdc-sim \
+ --env FE_URL="${FE_URL}" \
+ --env JAVA_OPTIONS="${SIM_JAVA_OPTIONS}" \
+ --env ENVNAME="${DEP_ENV}" \
+ ${LOCAL_TIME_MOUNT_CMD} \
+ --volume ${WORKSPACE}/data/logs/WS/:/var/lib/jetty/logs \
+ --volume ${WORKSPACE}/data/environments:/root/chef-solo/environments \
+ --publish 8285:8080 \
+ --publish 8286:8443 ${PREFIX}/sdc-simulator:${RELEASE}
+ echo "please wait while SDC-WEB-SIMULATOR is starting....."
+ monitor_docker sdc-sim
+ fi
fi
}
#
shift 1 ;
DOCKER=$1;
shift 1 ;;
-
+ # -sim | --simulator run the simulator
+ -sim | --simulator )
+ RUN_SIMULATOR=true;
+ shift 1 ;;
+ # -sim | --simulator run the simulator
+ -u | --fe_url )
+ shift 1 ;
+ FE_URL=$1;
+ shift 1 ;;
# -dcae | --dcae - Use this to deploy DCAE upon SDC
-dcae | --dcae )
shift 1 ;
dcae-tools
dcae-fe
healthCheck
+ sdc-sim
sdc-api-tests
sdc-ui-tests
else
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<executions>
<execution>
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>${mvn.war.version}</version>
<configuration>
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.0.2</version>
<executions>
<artifactId>docker-maven-plugin</artifactId>
<version>${mvn.docker.version}</version>
<configuration>
- <verbose>false</verbose>
<registry>nexus3.onap.org:10001</registry>
<authConfig>
<pull>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
</dependency>
- <!--<dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-core</artifactId>
- <version>1.3</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-library</artifactId>
- <version>1.3</version>
- <scope>test</scope>
- </dependency>-->
+
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-all</artifactId>
<scope>compile</scope>
</dependency>
- <!-- <dependency>
- <groupId>org.openecomp.sdc</groupId>
- <artifactId>dmaap-publisher</artifactId>
- <version>1.0.0</version>
- <scope>provided</scope>
- </dependency>-->
-
<dependency>
<groupId>org.openecomp.sdc</groupId>
<artifactId>common-app-api</artifactId>
<build>
<plugins>
-
- <!-- ============================================= -->
- <!-- Get the next build number -->
- <!-- ============================================= -->
- <!--<plugin> -->
- <!--<groupId>org.codehaus.mojo</groupId> -->
- <!--<artifactId>properties-maven-plugin</artifactId> -->
- <!--<version>1.0-alpha-1</version> -->
- <!--<inherited>false</inherited> -->
-
- <!--<executions> -->
- <!--<execution> -->
- <!--<id>tests</id> -->
- <!--<phase>initialize</phase> -->
- <!--<goals> -->
- <!--<goal>read-project-properties</goal> -->
- <!--</goals> -->
-
- <!--<configuration> -->
- <!--<files> -->
- <!--<file>../target/FullReleaseVersion.properties</file> -->
- <!--</files> -->
- <!--</configuration> -->
- <!--</execution> -->
- <!--</executions> -->
- <!--</plugin> -->
-
-
-
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
- <version>3.0.0</version>
<executions>
<execution>
- <id>clean.tosca.chef.os.folder</id>
+ <id>clean.testsuit.folder</id>
<phase>clean</phase>
<goals>
<goal>clean</goal>
</goals>
<configuration>
<filesets>
-
<!-- Sanity jar -->
<fileset>
<directory>${project.basedir}/sdc-api-tests</directory>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.7</version>
<configuration>
<skip>true</skip>
</configuration>
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>3.0.2</version>
<executions>
<execution>
<id>copy-tests-suites</id>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>${fabric8.version}</version>
-
<configuration>
- <verbose>true</verbose>
<apiVersion>1.23</apiVersion>
<registry>nexus3.onap.org:10001</registry>
<authConfig>
<scope>compile</scope>
</dependency>
- <!--<dependency>-->
- <!--<groupId>com.att.automation.common</groupId>-->
- <!--<artifactId>report-portal-integration</artifactId>-->
- <!--<version>RELEASE</version>-->
- <!--</dependency>-->
-
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<version>4.1.0</version>
</dependency>
-
-
-
-
</dependencies>
<build>
<plugins>
-<!-- <plugin> -->
-<!-- <groupId>org.apache.maven.plugins</groupId> -->
-<!-- <artifactId>maven-compiler-plugin</artifactId> -->
-<!-- <version>3.7.0</version> -->
-<!-- <configuration> -->
-<!-- <compilerArgument>-g:vars</compilerArgument> -->
-<!-- <debug>true</debug> -->
-<!-- <debuglevel>lines,vars,source</debuglevel> -->
-<!-- </configuration> -->
-<!-- </plugin> -->
-
-<!-- <plugin> -->
-<!-- <groupId>org.apache.maven.plugins</groupId> -->
-<!-- <artifactId>maven-surefire-plugin</artifactId> -->
-<!-- <version>2.19.1</version> -->
-<!-- <configuration> -->
-<!-- <suiteXmlFiles> -->
-<!-- <suiteXmlFile>${suiteXmlFile}</suiteXmlFile> -->
-<!-- </suiteXmlFiles> -->
-<!-- <argLine>-javaagent:${settings.localRepository}/org/aspectj/aspectjweaver/${aspectj.version}/aspectjweaver-${aspectj.version}.jar</argLine> -->
-<!-- </configuration> -->
-<!-- </plugin> -->
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
- <version>3.0.0</version>
<executions>
<execution>
<id>clean.tosca.chef.os.folder</id>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.7</version>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
-
- <!-- ============================================= -->
- <!-- Create the JAR file with its dependencies -->
- <!-- ============================================= -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
</execution>
</executions>
</plugin>
-
</plugins>
</build>
<profiles>
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>3.0.2</version>
<executions>
<execution>
<id>copy-tests-suites</id>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>${fabric8.version}</version>
-
<configuration>
- <verbose>true</verbose>
<apiVersion>1.23</apiVersion>
<registry>nexus3.onap.org:10001</registry>
<authConfig>
</plugin>
</plugins>
</build>
- <!--<repositories>-->
- <!--<repository>-->
</profile>
</profiles>
- <!--<id>nexus_att_repository_id</id>-->
- <!--<url>http://135.76.5.78:8083/nexus/content/groups/public</url>-->
- <!--</repository>-->
- <!--</repositories>-->
- <!--<pluginRepositories>-->
- <!--<pluginRepository>-->
- <!--<id>nexus_att_repository_id</id>-->
- <!--<url>http://135.76.5.78:8083/nexus/content/groups/public</url>-->
- <!--</pluginRepository>-->
- <!--</pluginRepositories>-->
</project>
</dependencies>
<build>
<finalName>WSSimulator-${project.version}</finalName>
- <plugins>
- <!-- ================================================== -->
- <!-- Set the JDK compiler version. -->
- <!-- ================================================== -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.5.1</version>
- <inherited>true</inherited>
- <configuration>
- <source>1.8</source>
- <target>1.8</target>
- </configuration>
- </plugin>
-
- </plugins>
</build>
<repositories>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
- <version>3.0.2</version>
<executions>
<execution>
<id>copy-resources-simulator</id>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>${fabric8.version}</version>
-
<configuration>
- <verbose>true</verbose>
<apiVersion>1.23</apiVersion>
<registry>nexus3.onap.org:10001</registry>
<authConfig>
Code Review / sdc.git / commitdiff