Merge "Change the parent in the pom.xml to oparent"
authortang peng <tang.peng5@zte.com.cn>
Wed, 30 Aug 2017 12:22:48 +0000 (12:22 +0000)
committerGerrit Code Review <gerrit@onap.org>
Wed, 30 Aug 2017 12:22:48 +0000 (12:22 +0000)
1  2 
pom.xml

diff --combined pom.xml
+++ b/pom.xml
    ~ limitations under the License.
    -->
  <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">
+     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.onap.oparent</groupId>
-         <artifactId>version</artifactId>
+         <artifactId>oparent</artifactId>
          <version>1.0.0-SNAPSHOT</version>
-         <relativePath>../../oparent</relativePath>
      </parent>
  
      <groupId>org.onap.holmes.engine-management</groupId>
@@@ -55,7 -54,6 +54,7 @@@
          <jersey.version>2.22.2</jersey.version>
          <jaxrs.consumer.version>5.0</jaxrs.consumer.version>
          <slf4j.version>1.6.1</slf4j.version>
 +        <reflections.version>0.9.9</reflections.version>
          <quartz.version>2.2.1</quartz.version>
  
          <packagename>onap-holmes-engine-d</packagename>
          <win64outputdir>target/assembly/${win64id}</win64outputdir>
          <version.output>target/version</version.output>
      </properties>
      <dependencyManagement>
          <dependencies>
              <dependency>
 +                <groupId>org.reflections</groupId>
 +                <artifactId>reflections</artifactId>
 +                <version>${reflections.version}</version>
 +            </dependency>
 +            <dependency>
                  <groupId>org.easymock</groupId>
                  <artifactId>easymock</artifactId>
                  <version>3.0</version>
              </dependency>
          </dependencies>
      </dependencyManagement>
  </project>