Merge "Fixed dependent artifacts version in poms."

diff --git a/code-generator/binding-generator-impl/pom.xml b/code-generator/binding-generator-impl/pom.xml
index 344d41dec122899744641b3e348e5caeb150d10a..5ccea81c15cdc319677a36da6638f0743a1652aa 100644 (file)
--- a/code-generator/binding-generator-impl/pom.xml
+++ b/code-generator/binding-generator-impl/pom.xml
@@ -36,9 +36,8 @@
             <artifactId>junit</artifactId>\r
         </dependency>\r
         <dependency>\r
-            <groupId>commons-lang</groupId>\r
-            <artifactId>commons-lang</artifactId>\r
-            <version>2.1</version>\r
+            <groupId>org.apache.commons</groupId>\r
+            <artifactId>commons-lang3</artifactId>\r
         </dependency>\r
         <dependency>\r
             <groupId>com.google.guava</groupId>\r
@@ -47,7 +46,6 @@
         <dependency>\r
             <groupId>org.eclipse.xtend</groupId>\r
             <artifactId>org.eclipse.xtend.lib</artifactId>\r
-            <version>2.4.2</version>\r
         </dependency>\r
     </dependencies>\r
 \r
@@ -69,7 +67,6 @@
             <plugin>\r
                 <groupId>org.eclipse.xtend</groupId>\r
                 <artifactId>xtend-maven-plugin</artifactId>\r
-                <version>2.4.2</version>\r
                 <executions>\r
                     <execution>\r
                         <goals>\r
@@ -83,7 +80,6 @@
             </plugin>\r
             <plugin>\r
                 <artifactId>maven-clean-plugin</artifactId>\r
-                <version>2.4.1</version>\r
                 <configuration>\r
                     <filesets>\r
                         <fileset>\r

