============LICENSE_START=======================================================
ONAP Policy Engine
================================================================================
- Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
================================================================================
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
limitations under the License.
============LICENSE_END=========================================================
-->
-
<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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.onap.policy.engine</groupId>
<artifactId>PolicyEngineSuite</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</parent>
<artifactId>ONAP-SDK-APP</artifactId>
<packaging>war</packaging>
<properties>
<encoding>UTF-8</encoding>
- <epsdk.version>1.3.1</epsdk.version>
+ <epsdk.version>2.1.0</epsdk.version>
<springframework.version>4.2.0.RELEASE</springframework.version>
<hibernate.version>4.3.11.Final</hibernate.version>
<!-- Skip assembling the zip; assemble via mvn -Dskipassembly=false .. -->
<skipassembly>true</skipassembly>
<!-- Tests usually require some setup that maven cannot do, so skip. -->
- <jackson.version>2.6.0</jackson.version>
- <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**,src/main/webapp/**/*</sonar.exclusions>
+ <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**,src/main/webapp/**/*</sonar.exclusions>
+ <!-- Version number gets stored only here -->
+ <tomcat.download.path>http://archive.apache.org/dist/tomcat/tomcat-8/v8.0.37/bin</tomcat.download.path>
+ <tomcat.download.name>apache-tomcat-8.0.37</tomcat.download.name>
</properties>
<profiles>
<!-- disable doclint, a new feature in Java 8, when generating javadoc -->
<artifactId>maven-war-plugin</artifactId>
<version>2.1</version>
<configuration>
- <attachClasses>true</attachClasses>
+
<attachClasses>true</attachClasses>
<archive>
<manifest>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
<groupId>org.onap.portal.sdk</groupId>
<artifactId>epsdk-app-overlay</artifactId>
<excludes>
- <exclude>static/fusion/raptor/uigrid/vfs_fonts.js</exclude>
- </excludes>
+ <exclude>static/fusion/raptor/uigrid/vfs_fonts.js</exclude>
+ </excludes>
</overlay>
<overlay>
<groupId>org.onap.policy.engine</groupId>
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>3.0.0</version>
- <configuration>
- <skipAssembly>${skipassembly}</skipAssembly>
- <descriptors>
- <descriptor>${basedir}/distribution.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>3.0.0</version>
+ <configuration>
+ <skipAssembly>${skipassembly}</skipAssembly>
+ <descriptors>
+ <descriptor>${basedir}/distribution.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <!-- parent specifies the<version>2.8</version> -->
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>io.fabric8</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <version>0.22.0</version>
+ <configuration>
+ <verbose>true</verbose>
+ <images>
+ <image>
+ <name>onap/portal-sdk:${project.version}</name>
+ <build>
+ <from>frolvlad/alpine-oraclejdk8:slim</from>
+ <assembly>
+ <descriptorRef>artifact</descriptorRef>
+ </assembly>
+ <runCmds>
+ <!-- must be all on one line; use CDATA to turn off the Eclipse
+ formatter -->
+ <run><![CDATA[wget -q ${tomcat.download.path}/${tomcat.download.name}.tar.gz]]></run>
+ <run>tar -xzf ${tomcat.download.name}.tar.gz</run>
+ <run>rm -f ${tomcat.download.name}.tar.gz</run>
+ <run>rm -fr ${tomcat.download.name}/webapps/[a-z]*</run>
+ <run>mkdir -p /opt</run>
+ <run>mv ${tomcat.download.name} /opt</run>
+ <run><![CDATA[mv /maven/*.war /opt/${tomcat.download.name}/webapps/ONAPPORTALSDK.war]]></run>
+ </runCmds>
+ <cmd>
+ <shell>/opt/${tomcat.download.name}/bin/catalina.sh run</shell>
+ </cmd>
+ </build>
+ </image>
+ </images>
+ </configuration>
+ </plugin>
+
</plugins>
</build>
<dependencies>
- <!-- Policy overlay war -->
+ <!-- Policy overlay war -->
<dependency>
<groupId>org.onap.policy.engine</groupId>
<artifactId>POLICY-SDK-APP</artifactId>
<type>jar</type>
</dependency>
<!-- SDK components -->
+ <!--
+ CLM security fix - force use of commons-collections 3.2.2.
+ Remove this if a new version of epsdk-core is upgraded
+ to not use esapi (and then subsequently commons-collections v3.2
+ -->
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2.2</version>
+ </dependency>
<dependency>
<groupId>org.onap.portal.sdk</groupId>
<artifactId>epsdk-core</artifactId>
<exclusions>
<exclusion>
<groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
+ <artifactId>mysql-connector-java</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
</exclusion>
</exclusions>
</dependency>
<artifactId>epsdk-workflow</artifactId>
<version>${epsdk.version}</version>
</dependency>
- <dependency>
- <groupId>com.att.eelf</groupId>
- <artifactId>eelf-core</artifactId>
- <version>0.0.1</version>
- </dependency>
- <!-- bridge to implement commons-logging using slf4j -->
+ <!-- bridge to implement commons-logging using slf4j -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
Code Review / policy / engine.git / blobdiff