Cleanup yang-parser-rfc7950 antlr configuration

[yangtools.git] / yang / yang-parser-rfc7950 / pom.xml

diff --git a/yang/yang-parser-rfc7950/pom.xml b/yang/yang-parser-rfc7950/pom.xml
index c1eced17483c4eb0563adc41003658aadc038f1b..284fc5e9fe89286aff2ad7da3a659aaaa96c6b82 100644 (file)
--- a/yang/yang-parser-rfc7950/pom.xml
+++ b/yang/yang-parser-rfc7950/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>2.1.4-SNAPSHOT</version>
+        <version>4.0.2-SNAPSHOT</version>
         <relativePath>../../bundle-parent</relativePath>
     </parent>
 
@@ -21,6 +21,14 @@
     <name>${project.artifactId}</name>
     <description>RFC6020/RFC7950 parser support</description>
 
+    <properties>
+        <!-- FIXME: workaround for MJAVADOC-586 -->
+        <maven.compiler.release>8</maven.compiler.release>
+
+        <!-- FIXME: antlr-generated code does not pass SB -->
+        <odlparent.spotbugs.enforce>false</odlparent.spotbugs.enforce>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>com.google.guava</groupId>
@@ -85,9 +93,9 @@
                 </executions>
                 <configuration>
                     <sourceDirectory>src/main/antlr</sourceDirectory>
-                    <outputDirectory>${project.build.directory}/generated-sources/parser/org/opendaylight/yangtools/antlrv4/code/gen</outputDirectory>
+                    <outputDirectory>${project.build.directory}/generated-sources/parser</outputDirectory>
                     <visitor>true</visitor>
-                    <listener>true</listener>
+                    <listener>false</listener>
                 </configuration>
             </plugin>
             <plugin>
@@ -95,7 +103,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Import-Package>!javax.annotation,*</Import-Package>
+                        <Automatic-Module-Name>org.opendaylight.yangtools.yang.parser.rfc7950</Automatic-Module-Name>
                     </instructions>
                 </configuration>
             </plugin>
@@ -103,13 +111,6 @@
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-                <configuration>
-                    <propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
-                </configuration>
-            </plugin>
         </plugins>
     </build>