BUG-1440: include gson codec in feature

This updates the feature file to include the yang-data-codec-gson.

Change-Id: I48183547ba70a5f3d866dd9e5e694863d0607a2a
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/common/features/pom.xml b/common/features/pom.xml
index a2eed6db1d2eedad3db89901a3ee9c99e7a7b833..46c91492d06b1553f59ec5af433aaeb9985da0c0 100644 (file)
--- a/common/features/pom.xml
+++ b/common/features/pom.xml
@@ -7,252 +7,260 @@
  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   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>
-   <parent>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>yangtools-parent</artifactId>
-      <version>0.6.2-SNAPSHOT</version>
-      <relativePath>../parent/pom.xml</relativePath>
-   </parent>
-   <artifactId>features-yangtools</artifactId>
-   <packaging>jar</packaging>
-   <properties>
-      <features.file>features.xml</features.file>
-   </properties>
-   <build>
-      <resources>
-         <resource>
-            <directory>src/main/resources</directory>
-            <filtering>true</filtering>
-         </resource>
-      </resources>
-      <plugins>
-         <plugin>
-            <groupId>org.apache.karaf.tooling</groupId>
-            <artifactId>karaf-maven-plugin</artifactId>
-            <version>${karaf.version}</version>
-            <extensions>true</extensions>
-            <executions>
-               <execution>
-                  <id>features-create-kar</id>
-                  <goals>
-                     <goal>features-create-kar</goal>
-                  </goals>
-                  <configuration>
-                     <featuresFile>${project.build.directory}/classes/${features.file}</featuresFile>
-                  </configuration>
-               </execution>
-            </executions>
-        <!-- There is no useful configuration for the kar mojo. The features-generate-descriptor mojo configuration may be useful -->
-         </plugin>
-         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-resources-plugin</artifactId>
-            <executions>
-               <execution>
-                  <id>filter</id>
-                  <phase>generate-resources</phase>
-                  <goals>
-                     <goal>resources</goal>
-                  </goals>
-               </execution>
-            </executions>
-         </plugin>
-         <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>build-helper-maven-plugin</artifactId>
-            <executions>
-               <execution>
-                  <id>attach-artifacts</id>
-                  <phase>package</phase>
-                  <goals>
-                     <goal>attach-artifact</goal>
-                  </goals>
-                  <configuration>
-                     <artifacts>
-                        <artifact>
-                           <file>${project.build.directory}/classes/${features.file}</file>
-                           <type>xml</type>
-                           <classifier>features</classifier>
-                        </artifact>
-                     </artifacts>
-                  </configuration>
-               </execution>
-            </executions>
-         </plugin>
-         <plugin>
-           <groupId>org.apache.maven.plugins</groupId>
-           <artifactId>maven-surefire-plugin</artifactId>
-           <configuration>
-            <dependenciesToScan>
-              <dependency>org.opendaylight.yangtools:features-test</dependency>
-            </dependenciesToScan>
-           </configuration>
-         </plugin>
-      </plugins>
-   </build>
-   <dependencies>
-     <dependency>
-       <groupId>org.opendaylight.yangtools.model</groupId>
-       <artifactId>ietf-inet-types</artifactId>
-     </dependency>
-     <dependency>
-       <groupId>org.opendaylight.yangtools.model</groupId>
-       <artifactId>ietf-yang-types</artifactId>
-     </dependency>
-     <dependency>
-       <groupId>org.opendaylight.yangtools.model</groupId>
-       <artifactId>ietf-yang-types-20130715</artifactId>
-     </dependency>
-     <dependency>
-       <groupId>org.opendaylight.yangtools.model</groupId>
-       <artifactId>yang-ext</artifactId>
-     </dependency>
-     <dependency>
-       <groupId>org.opendaylight.yangtools.model</groupId>
-       <artifactId>opendaylight-l2-types</artifactId>
-     </dependency>
-     <dependency>
-       <groupId>org.opendaylight.yangtools.model</groupId>
-       <artifactId>ietf-topology</artifactId>
-     </dependency>
-     <dependency>
-       <groupId>org.opendaylight.yangtools.thirdparty</groupId>
-       <artifactId>antlr4-runtime-osgi-nohead</artifactId>
-       <scope>compile</scope>
-     </dependency>
-     <dependency>
-       <groupId>org.opendaylight.yangtools</groupId>
-       <artifactId>yang-data-api</artifactId>
-     </dependency>
-     <dependency>
-       <groupId>org.opendaylight.yangtools</groupId>
-       <artifactId>yang-data-composite-node</artifactId>
-     </dependency>
-     <dependency>
-       <groupId>org.opendaylight.yangtools</groupId>
-       <artifactId>yang-data-impl</artifactId>
-     </dependency>
-     <dependency>
-       <groupId>org.opendaylight.yangtools</groupId>
-       <artifactId>yang-data-operations</artifactId>
-     </dependency>
-     <dependency>
-       <groupId>org.opendaylight.yangtools</groupId>
-       <artifactId>yang-data-util</artifactId>
-     </dependency>
-     <dependency>
-       <groupId>org.opendaylight.yangtools</groupId>
-       <artifactId>yang-model-api</artifactId>
-     </dependency>
-     <dependency>
-       <groupId>org.opendaylight.yangtools</groupId>
-       <artifactId>yang-model-util</artifactId>
-     </dependency>
-     <dependency>
-       <groupId>org.opendaylight.yangtools</groupId>
-       <artifactId>yang-parser-impl</artifactId>
-     </dependency>
-     <dependency>
-       <groupId>org.opendaylight.yangtools</groupId>
-       <artifactId>yang-parser-api</artifactId>
-     </dependency>
-     <dependency>
-       <groupId>org.opendaylight.yangtools</groupId>
-       <artifactId>yang-binding</artifactId>
-     </dependency>
-     <dependency>
-       <groupId>org.opendaylight.yangtools</groupId>
-       <artifactId>util</artifactId>
-     </dependency>
-     <dependency>
-       <groupId>org.opendaylight.yangtools</groupId>
-       <artifactId>concepts</artifactId>
-     </dependency>
-     <dependency>
-       <groupId>org.opendaylight.yangtools</groupId>
-       <artifactId>yang-common</artifactId>
-     </dependency>
-     <dependency>
-       <groupId>org.opendaylight.yangtools</groupId>
-       <artifactId>util</artifactId>
-     </dependency>
-     <dependency>
-       <groupId>org.opendaylight.yangtools</groupId>
-       <artifactId>object-cache-api</artifactId>
-     </dependency>
-     <dependency>
-       <groupId>org.opendaylight.yangtools</groupId>
-       <artifactId>object-cache-guava</artifactId>
-     </dependency>
-     <dependency>
-       <groupId>org.opendaylight.yangtools</groupId>
-       <artifactId>object-cache-noop</artifactId>
-     </dependency>
-     <dependency>
-       <groupId>org.opendaylight.yangtools</groupId>
-       <artifactId>binding-generator-api</artifactId>
-     </dependency>
-     <dependency>
-       <groupId>org.opendaylight.yangtools</groupId>
-       <artifactId>binding-generator-impl</artifactId>
-     </dependency>
-     <dependency>
-       <groupId>org.opendaylight.yangtools</groupId>
-       <artifactId>binding-generator-spi</artifactId>
-     </dependency>
-     <dependency>
-       <groupId>org.opendaylight.yangtools</groupId>
-       <artifactId>binding-generator-util</artifactId>
-     </dependency>
-     <dependency>
-       <groupId>org.opendaylight.yangtools</groupId>
-       <artifactId>binding-model-api</artifactId>
-     </dependency>
-     <dependency>
-       <groupId>org.opendaylight.yangtools</groupId>
-       <artifactId>binding-type-provider</artifactId>
-     </dependency>
-     <dependency>
-       <groupId>org.opendaylight.yangtools</groupId>
-       <artifactId>yang-model-api</artifactId>
-     </dependency>
-     <dependency>
-       <groupId>org.opendaylight.yangtools</groupId>
-       <artifactId>yang-model-util</artifactId>
-     </dependency>
-     <dependency>
-       <groupId>org.opendaylight.yangtools</groupId>
-       <artifactId>yang-parser-api</artifactId>
-     </dependency>
-     <dependency>
-       <groupId>org.opendaylight.yangtools</groupId>
-       <artifactId>restconf-client-api</artifactId>
-     </dependency>
-     <dependency>
-       <groupId>org.opendaylight.yangtools</groupId>
-       <artifactId>restconf-client-impl</artifactId>
-     </dependency>
-     <dependency>
-       <groupId>org.opendaylight.yangtools</groupId>
-       <artifactId>restconf-common</artifactId>
-     </dependency>
-     <dependency>
-       <groupId>org.opendaylight.yangtools</groupId>
-       <artifactId>binding-data-codec</artifactId>
-     </dependency>
-     <dependency>
-       <groupId>org.opendaylight.yangtools.thirdparty</groupId>
-       <artifactId>xtend-lib-osgi</artifactId>
-       <scope>compile</scope>
-     </dependency>
-     <!-- test the features.xml -->
-     <dependency>
-       <groupId>org.opendaylight.yangtools</groupId>
-       <artifactId>features-test</artifactId>
-       <scope>test</scope>
-     </dependency>
-   </dependencies>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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>
+    <parent>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <artifactId>yangtools-parent</artifactId>
+        <version>0.6.2-SNAPSHOT</version>
+        <relativePath>../parent/pom.xml</relativePath>
+    </parent>
+    <artifactId>features-yangtools</artifactId>
+    <packaging>jar</packaging>
+    <properties>
+        <features.file>features.xml</features.file>
+    </properties>
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.karaf.tooling</groupId>
+                <artifactId>karaf-maven-plugin</artifactId>
+                <version>${karaf.version}</version>
+                <extensions>true</extensions>
+                <executions>
+                    <execution>
+                        <id>features-create-kar</id>
+                        <goals>
+                            <goal>features-create-kar</goal>
+                        </goals>
+                        <configuration>
+                            <featuresFile>${project.build.directory}/classes/${features.file}</featuresFile>
+                        </configuration>
+                    </execution>
+                </executions>
+                <!-- There is no useful configuration for the kar mojo. The features-generate-descriptor mojo configuration may be useful -->
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>filter</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>resources</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-artifacts</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>attach-artifact</goal>
+                        </goals>
+                        <configuration>
+                            <artifacts>
+                                <artifact>
+                                    <file>${project.build.directory}/classes/${features.file}</file>
+                                    <type>xml</type>
+                                    <classifier>features</classifier>
+                                </artifact>
+                            </artifacts>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <dependenciesToScan>
+                        <dependency>org.opendaylight.yangtools:features-test</dependency>
+                    </dependenciesToScan>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.yangtools.model</groupId>
+            <artifactId>ietf-inet-types</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools.model</groupId>
+            <artifactId>ietf-yang-types</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools.model</groupId>
+            <artifactId>ietf-yang-types-20130715</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools.model</groupId>
+            <artifactId>yang-ext</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools.model</groupId>
+            <artifactId>opendaylight-l2-types</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools.model</groupId>
+            <artifactId>ietf-topology</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools.thirdparty</groupId>
+            <artifactId>antlr4-runtime-osgi-nohead</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-data-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-data-composite-node</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-data-impl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-data-operations</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-data-util</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-data-codec-gson</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-model-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-model-util</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-parser-impl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-parser-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-binding</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>util</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>concepts</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>util</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>object-cache-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>object-cache-guava</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>object-cache-noop</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>binding-generator-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>binding-generator-impl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>binding-generator-spi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>binding-generator-util</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>binding-model-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>binding-type-provider</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-model-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-model-util</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-parser-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>restconf-client-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>restconf-client-impl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>restconf-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>binding-data-codec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools.thirdparty</groupId>
+            <artifactId>xtend-lib-osgi</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+        </dependency>
+
+        <!-- test the features.xml -->
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>features-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
 </project>

