Revert "Update dependencies for bundle-plugin"

2 files changed, 9 insertions, 10 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() {