diff options
Diffstat (limited to 'client')
| -rw-r--r-- | client/client-deployment/pom.xml | 109 | ||||
| -rw-r--r-- | client/client-editor/pom.xml | 121 | ||||
| -rw-r--r-- | client/client-full/pom.xml | 12 | ||||
| -rw-r--r-- | client/client-monitoring/pom.xml | 109 |
4 files changed, 58 insertions, 293 deletions
diff --git a/client/client-deployment/pom.xml b/client/client-deployment/pom.xml index 149410a46..03e189953 100644 --- a/client/client-deployment/pom.xml +++ b/client/client-deployment/pom.xml @@ -1,7 +1,7 @@ <!-- ============LICENSE_START======================================================= Copyright (C) 2018 Ericsson. All rights reserved. - Modifications Copyright (C) 2019 Nordix Foundation. + Modifications Copyright (C) 2019-2020 Nordix Foundation. Modifications Copyright (C) 2020 Bell Canada. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); @@ -36,6 +36,20 @@ <dependency> <groupId>org.onap.policy.common</groupId> <artifactId>policy-endpoints</artifactId> + <exclusions> + <exclusion> + <groupId>org.onap.aaf.authz</groupId> + <artifactId>aaf-cadi-aaf</artifactId> + </exclusion> + <exclusion> + <groupId>com.att.nsa</groupId> + <artifactId>cambriaClient</artifactId> + </exclusion> + <exclusion> + <groupId>org.onap.dmaap.messagerouter.dmaapclient</groupId> + <artifactId>dmaapClient</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.onap.policy.apex-pdp.core</groupId> @@ -119,99 +133,6 @@ </execution> </executions> </plugin> - - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-shade-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>shade</goal> - </goals> - </execution> - </executions> - <configuration> - <finalName>${project.artifactId}-uber-${project.version}</finalName> - <shadedArtifactAttached>true</shadedArtifactAttached> - <shadedClassifierName>deployment</shadedClassifierName> - <artifactSet> - <includes> - <include>*:*</include> - </includes> - </artifactSet> - <filters> - <filter> - <artifact>*:*</artifact> - <excludes> - <exclude>META-INF/*.SF</exclude> - <exclude>META-INF/*.DSA</exclude> - <exclude>META-INF/*.RSA</exclude> - </excludes> - </filter> - </filters> - <transformers> - <transformer - implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" /> - <transformer - implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer"> - <resource>reference.conf</resource> - </transformer> - <transformer - implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> - <resource>log4j.properties</resource> - </transformer> - <transformer - implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> - <mainClass>org.onap.policy.apex.client.deployment.rest.ApexDeploymentRestMain</mainClass> - </transformer> - </transformers> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <classifier>ui</classifier> - <warSourceDirectory>src/main/resources/webapp</warSourceDirectory> - <webXml>src/main/resources/webapp/WEB-INF/web.xml</webXml> - </configuration> - <executions> - <execution> - <phase>prepare-package</phase> - <goals> - <goal>war</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>3.0.0</version> - <executions> - <execution> - <id>attach-artifacts</id> - <phase>package</phase> - <goals> - <goal>attach-artifact</goal> - </goals> - <configuration> - <artifacts> - <artifact> - <file>${project.build.directory}/${project.artifactId}-${project.version}-ui.war</file> - <type>war</type> - </artifact> - <artifact> - <file>${project.build.directory}/${project.artifactId}-uber-${project.version}.jar</file> - <type>uber.jar</type> - </artifact> - </artifacts> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build> diff --git a/client/client-editor/pom.xml b/client/client-editor/pom.xml index 41d27adc1..c9c7545f7 100644 --- a/client/client-editor/pom.xml +++ b/client/client-editor/pom.xml @@ -1,7 +1,7 @@ <!-- ============LICENSE_START======================================================= Copyright (C) 2018 Ericsson. All rights reserved. - Modifications Copyright (C) 2019 Nordix Foundation. + Modifications Copyright (C) 2019-2020 Nordix Foundation. Modifications Copyright (C) 2020 Bell Canada. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); @@ -36,10 +36,30 @@ <dependency> <groupId>org.onap.policy.common</groupId> <artifactId>policy-endpoints</artifactId> + <exclusions> + <exclusion> + <groupId>org.onap.aaf.authz</groupId> + <artifactId>aaf-cadi-aaf</artifactId> + </exclusion> + <exclusion> + <groupId>com.att.nsa</groupId> + <artifactId>cambriaClient</artifactId> + </exclusion> + <exclusion> + <groupId>org.onap.dmaap.messagerouter.dmaapclient</groupId> + <artifactId>dmaapClient</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.onap.policy.common</groupId> <artifactId>utils</artifactId> + <exclusions> + <exclusion> + <groupId>com.worldturner.medeia</groupId> + <artifactId>medeia-validator-gson</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.onap.policy.apex-pdp.model</groupId> @@ -58,6 +78,12 @@ <dependency> <groupId>org.glassfish.jersey.media</groupId> <artifactId>jersey-media-moxy</artifactId> + <exclusions> + <exclusion> + <groupId>org.eclipse.persistence</groupId> + <artifactId>org.eclipse.persistence.moxy</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.glassfish.jersey.test-framework.providers</groupId> @@ -131,99 +157,6 @@ </execution> </executions> </plugin> - - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-shade-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>shade</goal> - </goals> - </execution> - </executions> - <configuration> - <finalName>${project.artifactId}-uber-${project.version}</finalName> - <shadedArtifactAttached>true</shadedArtifactAttached> - <shadedClassifierName>editor</shadedClassifierName> - <artifactSet> - <includes> - <include>*:*</include> - </includes> - </artifactSet> - <filters> - <filter> - <artifact>*:*</artifact> - <excludes> - <exclude>META-INF/*.SF</exclude> - <exclude>META-INF/*.DSA</exclude> - <exclude>META-INF/*.RSA</exclude> - </excludes> - </filter> - </filters> - <transformers> - <transformer - implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" /> - <transformer - implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer"> - <resource>reference.conf</resource> - </transformer> - <transformer - implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> - <resource>log4j.properties</resource> - </transformer> - <transformer - implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> - <mainClass>org.onap.policy.apex.client.editor.rest.ApexEditorMain</mainClass> - </transformer> - </transformers> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <classifier>ui</classifier> - <warSourceDirectory>src/main/resources/webapp</warSourceDirectory> - <webXml>src/main/resources/webapp/WEB-INF/web.xml</webXml> - </configuration> - <executions> - <execution> - <phase>prepare-package</phase> - <goals> - <goal>war</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>3.0.0</version> - <executions> - <execution> - <id>attach-artifacts</id> - <phase>package</phase> - <goals> - <goal>attach-artifact</goal> - </goals> - <configuration> - <artifacts> - <artifact> - <file>${project.build.directory}/${project.artifactId}-${project.version}-ui.war</file> - <type>war</type> - </artifact> - <artifact> - <file>${project.build.directory}/${project.artifactId}-uber-${project.version}.jar</file> - <type>uber.jar</type> - </artifact> - </artifacts> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build> diff --git a/client/client-full/pom.xml b/client/client-full/pom.xml index dd9d78cb7..7bf054539 100644 --- a/client/client-full/pom.xml +++ b/client/client-full/pom.xml @@ -1,7 +1,7 @@ <!-- ============LICENSE_START======================================================= Copyright (C) 2018 Ericsson. All rights reserved. - Modifications Copyright (C) 2019 Nordix Foundation. + Modifications Copyright (C) 2019-2020 Nordix Foundation. Modifications Copyright (C) 2020 Bell Canada. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); @@ -80,16 +80,6 @@ </dependencies> <build> -<!-- - <resources> - <resource> - <directory>src/main/resources</directory> - <includes> - <include>webapp/**/*.*</include> - </includes> - </resource> - </resources> ---> <defaultGoal>install</defaultGoal> <outputDirectory>${project.build.directory}/classes</outputDirectory> <plugins> diff --git a/client/client-monitoring/pom.xml b/client/client-monitoring/pom.xml index bd9893bef..f9e10de85 100644 --- a/client/client-monitoring/pom.xml +++ b/client/client-monitoring/pom.xml @@ -1,7 +1,7 @@ <!-- ============LICENSE_START======================================================= Copyright (C) 2018 Ericsson. All rights reserved. - Modifications Copyright (C) 2019 Nordix Foundation. + Modifications Copyright (C) 2019-2020 Nordix Foundation. Modifications Copyright (C) 2020 Bell Canada. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); @@ -36,6 +36,20 @@ <dependency> <groupId>org.onap.policy.common</groupId> <artifactId>policy-endpoints</artifactId> + <exclusions> + <exclusion> + <groupId>org.onap.aaf.authz</groupId> + <artifactId>aaf-cadi-aaf</artifactId> + </exclusion> + <exclusion> + <groupId>com.att.nsa</groupId> + <artifactId>cambriaClient</artifactId> + </exclusion> + <exclusion> + <groupId>org.onap.dmaap.messagerouter.dmaapclient</groupId> + <artifactId>dmaapClient</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.onap.policy.apex-pdp.core</groupId> @@ -114,99 +128,6 @@ </execution> </executions> </plugin> - - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-shade-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>shade</goal> - </goals> - </execution> - </executions> - <configuration> - <finalName>${project.artifactId}-uber-${project.version}</finalName> - <shadedArtifactAttached>true</shadedArtifactAttached> - <shadedClassifierName>monitoring</shadedClassifierName> - <artifactSet> - <includes> - <include>*:*</include> - </includes> - </artifactSet> - <filters> - <filter> - <artifact>*:*</artifact> - <excludes> - <exclude>META-INF/*.SF</exclude> - <exclude>META-INF/*.DSA</exclude> - <exclude>META-INF/*.RSA</exclude> - </excludes> - </filter> - </filters> - <transformers> - <transformer - implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" /> - <transformer - implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer"> - <resource>reference.conf</resource> - </transformer> - <transformer - implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> - <resource>log4j.properties</resource> - </transformer> - <transformer - implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> - <mainClass>org.onap.policy.apex.client.monitoring.rest.ApexMonitoringRestMain</mainClass> - </transformer> - </transformers> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <classifier>ui</classifier> - <warSourceDirectory>src/main/resources/webapp</warSourceDirectory> - <webXml>src/main/resources/webapp/WEB-INF/web.xml</webXml> - </configuration> - <executions> - <execution> - <phase>prepare-package</phase> - <goals> - <goal>war</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>3.0.0</version> - <executions> - <execution> - <id>attach-artifacts</id> - <phase>package</phase> - <goals> - <goal>attach-artifact</goal> - </goals> - <configuration> - <artifacts> - <artifact> - <file>${project.build.directory}/${project.artifactId}-${project.version}-ui.war</file> - <type>war</type> - </artifact> - <artifact> - <file>${project.build.directory}/${project.artifactId}-uber-${project.version}.jar</file> - <type>uber.jar</type> - </artifact> - </artifacts> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build> |