diff options
author | gjoranv <gv@oath.com> | 2018-07-25 19:38:49 +0200 |
---|---|---|
committer | gjoranv <gv@oath.com> | 2018-08-24 14:57:52 +0200 |
commit | b99970ec9993be170265ffa076938334ec5a3b65 (patch) | |
tree | 218f4de3674c6286969f4ee372c3842f3f05d89e | |
parent | c6fb354b9542b17a05f43be675e6ed27d797d1ff (diff) |
Rename config param to attach bundle artifact
.. to better follow maven convention and terminology.
-rw-r--r-- | bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/AssembleContainerPluginMojo.java | 4 | ||||
-rw-r--r-- | controller-server/pom.xml | 2 | ||||
-rw-r--r-- | docker-api/pom.xml | 2 | ||||
-rw-r--r-- | node-admin/pom.xml | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/AssembleContainerPluginMojo.java b/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/AssembleContainerPluginMojo.java index 30ffc54225f..13d73d58a97 100644 --- a/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/AssembleContainerPluginMojo.java +++ b/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/AssembleContainerPluginMojo.java @@ -52,7 +52,7 @@ public class AssembleContainerPluginMojo extends AbstractMojo { private boolean useCommonAssemblyIds = false; @Parameter(alias = "AttachBundle", defaultValue = "false") - private boolean attachBundleToArtifact; + private boolean attachBundleArtifact; @Parameter(alias = "BundleClassifier", defaultValue = "bundle") private String bundleClassifierName; @@ -88,7 +88,7 @@ public class AssembleContainerPluginMojo extends AbstractMojo { addDependencies(jarWithDependencies); createArchive(jarFiles.get(Dependencies.WITH), jarWithDependencies); - if (attachBundleToArtifact) { + if (attachBundleArtifact) { projectHelper.attachArtifact(project, project.getArtifact().getType(), bundleClassifierName, diff --git a/controller-server/pom.xml b/controller-server/pom.xml index d9a25520985..44954e19fea 100644 --- a/controller-server/pom.xml +++ b/controller-server/pom.xml @@ -216,7 +216,7 @@ <groupId>com.yahoo.vespa</groupId> <artifactId>bundle-plugin</artifactId> <configuration> - <attachBundleToArtifact>true</attachBundleToArtifact> + <attachBundleArtifact>true</attachBundleArtifact> <bundleClassifierName>deploy</bundleClassifierName> <useCommonAssemblyIds>false</useCommonAssemblyIds> <WebInfUrl>/WEB-INF/web.xml</WebInfUrl> diff --git a/docker-api/pom.xml b/docker-api/pom.xml index 87761a17f70..64410c32f06 100644 --- a/docker-api/pom.xml +++ b/docker-api/pom.xml @@ -129,7 +129,7 @@ <artifactId>bundle-plugin</artifactId> <extensions>true</extensions> <configuration> - <attachBundleToArtifact>true</attachBundleToArtifact> + <attachBundleArtifact>true</attachBundleArtifact> </configuration> </plugin> <plugin> diff --git a/node-admin/pom.xml b/node-admin/pom.xml index 0057b636548..7daeacec463 100644 --- a/node-admin/pom.xml +++ b/node-admin/pom.xml @@ -134,7 +134,7 @@ <artifactId>bundle-plugin</artifactId> <extensions>true</extensions> <configuration> - <attachBundleToArtifact>true</attachBundleToArtifact> + <attachBundleArtifact>true</attachBundleArtifact> </configuration> </plugin> </plugins> |