diff options
17 files changed, 20 insertions, 18 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}") diff --git a/config-class-plugin/src/main/java/com/yahoo/vespa/ConfigGenMojo.java b/config-class-plugin/src/main/java/com/yahoo/vespa/ConfigGenMojo.java index ade3ac3125d..b6197bc2eca 100644 --- a/config-class-plugin/src/main/java/com/yahoo/vespa/ConfigGenMojo.java +++ b/config-class-plugin/src/main/java/com/yahoo/vespa/ConfigGenMojo.java @@ -20,7 +20,7 @@ import java.util.ArrayList; /** * Goal which generates config classes from def-files. */ -@org.apache.maven.plugins.annotations.Mojo(name = "config-gen", defaultPhase = LifecyclePhase.GENERATE_SOURCES) +@org.apache.maven.plugins.annotations.Mojo(name = "config-gen", defaultPhase = LifecyclePhase.GENERATE_SOURCES, threadSafe = true) public class ConfigGenMojo extends AbstractMojo { @Component private MavenProject project; diff --git a/config_test/pom.xml b/config_test/pom.xml index 576f8c323b8..ae909a02603 100644 --- a/config_test/pom.xml +++ b/config_test/pom.xml @@ -25,7 +25,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>2.5.1</version> + <version>3.6.1</version> <configuration> <source>1.8</source> <target>1.8</target> diff --git a/configgen/src/main/scala/com/yahoo/config/codegen/JavaClassBuilder.scala b/configgen/src/main/scala/com/yahoo/config/codegen/JavaClassBuilder.scala index f05c33518ed..f0d128036d0 100644 --- a/configgen/src/main/scala/com/yahoo/config/codegen/JavaClassBuilder.scala +++ b/configgen/src/main/scala/com/yahoo/config/codegen/JavaClassBuilder.scala @@ -166,7 +166,9 @@ object JavaClassBuilder { val subDirs: Array[String] = (PackagePrefix + namespace).split("""\.""") for (subDir <- subDirs) { dir = new File(dir, subDir) - if (!dir.isDirectory && !dir.mkdir) throw new CodegenRuntimeException("Could not create " + dir.getPath) + this.synchronized { + if (!dir.isDirectory && !dir.mkdir) throw new CodegenRuntimeException("Could not create " + dir.getPath) + } } dir } diff --git a/container-dev-builder/tools/pom.xml b/container-dev-builder/tools/pom.xml index 6ea81ecf5c2..3c1132e439d 100644 --- a/container-dev-builder/tools/pom.xml +++ b/container-dev-builder/tools/pom.xml @@ -19,7 +19,7 @@ <plugins> <plugin> <artifactId>maven-compiler-plugin</artifactId> - <version>3.1</version> + <version>3.6.1</version> <configuration> <source>1.8</source> <target>1.8</target> diff --git a/libmlr/pom.xml b/libmlr/pom.xml index 9c0c5e06e04..6dea2403ea3 100644 --- a/libmlr/pom.xml +++ b/libmlr/pom.xml @@ -21,7 +21,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.1</version> + <version>3.6.1</version> <configuration> <compilerArgs> <arg>-Xlint:all</arg> @@ -91,7 +91,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.1</version> + <version>3.6.1</version> <configuration> <source>1.8</source> <target>1.8</target> @@ -1094,7 +1094,7 @@ <doclint>all</doclint> <scala.major-version>2.11</scala.major-version> <scala.version>${scala.major-version}.4</scala.version> - <surefire.version>2.19.1</surefire.version> + <surefire.version>2.20</surefire.version> </properties> <modules> diff --git a/sample-apps/basic-search-java/pom.xml b/sample-apps/basic-search-java/pom.xml index d23671627d6..30d02f52240 100644 --- a/sample-apps/basic-search-java/pom.xml +++ b/sample-apps/basic-search-java/pom.xml @@ -54,7 +54,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.19.1</version> + <version>2.20</version> <configuration> <systemPropertyVariables> <isMavenSurefirePlugin>true</isMavenSurefirePlugin> diff --git a/sample-apps/basic-search-tensor/pom.xml b/sample-apps/basic-search-tensor/pom.xml index bc9554f9ef4..1310d579ed4 100644 --- a/sample-apps/basic-search-tensor/pom.xml +++ b/sample-apps/basic-search-tensor/pom.xml @@ -55,7 +55,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.19.1</version> + <version>2.20</version> <configuration> <systemPropertyVariables> <isMavenSurefirePlugin>true</isMavenSurefirePlugin> diff --git a/sample-apps/blog-recommendation/pom.xml b/sample-apps/blog-recommendation/pom.xml index 2f1582d4fbe..c517b9472ff 100644 --- a/sample-apps/blog-recommendation/pom.xml +++ b/sample-apps/blog-recommendation/pom.xml @@ -56,7 +56,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.19.1</version> + <version>2.20</version> <configuration> <systemPropertyVariables> <isMavenSurefirePlugin>true</isMavenSurefirePlugin> diff --git a/sample-apps/blog-search-initial/pom.xml b/sample-apps/blog-search-initial/pom.xml index 71a02075a6b..68c42a16e55 100644 --- a/sample-apps/blog-search-initial/pom.xml +++ b/sample-apps/blog-search-initial/pom.xml @@ -53,7 +53,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.13</version> + <version>2.20</version> <configuration> <systemPropertyVariables> <isMavenSurefirePlugin>true</isMavenSurefirePlugin> diff --git a/sample-apps/boolean-search/pom.xml b/sample-apps/boolean-search/pom.xml index 944511e37b2..aa576255389 100644 --- a/sample-apps/boolean-search/pom.xml +++ b/sample-apps/boolean-search/pom.xml @@ -53,7 +53,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.19.1</version> + <version>2.20</version> <configuration> <systemPropertyVariables> <isMavenSurefirePlugin>true</isMavenSurefirePlugin> diff --git a/sample-apps/http-api-using-request-handlers-and-processors/pom.xml b/sample-apps/http-api-using-request-handlers-and-processors/pom.xml index 6e7d0da75db..f9c114a1efa 100644 --- a/sample-apps/http-api-using-request-handlers-and-processors/pom.xml +++ b/sample-apps/http-api-using-request-handlers-and-processors/pom.xml @@ -54,7 +54,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.19.1</version> + <version>2.20</version> <configuration> <systemPropertyVariables> <isMavenSurefirePlugin>true</isMavenSurefirePlugin> diff --git a/sample-apps/http-api-using-searcher/pom.xml b/sample-apps/http-api-using-searcher/pom.xml index c8e222fae4b..df2f60bf20b 100644 --- a/sample-apps/http-api-using-searcher/pom.xml +++ b/sample-apps/http-api-using-searcher/pom.xml @@ -54,7 +54,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.19.1</version> + <version>2.20</version> <configuration> <systemPropertyVariables> <isMavenSurefirePlugin>true</isMavenSurefirePlugin> |