diff options
| author | Bjørn Christian Seime <bjorncs@yahoo-inc.com> | 2017-06-19 19:51:38 +0200 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@yahoo-inc.com> | 2017-06-19 20:26:44 +0200 |
| commit | 15b5f08d7b13737b4c9d09ec3769b1b99e32dddd (patch) | |
| tree | b7040f6ea5a9a62ac31efbd4d831ff31b902d820 | |
| parent | 234ef93af8707c992b18ac793ac83c013826e236 (diff) | |
Update dependencies for bundle-plugin
| -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-- | pom.xml | 17 |
3 files changed, 16 insertions, 20 deletions
diff --git a/bundle-plugin/pom.xml b/bundle-plugin/pom.xml index 4c39d32131a..839551f5b07 100644 --- a/bundle-plugin/pom.xml +++ b/bundle-plugin/pom.xml @@ -24,6 +24,11 @@ </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> @@ -36,10 +41,6 @@ <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> @@ -71,10 +72,6 @@ <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 15c2a2ed35a..67bce48601c 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,6 +8,7 @@ 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 @@ -27,6 +28,9 @@ 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 @@ -71,7 +75,7 @@ class AssembleContainerPluginMojo extends AbstractMojo { val mavenArchiver = new MavenArchiver mavenArchiver.setArchiver(jarArchiver) mavenArchiver.setOutputFile(jarFile) - mavenArchiver.createArchive(project, archiveConfiguration) + mavenArchiver.createArchive(session, project, archiveConfiguration) } private def addDependencies() { @@ -535,7 +535,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-compress</artifactId> - <version>1.8</version> + <version>1.11</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> @@ -806,17 +806,17 @@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-artifact</artifactId> - <version>3.1.1</version> + <version>3.5.0</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-core</artifactId> - <version>3.1.1</version> + <version>3.5.0</version> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-model</artifactId> - <version>3.1.1</version> + <version>3.5.0</version> </dependency> <dependency> <groupId>org.apache.maven.plugin-tools</groupId> @@ -834,14 +834,9 @@ <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>2.2</version> + <version>3.0.2</version> </dependency> <dependency> <groupId>org.apache.maven.surefire</groupId> @@ -1013,7 +1008,7 @@ <dependency> <groupId>org.twdata.maven</groupId> <artifactId>mojo-executor</artifactId> - <version>2.2.0</version> + <version>2.3.0</version> </dependency> <dependency> <groupId>net.jcip</groupId> |