diff options
| author |   liamfallon <liam.fallon@ericsson.com> | 2018-11-10 00:39:12 +0000 |
|---|---|---|
| committer | liamfallon <liam.fallon@ericsson.com> | 2018-11-12 11:07:31 +0000 |
| commit | 32497610bd7bc721bb73f0d753fc1426bba677e2 (patch) | |
| tree | 44167f3feb03c84b3cff784d9758b03528f1eb0b /client/client-monitoring/pom.xml | |
| parent | 53d8916cc60d97e2ce7ae345f8cc25f5602567da (diff) | |
Clean up eclipse and document warnings
Parent versions in some POMs only called on the test profile
were incorrect
Warnings in Eclipse on POM including from outside its project
are fixed
Some checkstyle fixes
Some javadoc warnings fixed
Issue-ID: POLICY-954
Change-Id: I640bc842dc79a9fa580015abb9a76c84a7845efe
Signed-off-by: liamfallon <liam.fallon@ericsson.com>
Diffstat (limited to 'client/client-monitoring/pom.xml')
| -rw-r--r-- | client/client-monitoring/pom.xml | 105 |
1 files changed, 56 insertions, 49 deletions
diff --git a/client/client-monitoring/pom.xml b/client/client-monitoring/pom.xml index 61c1775b7..17f2cc178 100644 --- a/client/client-monitoring/pom.xml +++ b/client/client-monitoring/pom.xml @@ -39,9 +39,6 @@ <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> <dependency> <groupId>org.glassfish.jersey.containers</groupId> @@ -73,65 +70,36 @@ <defaultGoal>install</defaultGoal> <outputDirectory>${project.build.directory}/classes</outputDirectory> <plugins> + <!-- Copy common resources to this client's webapp directory --> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> <executions> <execution> - <id>unpack-client-monitoring-shared-resources</id> - <goals> - <goal>unpack-dependencies</goal> - </goals> + <id>unpack-examples</id> <phase>validate</phase> - <configuration> - <outputDirectory>${project.build.directory}/${project.artifactId}-${project.version}</outputDirectory> - <includeArtifacIds>client-common</includeArtifacIds> - <includeGroupIds>${project.groupId}</includeGroupIds> - <excludeTransitive>true</excludeTransitive> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-resources-plugin</artifactId> - <executions> - <execution> - <id>copy-common-resources-to-jar</id> - <phase>initialize</phase> <goals> - <goal>copy-resources</goal> + <goal>unpack</goal> </goals> <configuration> - <outputDirectory>${project.build.directory}/classes/webapp</outputDirectory> - <filtering>false</filtering> - <resources> - <resource> - <directory>../client-common/src/main/resources</directory> - </resource> - </resources> - <overwrite>true</overwrite> - </configuration> - </execution> - <execution> - <id>copy-local-resources-to-jar</id> - <phase>generate-sources</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${project.build.directory}/classes/webapp</outputDirectory> - <filtering>false</filtering> - <resources> - <resource> - <directory>src/main/resources/webapp</directory> - </resource> - </resources> - <overwrite>true</overwrite> + <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> </configuration> </execution> </executions> </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> @@ -224,6 +192,45 @@ <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> |