diff --git a/common/features/src/main/resources/features.xml b/common/features/src/main/resources/features.xml
index 7f94b50c59733ca7adf0d4e038200af62a06f9d9..45f1a8de1bec4c3f71a5f4ff46a9e54b9af46b32 100644 (file)
--- a/common/features/src/main/resources/features.xml
+++ b/common/features/src/main/resources/features.xml
@@ -34,14 +34,18 @@
         <bundle>mvn:org.opendaylight.yangtools.thirdparty/antlr4-runtime-osgi-nohead/${antlr4.version}</bundle>
         <bundle>mvn:commons-io/commons-io/${commons.io.version}</bundle>
         <bundle>mvn:org.opendaylight.yangtools/yang-data-api/${project.version}</bundle>
+        <bundle>mvn:org.opendaylight.yangtools/yang-data-composite-node/${project.version}</bundle>
         <bundle>mvn:org.opendaylight.yangtools/yang-data-impl/${project.version}</bundle>
         <bundle>mvn:org.opendaylight.yangtools/yang-data-operations/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.yangtools/yang-data-composite-node/${project.version}</bundle>
         <bundle>mvn:org.opendaylight.yangtools/yang-data-util/${project.version}</bundle>
         <bundle>mvn:org.opendaylight.yangtools/yang-model-api/${project.version}</bundle>
         <bundle>mvn:org.opendaylight.yangtools/yang-model-util/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.yangtools/yang-parser-impl/${project.version}</bundle>
         <bundle>mvn:org.opendaylight.yangtools/yang-parser-api/${project.version}</bundle>
+        <bundle>mvn:org.opendaylight.yangtools/yang-parser-impl/${project.version}</bundle>
+
+        <!-- GSON-based JSON codec. Can be split out -->
+        <bundle>mvn:com.google.code.gson/gson/${gson.version}</bundle>
+        <bundle>mvn:org.opendaylight.yangtools/yang-data-codec-gson/${project.version}</bundle>
     </feature>
 
     <feature name='odl-yangtools-binding' version='${project.version}' description='OpenDaylight :: Yangtools :: Binding'>

diff --git a/common/parent/pom.xml b/common/parent/pom.xml
index 57af4a168e96730fa487c62ef7def95275a2446b..6be124216f4757ebb77042bb12246559cab56fb2 100644 (file)
--- a/common/parent/pom.xml
+++ b/common/parent/pom.xml
@@ -210,6 +210,11 @@
                 <artifactId>yang-data-impl</artifactId>
                 <version>0.6.2-SNAPSHOT</version>
             </dependency>
+            <dependency>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>yang-data-codec-gson</artifactId>
+                <version>0.6.2-SNAPSHOT</version>
+            </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-model-api</artifactId>