X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=appc-directed-graph%2Fdg-loader%2Fprovider%2Fpom.xml;h=3581783611857cab3a5f67cb692050e35b30cdce;hb=7346763fac123b7a5745bb6a18eaf1140b82779b;hp=c074ca6d8a2d34a0fb37faf1f55ecef0c2b139a3;hpb=50fdfca221554d0433b7608777285ec94b7a1b62;p=appc.git

diff --git a/appc-directed-graph/dg-loader/provider/pom.xml b/appc-directed-graph/dg-loader/provider/pom.xml
index c074ca6d8..358178361 100644
--- a/appc-directed-graph/dg-loader/provider/pom.xml
+++ b/appc-directed-graph/dg-loader/provider/pom.xml
@@ -3,7 +3,7 @@
   ============LICENSE_START=======================================================
   ONAP : APPC
   ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+  Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
   ================================================================================
   Copyright (C) 2017 Amdocs
   =============================================================================
@@ -19,16 +19,15 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 
-  ECOMP is a trademark and service mark of AT&T Intellectual Property.
   ============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">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.openecomp.appc.plugins</groupId>
+        <groupId>org.onap.appc.plugins</groupId>
         <artifactId>dg-loader</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.6.4</version>
     </parent>
     <artifactId>dg-loader-provider</artifactId>
     <packaging>bundle</packaging>
@@ -36,7 +35,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.openecomp.sdnc.core</groupId>
+            <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>sli-provider</artifactId>
             <version>${sdnctl.sli.version}</version>
             <scope>compile</scope>
@@ -64,6 +63,11 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
@@ -73,9 +77,9 @@
             <artifactId>jcl-over-slf4j</artifactId>
         </dependency>
        <dependency>
-		<groupId>org.powermock</groupId>
+        <groupId>org.powermock</groupId>
                 <artifactId>powermock-api-mockito</artifactId>
-                <version>1.6.2</version>
+                <version>1.6.4</version>
                 <scope>test</scope>
         </dependency>
         <dependency>
@@ -95,11 +99,12 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>org.openecomp.sdnc.dg.loader</Bundle-SymbolicName>
-                        <Bundle-Activator>org.openecomp.sdnc.dg.loader.DGLoaderActivator</Bundle-Activator>
-                        <Export-Package>org.openecomp.sdnc.dg.loader</Export-Package>
+                        <Bundle-SymbolicName>org.onap.sdnc.dg.loader</Bundle-SymbolicName>
+                        <Bundle-Activator>org.onap.sdnc.dg.loader.DGLoaderActivator</Bundle-Activator>
+                        <Export-Package>org.onap.sdnc.dg.loader</Export-Package>
                         <Import-Package>*</Import-Package>
                         <DynamicImport-Package>*</DynamicImport-Package>
+                        <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
                     </instructions>
                     <manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation>
                 </configuration>
@@ -116,7 +121,7 @@
                     <finalName>dg-loader</finalName>
                     <archive>
                         <manifest>
-                            <mainClass>org.openecomp.sdnc.dg.loader.DGXMLLoadNActivate</mainClass>
+                            <mainClass>org.onap.sdnc.dg.loader.DGXMLLoadNActivate</mainClass>
                         </manifest>
                     </archive>
                     <attach>false</attach>
@@ -131,43 +136,37 @@
                     </execution>
                 </executions>
             </plugin>
+            <!-- Adding this plugin to be able to deploy the dg-loader JAR with dependencies to the Nexus Repo.
+                 This is needed to be able to run the java cmds in 
+                 deployment.git/platform-logic/installer/src/main/scripts/install-converted-dgs.sh -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>2.0</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <filters>
+                                <filter>
+                                    <artifact>*:*</artifact>
+                                    <excludes>
+                                        <exclude>META-INF/*.SF</exclude>
+                                        <exclude>META-INF/*.DSA</exclude>
+                                        <exclude>META-INF/*.RSA</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
+                            <shadedArtifactAttached>true</shadedArtifactAttached>
+                            <shadedClassifierName>jar-with-dependencies</shadedClassifierName>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
 
         </plugins>
-        <pluginManagement>
-            <plugins>
-                <!--This plugin's configuration is used to store Eclipse m2e settings
-                    only. It has no influence on the Maven build itself. -->
-                <plugin>
-                    <groupId>org.eclipse.m2e</groupId>
-                    <artifactId>lifecycle-mapping</artifactId>
-                    <version>1.0.0</version>
-                    <configuration>
-                        <lifecycleMappingMetadata>
-                            <pluginExecutions>
-                                <pluginExecution>
-                                    <pluginExecutionFilter>
-                                        <groupId>
-                                            com.brocade.developer
-                                        </groupId>
-                                        <artifactId>
-                                            providermodule-plugin
-                                        </artifactId>
-                                        <versionRange>
-                                            [1.2.0.100-SNAPSHOT,)
-                                        </versionRange>
-                                        <goals>
-                                            <goal>process</goal>
-                                        </goals>
-                                    </pluginExecutionFilter>
-                                    <action>
-                                        <ignore/>
-                                    </action>
-                                </pluginExecution>
-                            </pluginExecutions>
-                        </lifecycleMappingMetadata>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
     </build>
 </project>