Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Parents pom distribution"
[controller.git]
/
opendaylight
/
sal
/
yang-prototype
/
code-generator
/
maven-yang-plugin-it
/
src
/
test
/
resources
/
NoYangFiles
/
pom.xml
diff --git
a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/NoYangFiles/pom.xml
b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/NoYangFiles/pom.xml
index 1fc7ab34d60b3c8dc0dd1d161a1db0ed493eafeb..54056d5ca47459c96ee72b2fa0a5e482009c8600 100644
(file)
--- a/
opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/NoYangFiles/pom.xml
+++ b/
opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/NoYangFiles/pom.xml
@@
-2,8
+2,8
@@
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>
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>
-
<groupId>org.opendaylight.controller</groupId>
-
<version>0.5.1-SNAPSHOT</version>
+ <groupId>org.opendaylight.controller</groupId>
+ <version>0.5.1-SNAPSHOT</version>
<artifactId>test</artifactId>
<artifactId>test</artifactId>
@@
-12,7
+12,7
@@
<plugin>
<groupId>org.opendaylight.controller</groupId>
<artifactId>yang-maven-plugin</artifactId>
<plugin>
<groupId>org.opendaylight.controller</groupId>
<artifactId>yang-maven-plugin</artifactId>
- <version>0.5.
1
-SNAPSHOT</version>
+ <version>0.5.
2
-SNAPSHOT</version>
<executions>
<execution>
<goals>
<executions>
<execution>
<goals>
@@
-20,6
+20,7
@@
</goals>
<configuration>
<yangFilesRootDir>${basedir}</yangFilesRootDir>
</goals>
<configuration>
<yangFilesRootDir>${basedir}</yangFilesRootDir>
+ <inspectDependencies>false</inspectDependencies>
<codeGenerators>
<generator>
<codeGeneratorClass>
<codeGenerators>
<generator>
<codeGeneratorClass>
@@
-30,16
+31,6
@@
</outputBaseDir>
</generator>
</codeGenerators>
</outputBaseDir>
</generator>
</codeGenerators>
- <resourceProviders>
- <provider>
- <resourceProviderClass>
- org.opendaylight.controller.yang2sources.spi.ResourceProviderTestImpl
- </resourceProviderClass>
- <outputBaseDir>
- outDir/
- </outputBaseDir>
- </provider>
- </resourceProviders>
</configuration>
</execution>
</executions>
</configuration>
</execution>
</executions>
@@
-48,7
+39,7
@@
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>yang-maven-plugin-spi</artifactId>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>yang-maven-plugin-spi</artifactId>
- <version>0.5.
1
-SNAPSHOT</version>
+ <version>0.5.
2
-SNAPSHOT</version>
<type>test-jar</type>
</dependency>
</dependencies>
<type>test-jar</type>
</dependency>
</dependencies>