Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.clamp</groupId>
<artifactId>clds</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- <name>ONAP CLAMP</name>
+ <version>1.1.0</version>
+ <name>clamp</name>
- <parent>
+ <parent>
<groupId>org.onap.oparent</groupId>
<artifactId>oparent</artifactId>
<version>1.0.0-SNAPSHOT</version>
- org.onap.clamp.config.files.cldsPolicyConfig=classpath:/clds/clds-policy-config.properties
- org.onap.clamp.config.files.cldsUsers=classpath:/clds/clds-users.json
- org.onap.clamp.config.files.globalClds=classpath:/clds/globalClds.properties
-
+
</description>
<properties>
+ <maven.build.timestamp.format>yyyy.MM.dd'T'hh.mm.ss'Z'</maven.build.timestamp.format>
+ <clamp.project.version>${project.version}</clamp.project.version>
+ <clamp.build.timestamp>${maven.build.timestamp}</clamp.build.timestamp>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<skip.docker.build>true</skip.docker.build>
<skip.docker.push>true</skip.docker.push>
<skip.staging.artifacts>false</skip.staging.artifacts>
-
- <nexusproxy>https://nexus.onap.org</nexusproxy>
- <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
- <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
- <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
- <sitePath>/content/sites/site/org/onap/clamp/${project.version}</sitePath>
</properties>
<distributionManagement>
<repository>
<id>ecomp-releases</id>
<name>Clamp Release Repository</name>
- <url>${nexusproxy}/${releaseNexusPath}</url>
+ <url>https://nexus.onap.org/content/repositories/releases/</url>
</repository>
<snapshotRepository>
<id>ecomp-snapshots</id>
<name>Clamp Snapshot Repository</name>
- <url>${nexusproxy}/${snapshotNexusPath}</url>
+ <url>https://nexus.onap.org/content/repositories/snapshots/</url>
</snapshotRepository>
<site>
<id>ecomp-site</id>
- <url>dav:${nexusproxy}${sitePath}</url>
+ <url>dav:https://nexus.onap.org/content/sites/site/org/onap/clamp/${project.version}</url>
</site>
</distributionManagement>
<repository>
<id>ecomp-releases</id>
<name>ONAP Release Repository</name>
- <url>${nexusproxy}/${releaseNexusPath}</url>
+ <url>https://nexus.onap.org/content/repositories/releases/</url>
</repository>
<repository>
<id>ecomp-staging</id>
<name>ONAP Staging Repository</name>
- <url>${nexusproxy}/${stagingNexusPath}</url>
+ <url>https://nexus.onap.org/content/repositories/staging/</url>
</repository>
<repository>
<id>ecomp-snapshots</id>
<name>ONAP Snapshot Repository</name>
- <url>${nexusproxy}/${snapshotNexusPath}</url>
+ <url>https://nexus.onap.org/content/repositories/snapshots/</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
<groupId>com.att.ajsc</groupId>
<artifactId>sdk-java-camunda-core</artifactId>
<version>${sdk.camunda.core}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- Spring Mail -->
<dependency>
<dependency>
<groupId>org.onap.policy.engine</groupId>
<artifactId>PolicyEngineAPI</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<exclusions>
<exclusion>
<artifactId>log4j</artifactId>
<artifactId>jackson-databind</artifactId>
<groupId>com.fasterxml.jackson.core</groupId>
</exclusion>
+ <exclusion>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.onap.policy.common</groupId>
<artifactId>ONAP-Logging</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0</version>
<exclusions>
<exclusion>
<artifactId>log4j</artifactId>
<version>2.1.7</version>
</dependency>
+ <!-- Remove the MYSQL connector and replace it by Mariadb -->
+ <dependency>
+ <groupId>org.mariadb.jdbc</groupId>
+ <artifactId>mariadb-java-client</artifactId>
+ <version>2.1.1</version>
+ </dependency>
</dependencies>
<build>
</resources>
<plugins>
+ <plugin>
+ <groupId>org.codehaus.groovy.maven</groupId>
+ <artifactId>gmaven-plugin</artifactId>
+ <version>1.0</version>
+ <executions>
+ <execution>
+ <phase>validate</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ <configuration>
+ <source>${project.basedir}/src/main/script/TagVersion.groovy</source>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>1.6.7</version>
<extensions>true</extensions>
<configuration>
- <nexusUrl>${nexusproxy}</nexusUrl>
+ <nexusUrl>https://nexus.onap.org</nexusUrl>
<stagingProfileId>176c31dfe190a</stagingProfileId>
<serverId>ecomp-staging</serverId>
<skipNexusStagingDeployMojo>${skip.staging.artifacts}</skipNexusStagingDeployMojo>
<dockerDirectory>src/main/docker</dockerDirectory>
<serverId>docker-hub</serverId>
<imageTags>
- <imageTag>${project.version}</imageTag>
<imageTag>latest</imageTag>
+ <imageTag>${project.docker.latesttagtimestamp.version}</imageTag>
+ <imageTag>${project.docker.latesttag.version}</imageTag>
</imageTags>
<forceTags>true</forceTags>
<resources>
</buildArgs>
</configuration>
</execution>
+
+ <execution>
+ <id>tag-image-latest-timestamp</id>
+ <phase>package</phase>
+ <goals>
+ <goal>tag</goal>
+ </goals>
+ <configuration>
+ <image>onap/clamp</image>
+ <newName>${docker.push.registry}/onap/clamp:${project.docker.latesttagtimestamp.version}</newName>
+ <skipDockerTag>${skip.docker.push}</skipDockerTag>
+ </configuration>
+ </execution>
+ <execution>
+ <id>push-image-latest-timestamp</id>
+ <phase>deploy</phase>
+ <goals>
+ <goal>push</goal>
+ </goals>
+ <configuration>
+ <imageName>${docker.push.registry}/onap/clamp:${project.docker.latesttagtimestamp.version}</imageName>
+ <skipDockerPush>${skip.docker.push}</skipDockerPush>
+ </configuration>
+ </execution>
+ <execution>
+ <id>tag-image-latest</id>
+ <phase>package</phase>
+ <goals>
+ <goal>tag</goal>
+ </goals>
+ <configuration>
+ <image>onap/clamp</image>
+ <newName>${docker.push.registry}/onap/clamp:${project.docker.latesttag.version}</newName>
+ <skipDockerTag>${skip.docker.push}</skipDockerTag>
+ </configuration>
+ </execution>
+ <execution>
+ <id>push-image-latest</id>
+ <phase>deploy</phase>
+ <goals>
+ <goal>push</goal>
+ </goals>
+ <configuration>
+ <imageName>${docker.push.registry}/onap/clamp:${project.docker.latesttag.version}</imageName>
+ <skipDockerPush>${skip.docker.push}</skipDockerPush>
+ </configuration>
+ </execution>
<execution>
<id>tag-image</id>
<phase>package</phase>
</goals>
<configuration>
<image>onap/clamp</image>
- <newName>${docker.push.registry}/onap/clamp</newName>
+ <newName>${docker.push.registry}/onap/clamp:latest</newName>
<skipDockerTag>${skip.docker.push}</skipDockerTag>
</configuration>
</execution>
<goal>push</goal>
</goals>
<configuration>
- <imageName>${docker.push.registry}/onap/clamp</imageName>
+ <imageName>${docker.push.registry}/onap/clamp:latest</imageName>
<skipDockerPush>${skip.docker.push}</skipDockerPush>
</configuration>
</execution>
</volumes>
<wait>
<log>socket: '/var/run/mysqld/mysqld.sock' port: 3306 mariadb.org binary distribution</log>
- <time>300000</time>
+ <time>600000</time>
</wait>
<ports>
<port>${docker.mariadb.port.host}:3306</port>
</configuration>
</execution>
<execution>
- <goals>
- <goal>merge</goal>
- </goals>
- <phase>post-integration-test</phase>
- <configuration>
- <fileSets>
- <fileSet implementation="org.apache.maven.shared.model.fileset.FileSet">
- <directory>${project.build.directory}/coverage-reports</directory>
- <includes>
- <include>*.exec</include>
- </includes>
- </fileSet>
- </fileSets>
- <destFile>${project.build.directory}/jacoco-dev.exec</destFile>
- </configuration>
- </execution>
+ <goals>
+ <goal>merge</goal>
+ </goals>
+
<phase>post-integration-test</phase>
+ <configuration>
+ <fileSets>
+ <fileSet implementation="org.apache.maven.shared.model.fileset.FileSet">
+ <directory>${project.build.directory}/coverage-reports</directory>
+ <includes>
+ <include>*.exec</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+ <destFile>${project.build.directory}/jacoco-dev.exec</destFile>
+ </configuration>
+ </execution>
</executions>
</plugin>
Code Review / clamp.git / blobdiff