diff options
Diffstat (limited to 'client/client-deployment')
| -rw-r--r-- | client/client-deployment/pom.xml | 103 | ||||
| -rw-r--r-- | client/client-deployment/src/main/assembly/resources.xml | 32 |
2 files changed, 74 insertions, 61 deletions
diff --git a/client/client-deployment/pom.xml b/client/client-deployment/pom.xml index 02ecb4ae6..25972ea47 100644 --- a/client/client-deployment/pom.xml +++ b/client/client-deployment/pom.xml @@ -37,11 +37,6 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>org.onap.policy.apex-pdp.client</groupId> - <artifactId>client-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> <groupId>org.glassfish.jersey.containers</groupId> <artifactId>jersey-container-grizzly2-http</artifactId> <version>${version.jersey}</version> @@ -65,42 +60,67 @@ <groupId>commons-cli</groupId> <artifactId>commons-cli</artifactId> </dependency> + + <dependency> + <groupId>org.onap.policy.apex-pdp.client</groupId> + <artifactId>client-common</artifactId> + <version>${project.version}</version> + <classifier>resources</classifier> + <type>zip</type> + <scope>provided</scope> + </dependency> + </dependencies> <build> <defaultGoal>install</defaultGoal> <outputDirectory>${project.build.directory}/classes</outputDirectory> <plugins> - <!-- Copy common resources to this client's webapp directory --> + +<!-- https://blog.sonatype.com/2008/04/how-to-share-resources-across-projects-in-maven/ --> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> <executions> <execution> - <id>unpack-examples</id> - <phase>validate</phase> + <id>unpack-shared-resources</id> <goals> - <goal>unpack</goal> + <goal>unpack-dependencies</goal> </goals> + <phase>generate-resources</phase> <configuration> - <artifactItems> - <artifactItem> - <groupId>org.onap.policy.apex-pdp.client</groupId> - <artifactId>client-common</artifactId> - <version>${project.version}</version> - <type>jar</type> - <overWrite>false</overWrite> - <outputDirectory>${project.build.directory}/classes/webapp</outputDirectory> - <excludes>META-INF/</excludes> - </artifactItem> - </artifactItems> - <overWriteReleases>true</overWriteReleases> - <overWriteSnapshots>true</overWriteSnapshots> + <outputDirectory>${project.build.directory}/classes/webapp</outputDirectory> + <!--use as much as needed to be specific...also scope,type,classifier etc--> + <includeArtifacIds>client-common</includeArtifacIds> + <includeGroupIds>org.onap.policy.apex-pdp.client</includeGroupIds> + <excludeTransitive>true</excludeTransitive> + <excludeTransitive>true</excludeTransitive> + <excludeTypes>jar</excludeTypes> + <includeTypes>zip</includeTypes> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>make shared resources</id> + <goals> + <goal>single</goal> + </goals> + <phase>package</phase> + <configuration> + <descriptors> + <descriptor>src/main/assembly/resources.xml</descriptor> + </descriptors> </configuration> </execution> </executions> </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> @@ -197,45 +217,6 @@ <profiles> <profile> - <id>only-eclipse</id> - <activation> - <property> - <name>m2e.version</name> - </property> - </activation> - <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.eclipse.m2e</groupId> - <artifactId>lifecycle-mapping</artifactId> - <version>1.0.0</version> - <configuration> - <lifecycleMappingMetadata> - <pluginExecutions> - <pluginExecution> - <pluginExecutionFilter> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <versionRange>[2.0,)</versionRange> - <goals> - <goal>unpack</goal> - </goals> - </pluginExecutionFilter> - <action> - <ignore /> - </action> - </pluginExecution> - </pluginExecutions> - </lifecycleMappingMetadata> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> - </profile> - - <profile> <id>apexSite</id> <activation> <property> diff --git a/client/client-deployment/src/main/assembly/resources.xml b/client/client-deployment/src/main/assembly/resources.xml new file mode 100644 index 000000000..f0632c54e --- /dev/null +++ b/client/client-deployment/src/main/assembly/resources.xml @@ -0,0 +1,32 @@ +<!-- + ============LICENSE_START======================================================= + Copyright (C) 2018 Ericsson. 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. + 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. + See the License for the specific language governing permissions and + limitations under the License. + + SPDX-License-Identifier: Apache-2.0 + ============LICENSE_END========================================================= +--> +<assembly> + <id>resources</id> + <formats> + <format>zip</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <fileSets> + <fileSet> + <directory>target/classes/webapp</directory> + <outputDirectory>deployment</outputDirectory> + </fileSet> + </fileSets> +</assembly>
\ No newline at end of file |