diff --git a/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/GeneratorUtil.java b/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/GeneratorUtil.java
index 39f9b88d0a5c25535c0f377a881312e36379f7b8..9db1ce8540293d662798ab4517ab94b11ab2f7e1 100644 (file)
--- a/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/GeneratorUtil.java
+++ b/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/GeneratorUtil.java
@@ -62,7 +62,6 @@ public final class GeneratorUtil {
 
         final List<Constant> constants = genType.getConstantDefinitions();
         final List<MethodSignature> methods = genType.getMethodDefinitions();
-        final List<Type> impl = genType.getImplements();
 
         // CONSTANTS
         if (constants != null) {

diff --git a/code-generator/binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/GeneratorJavaFileTest.java b/code-generator/binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/GeneratorJavaFileTest.java
index 1b18fe95136128965c391b284ba8be38ab04bbde..573282f394047f1cd4763bfa147e02fa35e3ec18 100644 (file)
--- a/code-generator/binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/GeneratorJavaFileTest.java
+++ b/code-generator/binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/GeneratorJavaFileTest.java
@@ -11,32 +11,18 @@ import static org.junit.Assert.assertTrue;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import javax.tools.JavaCompiler;
-import javax.tools.JavaFileObject;
-import javax.tools.StandardJavaFileManager;
-import javax.tools.ToolProvider;
-
-import org.junit.After;
-import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.yangtools.binding.generator.util.BindingTypes;
 import org.opendaylight.yangtools.binding.generator.util.Types;
 import org.opendaylight.yangtools.binding.generator.util.generated.type.builder.GeneratedTypeBuilderImpl;
-import org.opendaylight.yangtools.sal.binding.generator.api.BindingGenerator;
-import org.opendaylight.yangtools.sal.binding.generator.impl.BindingGeneratorImpl;
 import org.opendaylight.yangtools.sal.binding.model.api.GeneratedType;
-import org.opendaylight.yangtools.sal.binding.model.api.Type;
 import org.opendaylight.yangtools.sal.binding.model.api.type.builder.GeneratedTypeBuilder;
 import org.opendaylight.yangtools.sal.java.api.generator.GeneratorJavaFile;
-import org.opendaylight.yangtools.yang.model.api.Module;
-import org.opendaylight.yangtools.yang.model.api.SchemaContext;
-import org.opendaylight.yangtools.yang.parser.impl.YangParserImpl;
 
 public class GeneratorJavaFileTest {
     private static final String FS = File.separator;

diff --git a/code-generator/binding-type-provider/pom.xml b/code-generator/binding-type-provider/pom.xml
index 40cd8f2152a448b3cf57be7c929e3234b1a1c1d8..1eada1096a250bb466c506616b7e650a3d0186bd 100644 (file)
--- a/code-generator/binding-type-provider/pom.xml
+++ b/code-generator/binding-type-provider/pom.xml
@@ -38,9 +38,8 @@
             <artifactId>binding-generator-util</artifactId>\r
         </dependency>\r
         <dependency>\r
-            <groupId>commons-lang</groupId>\r
-            <artifactId>commons-lang</artifactId>\r
-            <version>2.1</version>\r
+            <groupId>org.apache.commons</groupId>\r
+            <artifactId>commons-lang3</artifactId>\r
         </dependency>\r
         <dependency>\r
             <groupId>junit</groupId>\r

diff --git a/code-generator/binding-type-provider/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/TypeProviderImpl.java b/code-generator/binding-type-provider/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/TypeProviderImpl.java
index 63486ce810c85f25c457a578e232335fef6c95b7..063cbc61ca4d8aba14d29ca702e1ca4a1525fc1f 100644 (file)
--- a/code-generator/binding-type-provider/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/TypeProviderImpl.java
+++ b/code-generator/binding-type-provider/src/main/java/org/opendaylight/yangtools/sal/binding/yang/types/TypeProviderImpl.java
@@ -20,7 +20,7 @@ import java.util.TreeMap;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
 import org.opendaylight.yangtools.binding.generator.util.BindingGeneratorUtil;
 import org.opendaylight.yangtools.binding.generator.util.TypeConstants;
 import org.opendaylight.yangtools.binding.generator.util.Types;

diff --git a/model/pom.xml b/model/pom.xml
index fa0a559979188bc73a6f8b4595d815d0591f688a..32a8f2dd68f1057061b99c29c8b36db97941235b 100644 (file)
--- a/model/pom.xml
+++ b/model/pom.xml
@@ -9,7 +9,6 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.opendaylight.yangtools.model</groupId>
     <artifactId>model-parent</artifactId>
-    <version>0.1.1-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>${project.artifactId}</name>
     <description>${project.artifactId}</description>

diff --git a/pom.xml b/pom.xml
index 0b600e42abcee89a39d1e01565d6878ca573be31..1dc89df7ea36494515d78dd2b41e41cc02520b26 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,6 @@
 \r
     <properties>\r
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
-        <slf4j.version>1.7.2</slf4j.version>\r
         <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>\r
         \r
         <!-- Java Versions -->\r
@@ -23,7 +22,8 @@
         <maven.surefire.version>2.16</maven.surefire.version>       \r
 \r
         <!-- Supporting Libraries -->\r
-        <yang.version>0.5.8-SNAPSHOT</yang.version>\r
+        <commons.lang.version>3.1</commons.lang.version>\r
+        <junit.version>4.10</junit.version>\r
         <slf4j.version>1.7.2</slf4j.version>\r
         <guava.version>14.0.1</guava.version>\r
         <xtend.version>2.4.3</xtend.version>\r
@@ -99,7 +99,7 @@
             <dependency>\r
                 <groupId>junit</groupId>\r
                 <artifactId>junit</artifactId>\r
-                <version>4.10</version>\r
+                <version>${junit.version}</version>\r
                 <scope>test</scope>\r
             </dependency>\r
             <dependency>\r
@@ -113,18 +113,23 @@
             <dependency>\r
                 <groupId>org.slf4j</groupId>\r
                 <artifactId>slf4j-api</artifactId>\r
-                <version>1.7.2</version>\r
+                <version>${slf4j.version}</version>\r
             </dependency>\r
             <dependency>\r
                 <groupId>com.google.guava</groupId>\r
                 <artifactId>guava</artifactId>\r
-                <version>14.0.1</version>\r
+                <version>${guava.version}</version>\r
             </dependency>\r
             <dependency>\r
                 <groupId>org.eclipse.xtend</groupId>\r
                 <artifactId>org.eclipse.xtend.lib</artifactId>\r
                 <version>${xtend.version}</version>\r
             </dependency>\r
+            <dependency>\r
+                <groupId>org.apache.commons</groupId>\r
+                <artifactId>commons-lang3</artifactId>\r
+                <version>${commons.lang.version}</version>\r
+            </dependency>\r
         </dependencies>\r
     </dependencyManagement>\r
 \r

diff --git a/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QName.java b/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QName.java
index 3c53096a2edd3c192b9d76d3551355a2d4bc446b..083454b9e9d57ddff1c2f35b45e159aabbbd4bed 100644 (file)
--- a/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QName.java
+++ b/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QName.java
@@ -13,8 +13,6 @@ import java.net.URISyntaxException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-import javax.management.ImmutableDescriptor;
-
 import org.opendaylight.yangtools.concepts.Immutable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/yang/yang-maven-plugin/pom.xml b/yang/yang-maven-plugin/pom.xml
index 3694e10f20cb0d801d62eccf3490532713ade5f2..f701412c1ec6f8d75126b340b21d4b781ba36054 100644 (file)
--- a/yang/yang-maven-plugin/pom.xml
+++ b/yang/yang-maven-plugin/pom.xml
@@ -70,7 +70,6 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-all</artifactId>
-            <version>1.8.4</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtil.xtend b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtil.xtend
index 6cb1135c6eb261c85eda22332d7b1d5a107eaf04..510d051a681299a93611d6ae5d812a4fad076a14 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtil.xtend
+++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/SchemaContextUtil.xtend
@@ -313,7 +313,6 @@ public  class SchemaContextUtil {
 
     public static def GroupingDefinition findGrouping(SchemaContext context, Module module, List<QName> path) {
         var first = path.get(0);
-        var firstPrefix = first.getPrefix();
         var Module m = context.findModuleByNamespace(first.namespace).iterator().next();
         var DataNodeContainer currentParent = m;
         for (qname : path) {

diff --git a/yang/yang-parser-impl/pom.xml b/yang/yang-parser-impl/pom.xml
index cd1d6979cb0df9b3b1b9b0f3715d007262fd78d1..edee3aee1ec1af3f264a72f0643a1baf1311cc99 100644 (file)
--- a/yang/yang-parser-impl/pom.xml
+++ b/yang/yang-parser-impl/pom.xml
@@ -42,7 +42,6 @@
         <dependency>\r
             <groupId>org.mockito</groupId>\r
             <artifactId>mockito-all</artifactId>\r
-            <version>1.8.4</version>\r
             <scope>test</scope>\r
         </dependency>\r
         <dependency>\r