diff options
| -rw-r--r-- | bundle-plugin/pom.xml | 13 | ||||
| -rw-r--r-- | bundle-plugin/src/main/scala/com/yahoo/container/plugin/mojo/AssembleContainerPluginMojo.scala | 6 | ||||
| -rw-r--r-- | container-disc/pom.xml | 1 | ||||
| -rwxr-xr-x | docker/vespa-ci.sh | 2 | ||||
| -rw-r--r-- | pom.xml | 21 | ||||
| -rw-r--r-- | vespa-application-maven-plugin/pom.xml | 30 | ||||
| -rw-r--r-- | vespa-application-maven-plugin/src/main/java/com/yahoo/container/plugin/mojo/ApplicationMojo.java | 5 |
7 files changed, 48 insertions, 30 deletions
diff --git a/bundle-plugin/pom.xml b/bundle-plugin/pom.xml index 839551f5b07..4c39d32131a 100644 --- a/bundle-plugin/pom.xml +++ b/bundle-plugin/pom.xml @@ -24,11 +24,6 @@ </dependency> <dependency> <groupId>org.apache.maven</groupId> - <artifactId>maven-archiver</artifactId> - <version>3.1.1</version> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> <artifactId>maven-model</artifactId> </dependency> <dependency> @@ -41,6 +36,10 @@ <scope>provided</scope> </dependency> <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-project</artifactId> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> @@ -72,6 +71,10 @@ <artifactId>asm</artifactId> </dependency> <dependency> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + </dependency> + <dependency> <groupId>org.twdata.maven</groupId> <artifactId>mojo-executor</artifactId> </dependency> diff --git a/bundle-plugin/src/main/scala/com/yahoo/container/plugin/mojo/AssembleContainerPluginMojo.scala b/bundle-plugin/src/main/scala/com/yahoo/container/plugin/mojo/AssembleContainerPluginMojo.scala index 67bce48601c..15c2a2ed35a 100644 --- a/bundle-plugin/src/main/scala/com/yahoo/container/plugin/mojo/AssembleContainerPluginMojo.scala +++ b/bundle-plugin/src/main/scala/com/yahoo/container/plugin/mojo/AssembleContainerPluginMojo.scala @@ -8,7 +8,6 @@ import java.util.zip.ZipEntry import com.yahoo.container.plugin.util.{Files, JarFiles} import org.apache.maven.archiver.{MavenArchiveConfiguration, MavenArchiver} -import org.apache.maven.execution.MavenSession import org.apache.maven.plugin.AbstractMojo import org.apache.maven.plugins.annotations.{Component, Mojo, Parameter, ResolutionScope} import org.apache.maven.project.MavenProject @@ -28,9 +27,6 @@ class AssembleContainerPluginMojo extends AbstractMojo { @Parameter(defaultValue = "${project}") var project: MavenProject = null - @Parameter(defaultValue = "${session}", readonly = true, required = true) - var session: MavenSession = null - @Component(role = classOf[Archiver], hint = "jar") var jarArchiver: JarArchiver = null @@ -75,7 +71,7 @@ class AssembleContainerPluginMojo extends AbstractMojo { val mavenArchiver = new MavenArchiver mavenArchiver.setArchiver(jarArchiver) mavenArchiver.setOutputFile(jarFile) - mavenArchiver.createArchive(session, project, archiveConfiguration) + mavenArchiver.createArchive(project, archiveConfiguration) } private def addDependencies() { diff --git a/container-disc/pom.xml b/container-disc/pom.xml index 5d19e9ecffe..265dee1093c 100644 --- a/container-disc/pom.xml +++ b/container-disc/pom.xml @@ -219,6 +219,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> + <version>1.2.1</version> <executions> <execution> <phase>validate</phase> diff --git a/docker/vespa-ci.sh b/docker/vespa-ci.sh index beb5944233b..3e990bb2991 100755 --- a/docker/vespa-ci.sh +++ b/docker/vespa-ci.sh @@ -23,4 +23,4 @@ cp -p ../dist/vespa.spec tmp/vespa.spec docker build -t "$CI_DOCKER_IMAGE" -f Dockerfile.ci . docker run --rm -v $(pwd)/..:/vespa --entrypoint /vespa-ci-internal.sh "$CI_DOCKER_IMAGE" "$GIT_COMMIT" \ - 2>&1 | tee vespa-ci-$(date +%Y-%m-%dT%H:%M:%S%z).log + 2>&1 | tee vespa-ci-${GIT_COMMIT}-$(date +%Y-%m-%dT%H:%M:%S%z).log @@ -137,7 +137,7 @@ <configuration> <additionalparam>-Xdoclint:${doclint} -Xdoclint:-missing</additionalparam> </configuration> - <version>2.10.4</version> + <version>2.9</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -210,7 +210,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> - <version>1.6.0</version> + <version>1.2.1</version> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> @@ -535,7 +535,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-compress</artifactId> - <version>1.11</version> + <version>1.8</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> @@ -806,17 +806,17 @@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-artifact</artifactId> - <version>3.5.0</version> + <version>3.1.1</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-core</artifactId> - <version>3.5.0</version> + <version>3.1.1</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-model</artifactId> - <version>3.5.0</version> + <version>3.1.1</version> </dependency> <dependency> <groupId>org.apache.maven.plugin-tools</groupId> @@ -834,9 +834,14 @@ <version>2.2.1</version> </dependency> <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-interactivity-api</artifactId> + <version>1.0-alpha-5</version> + </dependency> + <dependency> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>3.0.2</version> + <version>2.2</version> </dependency> <dependency> <groupId>org.apache.maven.surefire</groupId> @@ -1008,7 +1013,7 @@ <dependency> <groupId>org.twdata.maven</groupId> <artifactId>mojo-executor</artifactId> - <version>2.3.0</version> + <version>2.2.0</version> </dependency> <dependency> <groupId>net.jcip</groupId> diff --git a/vespa-application-maven-plugin/pom.xml b/vespa-application-maven-plugin/pom.xml index 2464c8208ad..57ef584ece0 100644 --- a/vespa-application-maven-plugin/pom.xml +++ b/vespa-application-maven-plugin/pom.xml @@ -40,6 +40,11 @@ <dependency> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> + <version>3.0.2</version> + </dependency> + <dependency> + <groupId>org.scala-lang</groupId> + <artifactId>scala-library</artifactId> </dependency> <dependency> <groupId>commons-io</groupId> @@ -49,16 +54,23 @@ <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> + <groupId>net.alchim31.maven</groupId> + <artifactId>scala-maven-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>add-source</goal> + <goal>compile</goal> + <goal>testCompile</goal> + </goals> + </execution> + </executions> <configuration> - <source>1.8</source> - <target>1.8</target> - <compilerArgs> - <arg>-Xlint:all</arg> - <arg>-Xlint:-processing</arg> - <arg>-Werror</arg> - </compilerArgs> + <args> + <arg>-unchecked</arg> + <arg>-deprecation</arg> + <arg>-explaintypes</arg> + </args> </configuration> </plugin> <plugin> diff --git a/vespa-application-maven-plugin/src/main/java/com/yahoo/container/plugin/mojo/ApplicationMojo.java b/vespa-application-maven-plugin/src/main/java/com/yahoo/container/plugin/mojo/ApplicationMojo.java index 9002340478b..8aa5c1bb761 100644 --- a/vespa-application-maven-plugin/src/main/java/com/yahoo/container/plugin/mojo/ApplicationMojo.java +++ b/vespa-application-maven-plugin/src/main/java/com/yahoo/container/plugin/mojo/ApplicationMojo.java @@ -5,6 +5,7 @@ import org.apache.commons.io.FileUtils; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; +import org.apache.maven.plugins.annotations.Component; import org.apache.maven.plugins.annotations.LifecyclePhase; import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter; @@ -21,10 +22,10 @@ import java.util.List; /** * @author tonytv */ -@Mojo(name = "packageApplication", defaultPhase = LifecyclePhase.PACKAGE, threadSafe = true) +@Mojo(name = "packageApplication", defaultPhase = LifecyclePhase.PACKAGE) public class ApplicationMojo extends AbstractMojo { - @Parameter( defaultValue = "${project}", readonly = true ) + @Component protected MavenProject project; @Parameter(defaultValue = "src/main/application") |