summaryrefslogtreecommitdiffstats
path: root/bundle-plugin
diff options
context:
space:
mode:
authorgjoranv <gjoranv@gmail.com>2017-06-15 11:16:13 +0200
committerGitHub <noreply@github.com>2017-06-15 11:16:13 +0200
commit9b97c1d00a5466000b4e5a81d37bacbf7bd33684 (patch)
tree161a8c4bb8da06edc5060153b3d840006a0d4aef /bundle-plugin
parentc085f67019a69e53f73e62b7d175a9bc8861f1ff (diff)
parenta6ebf38e3020cf2b63d59b06755b13e601ea5cdf (diff)
Merge pull request #2781 from yahoo/bjorncs/update-maven-plugins
Upgrade maven-compiler-plugin to 3.6.1
Diffstat (limited to 'bundle-plugin')
-rw-r--r--bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateSourcesMojo.java2
-rw-r--r--bundle-plugin/src/main/scala/com/yahoo/container/plugin/mojo/AssembleContainerPluginMojo.scala2
-rw-r--r--bundle-plugin/src/main/scala/com/yahoo/container/plugin/mojo/GenerateBundleClassPathMappingsMojo.scala2
-rw-r--r--bundle-plugin/src/main/scala/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.scala2
4 files changed, 4 insertions, 4 deletions
diff --git a/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateSourcesMojo.java b/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateSourcesMojo.java
index aaa824a2769..06486c00810 100644
--- a/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateSourcesMojo.java
+++ b/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateSourcesMojo.java
@@ -29,7 +29,7 @@ import static org.twdata.maven.mojoexecutor.MojoExecutor.*;
*
* @author tonytv
*/
-@Mojo(name = "generateSources", requiresDependencyResolution = ResolutionScope.COMPILE)
+@Mojo(name = "generateSources", requiresDependencyResolution = ResolutionScope.COMPILE, threadSafe = true)
public class GenerateSourcesMojo extends AbstractMojo {
@Parameter(defaultValue = "${project}")
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 53d0e315ffe..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
@@ -19,7 +19,7 @@ import scala.collection.convert.wrapAsScala._
/**
* @author tonytv
*/
-@Mojo(name = "assemble-container-plugin", requiresDependencyResolution = ResolutionScope.COMPILE)
+@Mojo(name = "assemble-container-plugin", requiresDependencyResolution = ResolutionScope.COMPILE, threadSafe = true)
class AssembleContainerPluginMojo extends AbstractMojo {
object withDependencies
object withoutDependencies
diff --git a/bundle-plugin/src/main/scala/com/yahoo/container/plugin/mojo/GenerateBundleClassPathMappingsMojo.scala b/bundle-plugin/src/main/scala/com/yahoo/container/plugin/mojo/GenerateBundleClassPathMappingsMojo.scala
index 602a6115d49..cad91e00684 100644
--- a/bundle-plugin/src/main/scala/com/yahoo/container/plugin/mojo/GenerateBundleClassPathMappingsMojo.scala
+++ b/bundle-plugin/src/main/scala/com/yahoo/container/plugin/mojo/GenerateBundleClassPathMappingsMojo.scala
@@ -22,7 +22,7 @@ import org.apache.maven.project.MavenProject
* The mapping in stored in a json file.
* @author tonytv
*/
-@Mojo(name = "generate-bundle-classpath-mappings", requiresDependencyResolution = ResolutionScope.COMPILE_PLUS_RUNTIME)
+@Mojo(name = "generate-bundle-classpath-mappings", requiresDependencyResolution = ResolutionScope.COMPILE_PLUS_RUNTIME, threadSafe = true)
class GenerateBundleClassPathMappingsMojo extends AbstractMojo {
@Parameter(defaultValue = "${project}")
private var project: MavenProject = null
diff --git a/bundle-plugin/src/main/scala/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.scala b/bundle-plugin/src/main/scala/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.scala
index 093914795e7..d66edf88702 100644
--- a/bundle-plugin/src/main/scala/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.scala
+++ b/bundle-plugin/src/main/scala/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.scala
@@ -28,7 +28,7 @@ import scala.collection.immutable.Map
/**
* @author tonytv
*/
-@Mojo(name = "generate-osgi-manifest", requiresDependencyResolution = ResolutionScope.TEST)
+@Mojo(name = "generate-osgi-manifest", requiresDependencyResolution = ResolutionScope.TEST, threadSafe = true)
class GenerateOsgiManifestMojo extends AbstractMojo {
@Parameter(defaultValue = "${project}")