Merge lp:~sergiusens/snapcraft/maven into lp:~snappy-dev/snapcraft/core

[Sergio Schvezov]

Add support for maven options

[lp:~sergiusens/snapcraft/maven]

251. By Sergio Schvezov on 2015-10-20

Adding an integration test

[John Lenton (chipaca)]

lgtm!

review: Approve

=== modified file 'examples/tomcat-maven-webapp/snapcraft.yaml'
--- examples/tomcat-maven-webapp/snapcraft.yaml	2015-10-08 19:33:48 +0000
+++ examples/tomcat-maven-webapp/snapcraft.yaml	2015-10-20 01:49:22 +0000
@@ -19,7 +19,7 @@
         source: git://github.com/lool/snappy-mvn-demo.git
     tomcat:
         plugin: tar-content
-        source: http://mirrors.ircam.fr/pub/apache/tomcat/tomcat-8/v8.0.27/bin/apache-tomcat-8.0.27.tar.gz
+        source: http://mirrors.ircam.fr/pub/apache/tomcat/tomcat-8/v8.0.28/bin/apache-tomcat-8.0.28.tar.gz
     local-files:
         plugin: make
         source: .

=== added directory 'integration-tests/data/simple-maven'
=== added file 'integration-tests/data/simple-maven/icon.png'
=== added directory 'integration-tests/data/simple-maven/my-app'
=== added file 'integration-tests/data/simple-maven/my-app/pom.xml'
--- integration-tests/data/simple-maven/my-app/pom.xml	1970-01-01 00:00:00 +0000
+++ integration-tests/data/simple-maven/my-app/pom.xml	2015-10-20 01:49:22 +0000
@@ -0,0 +1,18 @@
+<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/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.canonical.testapp</groupId>
+  <artifactId>my-app</artifactId>
+  <packaging>jar</packaging>
+  <version>1.0-SNAPSHOT</version>
+  <name>my-app</name>
+  <url>http://maven.apache.org</url>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>

=== added directory 'integration-tests/data/simple-maven/my-app/src'
=== added directory 'integration-tests/data/simple-maven/my-app/src/main'
=== added directory 'integration-tests/data/simple-maven/my-app/src/main/java'
=== added directory 'integration-tests/data/simple-maven/my-app/src/main/java/com'
=== added directory 'integration-tests/data/simple-maven/my-app/src/main/java/com/canonical'
=== added directory 'integration-tests/data/simple-maven/my-app/src/main/java/com/canonical/testapp'
=== added file 'integration-tests/data/simple-maven/my-app/src/main/java/com/canonical/testapp/App.java'
--- integration-tests/data/simple-maven/my-app/src/main/java/com/canonical/testapp/App.java	1970-01-01 00:00:00 +0000
+++ integration-tests/data/simple-maven/my-app/src/main/java/com/canonical/testapp/App.java	2015-10-20 01:49:22 +0000
@@ -0,0 +1,13 @@
+package com.canonical.testapp;
+
+/**
+ * Hello world!
+ *
+ */
+public class App 
+{
+    public static void main( String[] args )
+    {
+        System.out.println( "Hello World!" );
+    }
+}

=== added directory 'integration-tests/data/simple-maven/my-app/src/main/resources'
=== added directory 'integration-tests/data/simple-maven/my-app/src/main/resources/META-INF'
=== added file 'integration-tests/data/simple-maven/my-app/src/main/resources/META-INF/application.properties'
--- integration-tests/data/simple-maven/my-app/src/main/resources/META-INF/application.properties	1970-01-01 00:00:00 +0000
+++ integration-tests/data/simple-maven/my-app/src/main/resources/META-INF/application.properties	2015-10-20 01:49:22 +0000
@@ -0,0 +1,1 @@
+application.hello=${application.hello}

