Update Poms and Tests

[aai/model-loader.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 2228b40..08f7f0a 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -38,37 +38,8 @@
                <maven.compiler.source>1.8</maven.compiler.source>
        <maven.compiler.target>1.8</maven.compiler.target>
        </properties>
                <maven.compiler.source>1.8</maven.compiler.source>
        <maven.compiler.target>1.8</maven.compiler.target>
        </properties>

-       
-       <repositories>
-               <repository>
-                       <id>maven-central</id>
-                       <name>maven-central</name>
-                       <url>http://central.maven.org/maven2/</url>
-                       <releases>
-                               <enabled>true</enabled>
-                               <updatePolicy>never</updatePolicy>
-                       </releases>
-                       <snapshots>
-                               <enabled>false</enabled>
-                       </snapshots>
-               </repository>
-               <repository>
-                       <id>ecomp-nexus</id>
-                       <name>ecomp-nexus</name>
-                       <url>https://ecomp-nexus:8443/repository/maven-releases/</url>
-                       <releases>
-                               <enabled>true</enabled>
-                               <updatePolicy>never</updatePolicy>
-                       </releases>
-                       <snapshots>
-                               <enabled>false</enabled>
-                       </snapshots>
-               </repository>
-       </repositories>

 
 

-       

        <dependencies>
        <dependencies>

-               <!-- powermockito dependencies -->

                <dependency>
                        <groupId>org.mockito</groupId>
                        <artifactId>mockito-all</artifactId>
                <dependency>
                        <groupId>org.mockito</groupId>
                        <artifactId>mockito-all</artifactId>


@@ -133,15 +104,14 @@
                </dependency>
                <!-- Common logging framework -->
                <dependency>
                </dependency>
                <!-- Common logging framework -->
                <dependency>

-                       <groupId>org.openecomp.cl</groupId>
+                       <groupId>org.openecomp.aai.logging-service</groupId>

                        <artifactId>common-logging</artifactId>
                        <version>1.0.0-SNAPSHOT</version>
                </dependency>
                        <artifactId>common-logging</artifactId>
                        <version>1.0.0-SNAPSHOT</version>
                </dependency>

-               <!-- ASDC Client Library -->

                <dependency>
                        <groupId>org.openecomp.sdc</groupId>
                <dependency>
                        <groupId>org.openecomp.sdc</groupId>

-                       <artifactId>sdc-distribution-client</artifactId>
-                       <version>1.1.2</version>
+                   <artifactId>sdc-distribution-client</artifactId>
+                       <version>0.9.0</version>

                </dependency>
                <dependency>
                        <groupId>org.json</groupId>
                </dependency>
                <dependency>
                        <groupId>org.json</groupId>


@@ -168,6 +138,44 @@
         
        </dependencies>
        
         
        </dependencies>
        

+       <!-- Plugins and repositories -->
+          <pluginRepositories>
+                <pluginRepository>
+                           <id>central</id>
+                          <url>http://repo1.maven.org/maven2</url>
+                   </pluginRepository>
+                  <pluginRepository>
+                          <id>EvoSuite</id>
+                        <name>EvoSuite Repository</name>
+                         <url>http://www.evosuite.org/m2</url>
+                  </pluginRepository>
+          </pluginRepositories>
+           <repositories>
+                   <repository>
+                          <id>central</id>
+                          <name>Maven 2 repository 2</name>
+                          <url>http://repo2.maven.org/maven2/</url>
+                  </repository>
+              <repository>
+                         <id>ecomp-releases</id>
+                          <name>ECOMP Release Repository</name>
+                         <url>https://nexus.openecomp.org/content/repositories/releases/</url>
+                  </repository>
+                  <repository>
+                         <id>ecomp-snapshots</id>
+                          <name>ECOMP Snapshot Repository</name>
+                         <url>https://nexus.openecomp.org/content/repositories/snapshots/</url>
+                          <snapshots>
+            <updatePolicy>always</updatePolicy>
+        </snapshots>
+        <releases>
+            <updatePolicy>always</updatePolicy>
+        </releases>
+                  </repository>
+
+          </repositories>
+       
+       

        <build>
                <plugins>
                        <plugin>
        <build>
                <plugins>
                        <plugin>


@@ -278,25 +286,7 @@
                                        <forceTags>true</forceTags>
                                </configuration>
                        </plugin>
                                        <forceTags>true</forceTags>
                                </configuration>
                        </plugin>

-                       <!-- blackduck maven plugin -->
-                       <plugin>
-                               <groupId>com.blackducksoftware.integration</groupId>
-                               <artifactId>hub-maven-plugin</artifactId>
-                               <version>1.0.4</version>
-                               <inherited>false</inherited>
-                               <configuration>
-                                       <target>${project.basedir/target}</target>
-                               </configuration>
-                               <executions>
-                                       <execution>
-                                               <id>create-bdio-file</id>
-                                               <phase>package</phase>
-                                               <goals>
-                                                       <goal>createHubOutput</goal>
-                                               </goals>
-                                       </execution>
-                               </executions>
-                       </plugin>
+               

                        <!-- Checkstyle plugin - used to report on compliance with -->
                        <!-- the Google style guide. -->
                        <plugin>
                        <!-- Checkstyle plugin - used to report on compliance with -->
                        <!-- the Google style guide. -->
                        <plugin>