From 0e461a8a045a0e2c69872e0f44ffb5582bbda195 Mon Sep 17 00:00:00 2001 From: Martin Vitez Date: Mon, 28 Oct 2013 13:53:20 +0100 Subject: [PATCH] Fixed dependent artifacts version in poms. Unified versions with controller project. Removed unused declarations. Removed unused imports. Signed-off-by: Martin Vitez --- code-generator/binding-generator-impl/pom.xml | 8 ++------ .../sal/java/api/generator/GeneratorUtil.java | 1 - .../api/generator/test/GeneratorJavaFileTest.java | 14 -------------- code-generator/binding-type-provider/pom.xml | 5 ++--- .../sal/binding/yang/types/TypeProviderImpl.java | 2 +- model/pom.xml | 1 - pom.xml | 15 ++++++++++----- .../opendaylight/yangtools/yang/common/QName.java | 2 -- yang/yang-maven-plugin/pom.xml | 1 - .../yang/model/util/SchemaContextUtil.xtend | 1 - yang/yang-parser-impl/pom.xml | 1 - 11 files changed, 15 insertions(+), 36 deletions(-) diff --git a/code-generator/binding-generator-impl/pom.xml b/code-generator/binding-generator-impl/pom.xml index 344d41dec1..5ccea81c15 100644 --- a/code-generator/binding-generator-impl/pom.xml +++ b/code-generator/binding-generator-impl/pom.xml @@ -36,9 +36,8 @@ junit - commons-lang - commons-lang - 2.1 + org.apache.commons + commons-lang3 com.google.guava @@ -47,7 +46,6 @@ org.eclipse.xtend org.eclipse.xtend.lib - 2.4.2 @@ -69,7 +67,6 @@ org.eclipse.xtend xtend-maven-plugin - 2.4.2 @@ -83,7 +80,6 @@ maven-clean-plugin - 2.4.1 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 39f9b88d0a..9db1ce8540 100644 --- 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 constants = genType.getConstantDefinitions(); final List methods = genType.getMethodDefinitions(); - final List 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 1b18fe9513..573282f394 100644 --- 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 40cd8f2152..1eada1096a 100644 --- a/code-generator/binding-type-provider/pom.xml +++ b/code-generator/binding-type-provider/pom.xml @@ -38,9 +38,8 @@ binding-generator-util - commons-lang - commons-lang - 2.1 + org.apache.commons + commons-lang3 junit 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 63486ce810..063cbc61ca 100644 --- 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 fa0a559979..32a8f2dd68 100644 --- a/model/pom.xml +++ b/model/pom.xml @@ -9,7 +9,6 @@ 4.0.0 org.opendaylight.yangtools.model model-parent - 0.1.1-SNAPSHOT pom ${project.artifactId} ${project.artifactId} diff --git a/pom.xml b/pom.xml index 0b600e42ab..1dc89df7ea 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,6 @@ UTF-8 - 1.7.2 http://nexus.opendaylight.org/content @@ -23,7 +22,8 @@ 2.16 - 0.5.8-SNAPSHOT + 3.1 + 4.10 1.7.2 14.0.1 2.4.3 @@ -99,7 +99,7 @@ junit junit - 4.10 + ${junit.version} test @@ -113,18 +113,23 @@ org.slf4j slf4j-api - 1.7.2 + ${slf4j.version} com.google.guava guava - 14.0.1 + ${guava.version} org.eclipse.xtend org.eclipse.xtend.lib ${xtend.version} + + org.apache.commons + commons-lang3 + ${commons.lang.version} + 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 521c7819d1..c6c1c5072e 100644 --- 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 @@ -12,8 +12,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 3694e10f20..f701412c1e 100644 --- a/yang/yang-maven-plugin/pom.xml +++ b/yang/yang-maven-plugin/pom.xml @@ -70,7 +70,6 @@ org.mockito mockito-all - 1.8.4 test 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 6cb1135c6e..510d051a68 100644 --- 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 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 cd1d6979cb..edee3aee1e 100644 --- a/yang/yang-parser-impl/pom.xml +++ b/yang/yang-parser-impl/pom.xml @@ -42,7 +42,6 @@ org.mockito mockito-all - 1.8.4 test -- 2.36.6