=== added directory 'integration-tests/data/simple-maven/my-app/src/test'
=== added directory 'integration-tests/data/simple-maven/my-app/src/test/java'
=== added directory 'integration-tests/data/simple-maven/my-app/src/test/java/com'
=== added directory 'integration-tests/data/simple-maven/my-app/src/test/java/com/canonical'
=== added directory 'integration-tests/data/simple-maven/my-app/src/test/java/com/canonical/testapp'
=== added file 'integration-tests/data/simple-maven/my-app/src/test/java/com/canonical/testapp/AppTest.java'
--- integration-tests/data/simple-maven/my-app/src/test/java/com/canonical/testapp/AppTest.java	1970-01-01 00:00:00 +0000
+++ integration-tests/data/simple-maven/my-app/src/test/java/com/canonical/testapp/AppTest.java	2015-10-20 01:49:22 +0000
@@ -0,0 +1,38 @@
+package com.canonical.testapp;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest 
+    extends TestCase
+{
+    /**
+     * Create the test case
+     *
+     * @param testName name of the test case
+     */
+    public AppTest( String testName )
+    {
+        super( testName );
+    }
+
+    /**
+     * @return the suite of tests being tested
+     */
+    public static Test suite()
+    {
+        return new TestSuite( AppTest.class );
+    }
+
+    /**
+     * Rigourous Test :-)
+     */
+    public void testApp()
+    {
+        assertTrue( false );
+    }
+}

=== added file 'integration-tests/data/simple-maven/snapcraft.yaml'
--- integration-tests/data/simple-maven/snapcraft.yaml	1970-01-01 00:00:00 +0000
+++ integration-tests/data/simple-maven/snapcraft.yaml	2015-10-20 01:49:22 +0000
@@ -0,0 +1,15 @@
+name: simple-maven
+version: 0
+vendor: Vendor <[e-mail]>
+summary: test maven builds
+description: |
+ Test maven builds and options. If the tests aren't skipped we will run into
+ the assertTrue ( false ) statement and the build will fail.
+icon: icon.png
+
+parts:
+  m:
+    plugin: maven
+    source: my-app
+    maven-options:
+      - -DskipTests

=== modified file 'integration-tests/units/jobs.pxu'
--- integration-tests/units/jobs.pxu	2015-10-15 22:08:19 +0000
+++ integration-tests/units/jobs.pxu	2015-10-20 01:49:22 +0000
@@ -135,6 +135,13 @@
     test "$(./stage/bin/test)" = "Hello world"
 flags: simple has-leftovers
 
+id: snapcraft/normal/simple-maven
+command:
+    set -ex
+    cp -rT $PLAINBOX_PROVIDER_DATA/simple-maven .
+    ${SNAPCRAFT} build
+flags: simple has-leftovers
+
 id: snapcraft/normal/simple-scons
 command:
     set -ex

=== modified file 'snapcraft/plugins/jdk.py'
--- snapcraft/plugins/jdk.py	2015-10-17 02:25:13 +0000
+++ snapcraft/plugins/jdk.py	2015-10-20 01:49:22 +0000
@@ -23,9 +23,6 @@
         super().__init__(name, options)
         self.stage_packages.append('default-jdk')
 
-    def pull(self):
-        return True
-
     def env(self, root):
         return ['JAVA_HOME=%s/usr/lib/jvm/default-java' % root,
                 'PATH=%s/usr/lib/jvm/default-java/bin:'

=== modified file 'snapcraft/plugins/maven.py'
--- snapcraft/plugins/maven.py	2015-10-17 02:25:13 +0000
+++ snapcraft/plugins/maven.py	2015-10-20 01:49:22 +0000
@@ -28,6 +28,21 @@
 
 class MavenPlugin(snapcraft.plugins.jdk.JdkPlugin):
 
+    @classmethod
+    def schema(cls):
+        schema = super().schema()
+        schema['properties']['maven-options'] = {
+            'type': 'array',
+            'minitems': 1,
+            'uniqueItems': True,
+            'items': {
+                'type': 'string',
+            },
+            'default': [],
+        }
+
+        return schema
+
     def __init__(self, name, options):
         super().__init__(name, options)
         self.build_packages.append('maven')
@@ -35,7 +50,7 @@
     def build(self):
         super().build()
 
-        if not self.run(['mvn', 'package']):
+        if not self.run(['mvn', 'package'] + self.options.maven_options):
             return False
         jarfiles = glob.glob(os.path.join(self.builddir, 'target', '*.jar'))
         warfiles = glob.glob(os.path.join(self.builddir, 'target', '*.war'))