Bump Twirl-maven-plugin version & clean-up

Change-Id: I342a36f07b39520ad99d5e9391f498e00693085c
Signed-off-by: Martin Ciglan <mciglan@cisco.com>

diff --git a/binding2/mdsal-binding2-generator-impl/pom.xml b/binding2/mdsal-binding2-generator-impl/pom.xml
index 8c16b8dd83d80780c31e824a137090db15f35f8b..0aaff9962b5682f53a91189827e384103149e84a 100644 (file)
--- a/binding2/mdsal-binding2-generator-impl/pom.xml
+++ b/binding2/mdsal-binding2-generator-impl/pom.xml
@@ -117,7 +117,7 @@
             <plugin>
                 <groupId>com.jakewharton.twirl</groupId>
                 <artifactId>twirl-maven-plugin</artifactId>
-                <version>1.0.4</version>
+                <version>1.0.5</version>
                 <executions>
                     <execution>
                         <id>twirl-to-scala-first</id>

diff --git a/binding2/mdsal-binding2-java-api-generator/pom.xml b/binding2/mdsal-binding2-java-api-generator/pom.xml
index c58023e865fb6dd4fbf424e06325a823b7829bcc..f2e693eaa7d5c211935c5fe9a00b0f923804d2df 100644 (file)
--- a/binding2/mdsal-binding2-java-api-generator/pom.xml
+++ b/binding2/mdsal-binding2-java-api-generator/pom.xml
@@ -115,7 +115,7 @@
             <plugin>
                 <groupId>com.jakewharton.twirl</groupId>
                 <artifactId>twirl-maven-plugin</artifactId>
-                <version>1.0.4</version>
+                <version>1.0.5</version>
                 <executions>
                     <execution>
                         <id>twirl-to-scala-first</id>

diff --git a/binding2/mdsal-binding2-maven-api-gen-plugin/pom.xml b/binding2/mdsal-binding2-maven-api-gen-plugin/pom.xml
index bc4c39caf823d5224abdbf3912f4f8835fae4a95..69171f4e6afc8bbd293f9ddc2f0312ce30b131de 100644 (file)
--- a/binding2/mdsal-binding2-maven-api-gen-plugin/pom.xml
+++ b/binding2/mdsal-binding2-maven-api-gen-plugin/pom.xml
@@ -83,43 +83,6 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <!-- Twirl -> compile Twirl files to Scala without Play framework dependencies needed -->
-            <plugin>
-                <groupId>com.jakewharton.twirl</groupId>
-                <artifactId>twirl-maven-plugin</artifactId>
-                <version>1.0.4</version>
-                <executions>
-                    <execution>
-                        <id>twirl-to-scala-first</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>compile</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <!-- Scala -> compile Scala files generated from Twirl -->
-            <plugin>
-                <groupId>net.alchim31.maven</groupId>
-                <artifactId>scala-maven-plugin</artifactId>
-                <version>3.2.2</version>
-                <executions>
-                    <execution>
-                        <id>scala-compile-second</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>add-source</goal>
-                            <goal>compile</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
   <!--
       Maven Site Configuration