From: Anil Belur <abelur@linuxfoundation.org>
Date: Fri, 13 Apr 2018 02:49:10 +0000 (+0000)
Subject: Merge "Bump to odlparent 3.1.0 and yangtools 2.0.3"
X-Git-Tag: release/fluorine~95
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=4e39e49ef541d25099afc4c2ff80d89b04b24103;hp=-c;p=netconf.git

Merge "Bump to odlparent 3.1.0 and yangtools 2.0.3"
---

4e39e49ef541d25099afc4c2ff80d89b04b24103
diff --combined features/restconf/odl-restconf-common/pom.xml
index 98bbfd07bf,a4e4eff985..a0f64974f6
--- a/features/restconf/odl-restconf-common/pom.xml
+++ b/features/restconf/odl-restconf-common/pom.xml
@@@ -14,7 -14,7 +14,7 @@@
      <parent>
          <groupId>org.opendaylight.odlparent</groupId>
          <artifactId>single-feature-parent</artifactId>
-         <version>3.0.2</version>
+         <version>3.1.0</version>
          <relativePath/>
      </parent>
  
@@@ -30,7 -30,7 +30,7 @@@
              <dependency>
                  <groupId>org.opendaylight.yangtools</groupId>
                  <artifactId>yangtools-artifacts</artifactId>
-                 <version>2.0.2</version>
+                 <version>2.0.3</version>
                  <type>pom</type>
                  <scope>import</scope>
              </dependency>
@@@ -133,18 -133,5 +133,18 @@@
              <type>xml</type>
              <classifier>features</classifier>
          </dependency>
 +        <dependency>
 +            <groupId>com.sun.jersey</groupId>
 +            <artifactId>jersey-core</artifactId>
 +        </dependency>
 +        <dependency>
 +            <groupId>com.sun.jersey</groupId>
 +            <artifactId>jersey-server</artifactId>
 +        </dependency>
 +        <dependency>
 +            <groupId>com.sun.jersey</groupId>
 +            <artifactId>jersey-servlet</artifactId>
 +        </dependency>
 +
      </dependencies>
  </project>