From 8f0b0b5dd235e30ec60c691c1bb8ba2177b752f3 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 21 Oct 2020 01:40:04 +0200 Subject: [PATCH] Move yang-plugin artifacts We have a plugin top-level directory, move the plugin things there. This reduces clutter in yang/ and makes for a more navigable tree. JIRA: YANGTOOLS-1149 Change-Id: Ifab0a8abda1ca183a3d730367d3da75ab752bc30 Signed-off-by: Robert Varga --- plugin/pom.xml | 3 --- {yang => plugin}/yang-maven-plugin-it/.gitignore | 0 {yang => plugin}/yang-maven-plugin-it/pom.xml | 0 .../yang2sources/plugin/it/YangToSourcesPluginTestIT.java | 0 .../src/test/resources/test-parent/AdditionalConfig/pom.xml | 0 .../src/test/resources/test-parent/Correct/pom.xml | 0 .../src/test/resources/test-parent/GenerateTest1/pom.xml | 0 .../GenerateTest1/src/main/resources/testfile1.yang | 0 .../GenerateTest1/src/main/resources/testfile2.yang | 0 .../GenerateTest1/src/main/resources/testfile3.yang | 0 .../src/test/resources/test-parent/GenerateTest2/pom.xml | 0 .../resources/test-parent/GenerateTest2/yang/private.yang | 0 .../src/test/resources/test-parent/Generator/pom.xml | 0 .../src/test/resources/test-parent/InvalidVersion/pom.xml | 0 .../src/test/resources/test-parent/MissingYangInDep/pom.xml | 0 .../resources/test-parent/MissingYangInDep/yang/private.yang | 0 .../src/test/resources/test-parent/NoGenerators/pom.xml | 0 .../src/test/resources/test-parent/NoOutputDir/pom.xml | 0 .../src/test/resources/test-parent/NoYangFiles/pom.xml | 0 .../src/test/resources/test-parent/UnknownGenerator/pom.xml | 0 .../src/test/resources/test-parent/YangRootNotExist/pom.xml | 0 .../src/test/resources/test-parent/files/testfile1.yang | 0 .../src/test/resources/test-parent/files/testfile2.yang | 0 .../src/test/resources/test-parent/files/testfile3.yang | 0 .../src/test/resources/test-parent/pom.xml | 0 {yang => plugin}/yang-maven-plugin-spi/pom.xml | 0 .../yangtools/yang2sources/spi/BasicCodeGenerator.java | 0 .../yangtools/yang2sources/spi/BuildContextAware.java | 0 .../yangtools/yang2sources/spi/MavenProjectAware.java | 0 .../yangtools/yang2sources/spi/ModuleResourceResolver.java | 0 .../yangtools/yang2sources/spi/CodeGeneratorTestImpl.java | 0 {yang => plugin}/yang-maven-plugin/pom.xml | 0 .../yangtools/yang2sources/plugin/ConfigArg.java | 0 .../yangtools/yang2sources/plugin/ContextHolder.java | 0 .../yangtools/yang2sources/plugin/GeneratedDirectories.java | 0 .../yang2sources/plugin/ProcessorModuleReactor.java | 0 .../yangtools/yang2sources/plugin/ScannedDependency.java | 0 .../org/opendaylight/yangtools/yang2sources/plugin/Util.java | 0 .../yangtools/yang2sources/plugin/YangProvider.java | 0 .../yang2sources/plugin/YangSourceFromDependency.java | 0 .../yangtools/yang2sources/plugin/YangToSourcesMojo.java | 0 .../yang2sources/plugin/YangToSourcesProcessor.java | 0 .../resources/META-INF/m2e/lifecycle-mapping-metadata.xml | 0 .../yang2sources/plugin/AbstractCodeGeneratorTest.java | 0 .../yang2sources/plugin/FilenameResolutionTest.java | 0 .../yangtools/yang2sources/plugin/GenerateSourcesTest.java | 0 .../yangtools/yang2sources/plugin/ScannedDependencyTest.java | 0 .../opendaylight/yangtools/yang2sources/plugin/UtilTest.java | 0 .../yangtools/yang2sources/plugin/YangToSourcesMojoTest.java | 0 .../yang2sources/plugin/YangToSourcesProcessorTest.java | 0 .../src/test/resources/filename/foo-submodule.yang | 0 .../yang-maven-plugin/src/test/resources/filename/foo.yang | 0 .../yang-maven-plugin/src/test/resources/test.yang | 0 .../yang-maven-plugin/src/test/resources/test2.yang | 0 .../src/test/resources/tests/META-INF/yang/test.yang | 0 .../src/test/resources/tests/META-INF/yang/test2.yang | 0 .../src/test/resources/yang-source-from-file.yang | 0 .../src/test/resources/yang/excluded-file.yang | 0 .../yang-maven-plugin/src/test/resources/yang/mock.yang | 0 yang/pom.xml | 5 ----- 60 files changed, 8 deletions(-) rename {yang => plugin}/yang-maven-plugin-it/.gitignore (100%) rename {yang => plugin}/yang-maven-plugin-it/pom.xml (100%) rename {yang => plugin}/yang-maven-plugin-it/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/it/YangToSourcesPluginTestIT.java (100%) rename {yang => plugin}/yang-maven-plugin-it/src/test/resources/test-parent/AdditionalConfig/pom.xml (100%) rename {yang => plugin}/yang-maven-plugin-it/src/test/resources/test-parent/Correct/pom.xml (100%) rename {yang => plugin}/yang-maven-plugin-it/src/test/resources/test-parent/GenerateTest1/pom.xml (100%) rename {yang => plugin}/yang-maven-plugin-it/src/test/resources/test-parent/GenerateTest1/src/main/resources/testfile1.yang (100%) rename {yang => plugin}/yang-maven-plugin-it/src/test/resources/test-parent/GenerateTest1/src/main/resources/testfile2.yang (100%) rename {yang => plugin}/yang-maven-plugin-it/src/test/resources/test-parent/GenerateTest1/src/main/resources/testfile3.yang (100%) rename {yang => plugin}/yang-maven-plugin-it/src/test/resources/test-parent/GenerateTest2/pom.xml (100%) rename {yang => plugin}/yang-maven-plugin-it/src/test/resources/test-parent/GenerateTest2/yang/private.yang (100%) rename {yang => plugin}/yang-maven-plugin-it/src/test/resources/test-parent/Generator/pom.xml (100%) rename {yang => plugin}/yang-maven-plugin-it/src/test/resources/test-parent/InvalidVersion/pom.xml (100%) rename {yang => plugin}/yang-maven-plugin-it/src/test/resources/test-parent/MissingYangInDep/pom.xml (100%) rename {yang => plugin}/yang-maven-plugin-it/src/test/resources/test-parent/MissingYangInDep/yang/private.yang (100%) rename {yang => plugin}/yang-maven-plugin-it/src/test/resources/test-parent/NoGenerators/pom.xml (100%) rename {yang => plugin}/yang-maven-plugin-it/src/test/resources/test-parent/NoOutputDir/pom.xml (100%) rename {yang => plugin}/yang-maven-plugin-it/src/test/resources/test-parent/NoYangFiles/pom.xml (100%) rename {yang => plugin}/yang-maven-plugin-it/src/test/resources/test-parent/UnknownGenerator/pom.xml (100%) rename {yang => plugin}/yang-maven-plugin-it/src/test/resources/test-parent/YangRootNotExist/pom.xml (100%) rename {yang => plugin}/yang-maven-plugin-it/src/test/resources/test-parent/files/testfile1.yang (100%) rename {yang => plugin}/yang-maven-plugin-it/src/test/resources/test-parent/files/testfile2.yang (100%) rename {yang => plugin}/yang-maven-plugin-it/src/test/resources/test-parent/files/testfile3.yang (100%) rename {yang => plugin}/yang-maven-plugin-it/src/test/resources/test-parent/pom.xml (100%) rename {yang => plugin}/yang-maven-plugin-spi/pom.xml (100%) rename {yang => plugin}/yang-maven-plugin-spi/src/main/java/org/opendaylight/yangtools/yang2sources/spi/BasicCodeGenerator.java (100%) rename {yang => plugin}/yang-maven-plugin-spi/src/main/java/org/opendaylight/yangtools/yang2sources/spi/BuildContextAware.java (100%) rename {yang => plugin}/yang-maven-plugin-spi/src/main/java/org/opendaylight/yangtools/yang2sources/spi/MavenProjectAware.java (100%) rename {yang => plugin}/yang-maven-plugin-spi/src/main/java/org/opendaylight/yangtools/yang2sources/spi/ModuleResourceResolver.java (100%) rename {yang => plugin}/yang-maven-plugin-spi/src/test/java/org/opendaylight/yangtools/yang2sources/spi/CodeGeneratorTestImpl.java (100%) rename {yang => plugin}/yang-maven-plugin/pom.xml (100%) rename {yang => plugin}/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/ConfigArg.java (100%) rename {yang => plugin}/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/ContextHolder.java (100%) rename {yang => plugin}/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/GeneratedDirectories.java (100%) rename {yang => plugin}/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/ProcessorModuleReactor.java (100%) rename {yang => plugin}/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/ScannedDependency.java (100%) rename {yang => plugin}/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/Util.java (100%) rename {yang => plugin}/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangProvider.java (100%) rename {yang => plugin}/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangSourceFromDependency.java (100%) rename {yang => plugin}/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesMojo.java (100%) rename {yang => plugin}/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesProcessor.java (100%) rename {yang => plugin}/yang-maven-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml (100%) rename {yang => plugin}/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/AbstractCodeGeneratorTest.java (100%) rename {yang => plugin}/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/FilenameResolutionTest.java (100%) rename {yang => plugin}/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/GenerateSourcesTest.java (100%) rename {yang => plugin}/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/ScannedDependencyTest.java (100%) rename {yang => plugin}/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/UtilTest.java (100%) rename {yang => plugin}/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesMojoTest.java (100%) rename {yang => plugin}/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesProcessorTest.java (100%) rename {yang => plugin}/yang-maven-plugin/src/test/resources/filename/foo-submodule.yang (100%) rename {yang => plugin}/yang-maven-plugin/src/test/resources/filename/foo.yang (100%) rename {yang => plugin}/yang-maven-plugin/src/test/resources/test.yang (100%) rename {yang => plugin}/yang-maven-plugin/src/test/resources/test2.yang (100%) rename {yang => plugin}/yang-maven-plugin/src/test/resources/tests/META-INF/yang/test.yang (100%) rename {yang => plugin}/yang-maven-plugin/src/test/resources/tests/META-INF/yang/test2.yang (100%) rename {yang => plugin}/yang-maven-plugin/src/test/resources/yang-source-from-file.yang (100%) rename {yang => plugin}/yang-maven-plugin/src/test/resources/yang/excluded-file.yang (100%) rename {yang => plugin}/yang-maven-plugin/src/test/resources/yang/mock.yang (100%) diff --git a/plugin/pom.xml b/plugin/pom.xml index 39a70400e4..87f5540cc7 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -24,12 +24,9 @@ plugin-generator-api - - diff --git a/yang/yang-maven-plugin-it/.gitignore b/plugin/yang-maven-plugin-it/.gitignore similarity index 100% rename from yang/yang-maven-plugin-it/.gitignore rename to plugin/yang-maven-plugin-it/.gitignore diff --git a/yang/yang-maven-plugin-it/pom.xml b/plugin/yang-maven-plugin-it/pom.xml similarity index 100% rename from yang/yang-maven-plugin-it/pom.xml rename to plugin/yang-maven-plugin-it/pom.xml diff --git a/yang/yang-maven-plugin-it/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/it/YangToSourcesPluginTestIT.java b/plugin/yang-maven-plugin-it/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/it/YangToSourcesPluginTestIT.java similarity index 100% rename from yang/yang-maven-plugin-it/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/it/YangToSourcesPluginTestIT.java rename to plugin/yang-maven-plugin-it/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/it/YangToSourcesPluginTestIT.java diff --git a/yang/yang-maven-plugin-it/src/test/resources/test-parent/AdditionalConfig/pom.xml b/plugin/yang-maven-plugin-it/src/test/resources/test-parent/AdditionalConfig/pom.xml similarity index 100% rename from yang/yang-maven-plugin-it/src/test/resources/test-parent/AdditionalConfig/pom.xml rename to plugin/yang-maven-plugin-it/src/test/resources/test-parent/AdditionalConfig/pom.xml diff --git a/yang/yang-maven-plugin-it/src/test/resources/test-parent/Correct/pom.xml b/plugin/yang-maven-plugin-it/src/test/resources/test-parent/Correct/pom.xml similarity index 100% rename from yang/yang-maven-plugin-it/src/test/resources/test-parent/Correct/pom.xml rename to plugin/yang-maven-plugin-it/src/test/resources/test-parent/Correct/pom.xml diff --git a/yang/yang-maven-plugin-it/src/test/resources/test-parent/GenerateTest1/pom.xml b/plugin/yang-maven-plugin-it/src/test/resources/test-parent/GenerateTest1/pom.xml similarity index 100% rename from yang/yang-maven-plugin-it/src/test/resources/test-parent/GenerateTest1/pom.xml rename to plugin/yang-maven-plugin-it/src/test/resources/test-parent/GenerateTest1/pom.xml diff --git a/yang/yang-maven-plugin-it/src/test/resources/test-parent/GenerateTest1/src/main/resources/testfile1.yang b/plugin/yang-maven-plugin-it/src/test/resources/test-parent/GenerateTest1/src/main/resources/testfile1.yang similarity index 100% rename from yang/yang-maven-plugin-it/src/test/resources/test-parent/GenerateTest1/src/main/resources/testfile1.yang rename to plugin/yang-maven-plugin-it/src/test/resources/test-parent/GenerateTest1/src/main/resources/testfile1.yang diff --git a/yang/yang-maven-plugin-it/src/test/resources/test-parent/GenerateTest1/src/main/resources/testfile2.yang b/plugin/yang-maven-plugin-it/src/test/resources/test-parent/GenerateTest1/src/main/resources/testfile2.yang similarity index 100% rename from yang/yang-maven-plugin-it/src/test/resources/test-parent/GenerateTest1/src/main/resources/testfile2.yang rename to plugin/yang-maven-plugin-it/src/test/resources/test-parent/GenerateTest1/src/main/resources/testfile2.yang diff --git a/yang/yang-maven-plugin-it/src/test/resources/test-parent/GenerateTest1/src/main/resources/testfile3.yang b/plugin/yang-maven-plugin-it/src/test/resources/test-parent/GenerateTest1/src/main/resources/testfile3.yang similarity index 100% rename from yang/yang-maven-plugin-it/src/test/resources/test-parent/GenerateTest1/src/main/resources/testfile3.yang rename to plugin/yang-maven-plugin-it/src/test/resources/test-parent/GenerateTest1/src/main/resources/testfile3.yang diff --git a/yang/yang-maven-plugin-it/src/test/resources/test-parent/GenerateTest2/pom.xml b/plugin/yang-maven-plugin-it/src/test/resources/test-parent/GenerateTest2/pom.xml similarity index 100% rename from yang/yang-maven-plugin-it/src/test/resources/test-parent/GenerateTest2/pom.xml rename to plugin/yang-maven-plugin-it/src/test/resources/test-parent/GenerateTest2/pom.xml diff --git a/yang/yang-maven-plugin-it/src/test/resources/test-parent/GenerateTest2/yang/private.yang b/plugin/yang-maven-plugin-it/src/test/resources/test-parent/GenerateTest2/yang/private.yang similarity index 100% rename from yang/yang-maven-plugin-it/src/test/resources/test-parent/GenerateTest2/yang/private.yang rename to plugin/yang-maven-plugin-it/src/test/resources/test-parent/GenerateTest2/yang/private.yang diff --git a/yang/yang-maven-plugin-it/src/test/resources/test-parent/Generator/pom.xml b/plugin/yang-maven-plugin-it/src/test/resources/test-parent/Generator/pom.xml similarity index 100% rename from yang/yang-maven-plugin-it/src/test/resources/test-parent/Generator/pom.xml rename to plugin/yang-maven-plugin-it/src/test/resources/test-parent/Generator/pom.xml diff --git a/yang/yang-maven-plugin-it/src/test/resources/test-parent/InvalidVersion/pom.xml b/plugin/yang-maven-plugin-it/src/test/resources/test-parent/InvalidVersion/pom.xml similarity index 100% rename from yang/yang-maven-plugin-it/src/test/resources/test-parent/InvalidVersion/pom.xml rename to plugin/yang-maven-plugin-it/src/test/resources/test-parent/InvalidVersion/pom.xml diff --git a/yang/yang-maven-plugin-it/src/test/resources/test-parent/MissingYangInDep/pom.xml b/plugin/yang-maven-plugin-it/src/test/resources/test-parent/MissingYangInDep/pom.xml similarity index 100% rename from yang/yang-maven-plugin-it/src/test/resources/test-parent/MissingYangInDep/pom.xml rename to plugin/yang-maven-plugin-it/src/test/resources/test-parent/MissingYangInDep/pom.xml diff --git a/yang/yang-maven-plugin-it/src/test/resources/test-parent/MissingYangInDep/yang/private.yang b/plugin/yang-maven-plugin-it/src/test/resources/test-parent/MissingYangInDep/yang/private.yang similarity index 100% rename from yang/yang-maven-plugin-it/src/test/resources/test-parent/MissingYangInDep/yang/private.yang rename to plugin/yang-maven-plugin-it/src/test/resources/test-parent/MissingYangInDep/yang/private.yang diff --git a/yang/yang-maven-plugin-it/src/test/resources/test-parent/NoGenerators/pom.xml b/plugin/yang-maven-plugin-it/src/test/resources/test-parent/NoGenerators/pom.xml similarity index 100% rename from yang/yang-maven-plugin-it/src/test/resources/test-parent/NoGenerators/pom.xml rename to plugin/yang-maven-plugin-it/src/test/resources/test-parent/NoGenerators/pom.xml diff --git a/yang/yang-maven-plugin-it/src/test/resources/test-parent/NoOutputDir/pom.xml b/plugin/yang-maven-plugin-it/src/test/resources/test-parent/NoOutputDir/pom.xml similarity index 100% rename from yang/yang-maven-plugin-it/src/test/resources/test-parent/NoOutputDir/pom.xml rename to plugin/yang-maven-plugin-it/src/test/resources/test-parent/NoOutputDir/pom.xml diff --git a/yang/yang-maven-plugin-it/src/test/resources/test-parent/NoYangFiles/pom.xml b/plugin/yang-maven-plugin-it/src/test/resources/test-parent/NoYangFiles/pom.xml similarity index 100% rename from yang/yang-maven-plugin-it/src/test/resources/test-parent/NoYangFiles/pom.xml rename to plugin/yang-maven-plugin-it/src/test/resources/test-parent/NoYangFiles/pom.xml diff --git a/yang/yang-maven-plugin-it/src/test/resources/test-parent/UnknownGenerator/pom.xml b/plugin/yang-maven-plugin-it/src/test/resources/test-parent/UnknownGenerator/pom.xml similarity index 100% rename from yang/yang-maven-plugin-it/src/test/resources/test-parent/UnknownGenerator/pom.xml rename to plugin/yang-maven-plugin-it/src/test/resources/test-parent/UnknownGenerator/pom.xml diff --git a/yang/yang-maven-plugin-it/src/test/resources/test-parent/YangRootNotExist/pom.xml b/plugin/yang-maven-plugin-it/src/test/resources/test-parent/YangRootNotExist/pom.xml similarity index 100% rename from yang/yang-maven-plugin-it/src/test/resources/test-parent/YangRootNotExist/pom.xml rename to plugin/yang-maven-plugin-it/src/test/resources/test-parent/YangRootNotExist/pom.xml diff --git a/yang/yang-maven-plugin-it/src/test/resources/test-parent/files/testfile1.yang b/plugin/yang-maven-plugin-it/src/test/resources/test-parent/files/testfile1.yang similarity index 100% rename from yang/yang-maven-plugin-it/src/test/resources/test-parent/files/testfile1.yang rename to plugin/yang-maven-plugin-it/src/test/resources/test-parent/files/testfile1.yang diff --git a/yang/yang-maven-plugin-it/src/test/resources/test-parent/files/testfile2.yang b/plugin/yang-maven-plugin-it/src/test/resources/test-parent/files/testfile2.yang similarity index 100% rename from yang/yang-maven-plugin-it/src/test/resources/test-parent/files/testfile2.yang rename to plugin/yang-maven-plugin-it/src/test/resources/test-parent/files/testfile2.yang diff --git a/yang/yang-maven-plugin-it/src/test/resources/test-parent/files/testfile3.yang b/plugin/yang-maven-plugin-it/src/test/resources/test-parent/files/testfile3.yang similarity index 100% rename from yang/yang-maven-plugin-it/src/test/resources/test-parent/files/testfile3.yang rename to plugin/yang-maven-plugin-it/src/test/resources/test-parent/files/testfile3.yang diff --git a/yang/yang-maven-plugin-it/src/test/resources/test-parent/pom.xml b/plugin/yang-maven-plugin-it/src/test/resources/test-parent/pom.xml similarity index 100% rename from yang/yang-maven-plugin-it/src/test/resources/test-parent/pom.xml rename to plugin/yang-maven-plugin-it/src/test/resources/test-parent/pom.xml diff --git a/yang/yang-maven-plugin-spi/pom.xml b/plugin/yang-maven-plugin-spi/pom.xml similarity index 100% rename from yang/yang-maven-plugin-spi/pom.xml rename to plugin/yang-maven-plugin-spi/pom.xml diff --git a/yang/yang-maven-plugin-spi/src/main/java/org/opendaylight/yangtools/yang2sources/spi/BasicCodeGenerator.java b/plugin/yang-maven-plugin-spi/src/main/java/org/opendaylight/yangtools/yang2sources/spi/BasicCodeGenerator.java similarity index 100% rename from yang/yang-maven-plugin-spi/src/main/java/org/opendaylight/yangtools/yang2sources/spi/BasicCodeGenerator.java rename to plugin/yang-maven-plugin-spi/src/main/java/org/opendaylight/yangtools/yang2sources/spi/BasicCodeGenerator.java diff --git a/yang/yang-maven-plugin-spi/src/main/java/org/opendaylight/yangtools/yang2sources/spi/BuildContextAware.java b/plugin/yang-maven-plugin-spi/src/main/java/org/opendaylight/yangtools/yang2sources/spi/BuildContextAware.java similarity index 100% rename from yang/yang-maven-plugin-spi/src/main/java/org/opendaylight/yangtools/yang2sources/spi/BuildContextAware.java rename to plugin/yang-maven-plugin-spi/src/main/java/org/opendaylight/yangtools/yang2sources/spi/BuildContextAware.java diff --git a/yang/yang-maven-plugin-spi/src/main/java/org/opendaylight/yangtools/yang2sources/spi/MavenProjectAware.java b/plugin/yang-maven-plugin-spi/src/main/java/org/opendaylight/yangtools/yang2sources/spi/MavenProjectAware.java similarity index 100% rename from yang/yang-maven-plugin-spi/src/main/java/org/opendaylight/yangtools/yang2sources/spi/MavenProjectAware.java rename to plugin/yang-maven-plugin-spi/src/main/java/org/opendaylight/yangtools/yang2sources/spi/MavenProjectAware.java diff --git a/yang/yang-maven-plugin-spi/src/main/java/org/opendaylight/yangtools/yang2sources/spi/ModuleResourceResolver.java b/plugin/yang-maven-plugin-spi/src/main/java/org/opendaylight/yangtools/yang2sources/spi/ModuleResourceResolver.java similarity index 100% rename from yang/yang-maven-plugin-spi/src/main/java/org/opendaylight/yangtools/yang2sources/spi/ModuleResourceResolver.java rename to plugin/yang-maven-plugin-spi/src/main/java/org/opendaylight/yangtools/yang2sources/spi/ModuleResourceResolver.java diff --git a/yang/yang-maven-plugin-spi/src/test/java/org/opendaylight/yangtools/yang2sources/spi/CodeGeneratorTestImpl.java b/plugin/yang-maven-plugin-spi/src/test/java/org/opendaylight/yangtools/yang2sources/spi/CodeGeneratorTestImpl.java similarity index 100% rename from yang/yang-maven-plugin-spi/src/test/java/org/opendaylight/yangtools/yang2sources/spi/CodeGeneratorTestImpl.java rename to plugin/yang-maven-plugin-spi/src/test/java/org/opendaylight/yangtools/yang2sources/spi/CodeGeneratorTestImpl.java diff --git a/yang/yang-maven-plugin/pom.xml b/plugin/yang-maven-plugin/pom.xml similarity index 100% rename from yang/yang-maven-plugin/pom.xml rename to plugin/yang-maven-plugin/pom.xml diff --git a/yang/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/ConfigArg.java b/plugin/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/ConfigArg.java similarity index 100% rename from yang/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/ConfigArg.java rename to plugin/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/ConfigArg.java diff --git a/yang/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/ContextHolder.java b/plugin/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/ContextHolder.java similarity index 100% rename from yang/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/ContextHolder.java rename to plugin/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/ContextHolder.java diff --git a/yang/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/GeneratedDirectories.java b/plugin/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/GeneratedDirectories.java similarity index 100% rename from yang/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/GeneratedDirectories.java rename to plugin/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/GeneratedDirectories.java diff --git a/yang/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/ProcessorModuleReactor.java b/plugin/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/ProcessorModuleReactor.java similarity index 100% rename from yang/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/ProcessorModuleReactor.java rename to plugin/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/ProcessorModuleReactor.java diff --git a/yang/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/ScannedDependency.java b/plugin/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/ScannedDependency.java similarity index 100% rename from yang/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/ScannedDependency.java rename to plugin/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/ScannedDependency.java diff --git a/yang/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/Util.java b/plugin/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/Util.java similarity index 100% rename from yang/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/Util.java rename to plugin/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/Util.java diff --git a/yang/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangProvider.java b/plugin/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangProvider.java similarity index 100% rename from yang/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangProvider.java rename to plugin/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangProvider.java diff --git a/yang/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangSourceFromDependency.java b/plugin/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangSourceFromDependency.java similarity index 100% rename from yang/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangSourceFromDependency.java rename to plugin/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangSourceFromDependency.java diff --git a/yang/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesMojo.java b/plugin/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesMojo.java similarity index 100% rename from yang/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesMojo.java rename to plugin/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesMojo.java diff --git a/yang/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesProcessor.java b/plugin/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesProcessor.java similarity index 100% rename from yang/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesProcessor.java rename to plugin/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesProcessor.java diff --git a/yang/yang-maven-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml b/plugin/yang-maven-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml similarity index 100% rename from yang/yang-maven-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml rename to plugin/yang-maven-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml diff --git a/yang/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/AbstractCodeGeneratorTest.java b/plugin/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/AbstractCodeGeneratorTest.java similarity index 100% rename from yang/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/AbstractCodeGeneratorTest.java rename to plugin/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/AbstractCodeGeneratorTest.java diff --git a/yang/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/FilenameResolutionTest.java b/plugin/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/FilenameResolutionTest.java similarity index 100% rename from yang/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/FilenameResolutionTest.java rename to plugin/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/FilenameResolutionTest.java diff --git a/yang/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/GenerateSourcesTest.java b/plugin/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/GenerateSourcesTest.java similarity index 100% rename from yang/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/GenerateSourcesTest.java rename to plugin/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/GenerateSourcesTest.java diff --git a/yang/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/ScannedDependencyTest.java b/plugin/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/ScannedDependencyTest.java similarity index 100% rename from yang/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/ScannedDependencyTest.java rename to plugin/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/ScannedDependencyTest.java diff --git a/yang/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/UtilTest.java b/plugin/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/UtilTest.java similarity index 100% rename from yang/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/UtilTest.java rename to plugin/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/UtilTest.java diff --git a/yang/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesMojoTest.java b/plugin/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesMojoTest.java similarity index 100% rename from yang/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesMojoTest.java rename to plugin/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesMojoTest.java diff --git a/yang/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesProcessorTest.java b/plugin/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesProcessorTest.java similarity index 100% rename from yang/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesProcessorTest.java rename to plugin/yang-maven-plugin/src/test/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesProcessorTest.java diff --git a/yang/yang-maven-plugin/src/test/resources/filename/foo-submodule.yang b/plugin/yang-maven-plugin/src/test/resources/filename/foo-submodule.yang similarity index 100% rename from yang/yang-maven-plugin/src/test/resources/filename/foo-submodule.yang rename to plugin/yang-maven-plugin/src/test/resources/filename/foo-submodule.yang diff --git a/yang/yang-maven-plugin/src/test/resources/filename/foo.yang b/plugin/yang-maven-plugin/src/test/resources/filename/foo.yang similarity index 100% rename from yang/yang-maven-plugin/src/test/resources/filename/foo.yang rename to plugin/yang-maven-plugin/src/test/resources/filename/foo.yang diff --git a/yang/yang-maven-plugin/src/test/resources/test.yang b/plugin/yang-maven-plugin/src/test/resources/test.yang similarity index 100% rename from yang/yang-maven-plugin/src/test/resources/test.yang rename to plugin/yang-maven-plugin/src/test/resources/test.yang diff --git a/yang/yang-maven-plugin/src/test/resources/test2.yang b/plugin/yang-maven-plugin/src/test/resources/test2.yang similarity index 100% rename from yang/yang-maven-plugin/src/test/resources/test2.yang rename to plugin/yang-maven-plugin/src/test/resources/test2.yang diff --git a/yang/yang-maven-plugin/src/test/resources/tests/META-INF/yang/test.yang b/plugin/yang-maven-plugin/src/test/resources/tests/META-INF/yang/test.yang similarity index 100% rename from yang/yang-maven-plugin/src/test/resources/tests/META-INF/yang/test.yang rename to plugin/yang-maven-plugin/src/test/resources/tests/META-INF/yang/test.yang diff --git a/yang/yang-maven-plugin/src/test/resources/tests/META-INF/yang/test2.yang b/plugin/yang-maven-plugin/src/test/resources/tests/META-INF/yang/test2.yang similarity index 100% rename from yang/yang-maven-plugin/src/test/resources/tests/META-INF/yang/test2.yang rename to plugin/yang-maven-plugin/src/test/resources/tests/META-INF/yang/test2.yang diff --git a/yang/yang-maven-plugin/src/test/resources/yang-source-from-file.yang b/plugin/yang-maven-plugin/src/test/resources/yang-source-from-file.yang similarity index 100% rename from yang/yang-maven-plugin/src/test/resources/yang-source-from-file.yang rename to plugin/yang-maven-plugin/src/test/resources/yang-source-from-file.yang diff --git a/yang/yang-maven-plugin/src/test/resources/yang/excluded-file.yang b/plugin/yang-maven-plugin/src/test/resources/yang/excluded-file.yang similarity index 100% rename from yang/yang-maven-plugin/src/test/resources/yang/excluded-file.yang rename to plugin/yang-maven-plugin/src/test/resources/yang/excluded-file.yang diff --git a/yang/yang-maven-plugin/src/test/resources/yang/mock.yang b/plugin/yang-maven-plugin/src/test/resources/yang/mock.yang similarity index 100% rename from yang/yang-maven-plugin/src/test/resources/yang/mock.yang rename to plugin/yang-maven-plugin/src/test/resources/yang/mock.yang diff --git a/yang/pom.xml b/yang/pom.xml index e77b5e4eb8..c150964b7e 100644 --- a/yang/pom.xml +++ b/yang/pom.xml @@ -39,11 +39,6 @@ yang-model-util yang-model-util-ut - - yang-maven-plugin - yang-maven-plugin-spi - yang-maven-plugin-it - yang-xpath-api yang-xpath-antlr -- 2.36.6