diff options
| author |   Liam Fallon <liam.fallon@ericsson.com> | 2018-08-30 08:09:41 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-08-30 08:09:41 +0000 |
| commit | 94c5d04411a455586f7e61e707d30bdbc8515b13 (patch) | |
| tree | 0da892450f207290768747bb9bc8632764e0a6f5 /packages | |
| parent | 7c856ba6b8a5d3e4826a2a757a58889f57cae7e4 (diff) | |
| parent | fd307bef420c111df269c7ac911093a75ab802b3 (diff) | |
Merge "Set parent to policy/parent"
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/base/pom.xml | 143 | ||||
| -rw-r--r-- | packages/docker/pom.xml | 179 |
2 files changed, 163 insertions, 159 deletions
diff --git a/packages/base/pom.xml b/packages/base/pom.xml index 6d4ae970..c97d1021 100644 --- a/packages/base/pom.xml +++ b/packages/base/pom.xml @@ -2,7 +2,7 @@ ============LICENSE_START======================================================= Policy Packages ================================================================================ - 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. @@ -18,79 +18,84 @@ ============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"> +<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> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.onap.policy.drools-pdp</groupId> - <artifactId>packages</artifactId> - <version>1.3.0-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.onap.policy.drools-pdp</groupId> + <artifactId>packages</artifactId> + <version>1.3.0-SNAPSHOT</version> + </parent> - <artifactId>base</artifactId> - <packaging>pom</packaging> + <artifactId>base</artifactId> + <packaging>pom</packaging> - <name>Base Package</name> - <description>ONAP Policy Drools PDP Packaging</description> + <name>Base Package</name> + <description>ONAP Policy Drools PDP Packaging</description> - <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>single</goal> - </goals> - <phase>package</phase> - <configuration> - <descriptors> - <descriptor>src/assembly/zip.xml</descriptor> - </descriptors> - <appendAssemblyId>false</appendAssemblyId> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>single</goal> + </goals> + <phase>package</phase> + <configuration> + <descriptors> + <descriptor>src/assembly/zip.xml</descriptor> + </descriptors> + <appendAssemblyId>false</appendAssemblyId> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> - <profiles> - <profile> - <id>unix_pe_version</id> - <activation> - <os> - <family>!windows</family> - </os> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <version>1.5.0</version> - <executions> - <execution> - <id>create-version-file</id> - <goals> - <goal>exec</goal> - </goals> - <phase>prepare-package</phase> - <configuration> - <executable>/bin/bash</executable> - <arguments> - <argument>-c</argument> - <argument>mkdir -p target ; echo -e 'version="${project.version}"\ndescription="ONAP Drools PDP"\nbuildTag="'"${BUILD_TAG}"'"\ncommit="'"${GIT_COMMIT}"'"\ntimestamp="${maven.build.timestamp}"' >target/build.info</argument> - </arguments> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> + <profiles> + <profile> + <id>unix_pe_version</id> + <activation> + <os> + <family>!windows</family> + </os> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <executions> + <execution> + <id>create-version-file</id> + <goals> + <goal>exec</goal> + </goals> + <phase>prepare-package</phase> + <configuration> + <executable>/bin/bash</executable> + <arguments> + <argument>-c</argument> + <argument>mkdir -p target ; echo + -e + 'version="${project.version}"\ndescription="ONAP + Drools + PDP"\nbuildTag="'"${BUILD_TAG}"'"\ncommit="'"${GIT_COMMIT}"'"\ntimestamp="${maven.build.timestamp}"' + >target/build.info</argument> + </arguments> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml index e62a4396..e666ab72 100644 --- a/packages/docker/pom.xml +++ b/packages/docker/pom.xml @@ -2,7 +2,7 @@ ============LICENSE_START======================================================= ONAP Policy Engine - Docker files ================================================================================ - 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. @@ -18,101 +18,100 @@ ============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"> +<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> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.onap.policy.drools-pdp</groupId> - <artifactId>packages</artifactId> - <version>1.3.0-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.onap.policy.drools-pdp</groupId> + <artifactId>packages</artifactId> + <version>1.3.0-SNAPSHOT</version> + </parent> - <artifactId>docker</artifactId> - <packaging>pom</packaging> - <name>Policy Drools PDP - Docker build</name> - <description>ONAP Policy Drools PDP Docker Build</description> + <artifactId>docker</artifactId> + <packaging>pom</packaging> + <name>Policy Drools PDP - Docker build</name> + <description>ONAP Policy Drools PDP Docker Build</description> - <properties> - <nexusproxy>https://nexus.onap.org</nexusproxy> - </properties> + <properties> + <nexusproxy>https://nexus.onap.org</nexusproxy> + </properties> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy-drools-zip</id> - <phase>prepare-package</phase> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <outputDirectory>${project.build.directory}/policy-drools</outputDirectory> - <overWriteReleases>false</overWriteReleases> - <overWriteSnapshots>true</overWriteSnapshots> - <artifactItems> - <artifactItem> - <groupId>org.onap.policy.drools-pdp</groupId> - <artifactId>install-drools</artifactId> - <version>${project.version}</version> - <type>zip</type> - <destFileName>install-drools.zip</destFileName> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <version>3.0.2</version> - <executions> - <execution> - <id>copy-resources</id> - <phase>prepare-package</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${project.build.directory}/policy-drools</outputDirectory> - <resources> - <resource> - <directory>src/main/docker</directory> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy-drools-zip</id> + <phase>prepare-package</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <outputDirectory>${project.build.directory}/policy-drools</outputDirectory> + <overWriteReleases>false</overWriteReleases> + <overWriteSnapshots>true</overWriteSnapshots> + <artifactItems> + <artifactItem> + <groupId>org.onap.policy.drools-pdp</groupId> + <artifactId>install-drools</artifactId> + <version>${project.version}</version> + <type>zip</type> + <destFileName>install-drools.zip</destFileName> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <executions> + <execution> + <id>copy-resources</id> + <phase>prepare-package</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${project.build.directory}/policy-drools</outputDirectory> + <resources> + <resource> + <directory>src/main/docker</directory> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <version>1.6.0</version> - <executions> - <execution> - <id>get-target-version</id> - <phase>prepare-package</phase> - <goals> - <goal>exec</goal> - </goals> - </execution> - </executions> - <configuration> - <executable>echo</executable> - <workingDirectory>${project.build.directory}</workingDirectory> - <arguments> - <argument>${project.version}</argument> - </arguments> - <outputFile>${project.build.directory}/version</outputFile> - </configuration> - </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <executions> + <execution> + <id>get-target-version</id> + <phase>prepare-package</phase> + <goals> + <goal>exec</goal> + </goals> + </execution> + </executions> + <configuration> + <executable>echo</executable> + <workingDirectory>${project.build.directory}</workingDirectory> + <arguments> + <argument>${project.version}</argument> + </arguments> + <outputFile>${project.build.directory}/version</outputFile> + </configuration> + </plugin> - </plugins> - </build> + </plugins> + </build> </project> |