diff options
26 files changed, 2 insertions, 82 deletions
diff --git a/airlift-zstd/pom.xml b/airlift-zstd/pom.xml index c7eb8c96f39..9d9cb344891 100644 --- a/airlift-zstd/pom.xml +++ b/airlift-zstd/pom.xml @@ -75,9 +75,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-install-plugin</artifactId> - <configuration> - <updateReleaseInfo>true</updateReleaseInfo> - </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> diff --git a/annotations/pom.xml b/annotations/pom.xml index e3f5455c88b..067a6966a11 100644 --- a/annotations/pom.xml +++ b/annotations/pom.xml @@ -42,9 +42,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-install-plugin</artifactId> - <configuration> - <updateReleaseInfo>true</updateReleaseInfo> - </configuration> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/StateRestApiTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/StateRestApiTest.java index 58208cb453b..b09069dbad7 100644 --- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/StateRestApiTest.java +++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/StateRestApiTest.java @@ -18,8 +18,6 @@ import com.yahoo.vespa.clustercontroller.core.hostinfo.HostInfo; import com.yahoo.vespa.clustercontroller.utils.staterestapi.StateRestAPI; import com.yahoo.vespa.clustercontroller.utils.staterestapi.requests.UnitStateRequest; import com.yahoo.vespa.clustercontroller.utils.staterestapi.server.JsonWriter; -import com.yahoo.vespa.config.content.StorDistributionConfig; - import java.util.Collection; import java.util.HashMap; import java.util.LinkedHashMap; @@ -169,12 +167,8 @@ public abstract class StateRestApiTest { "}"; } - private static String getSimpleGroupConfig(int redundancy, int nodeCount) { - return getSimpleGroupConfig(redundancy, nodeCount, StorDistributionConfig.Disk_distribution.Enum.MODULO_BID); - } - // TODO: Use config builder instead of creating raw: config - private static String getSimpleGroupConfig(int redundancy, int nodeCount, StorDistributionConfig.Disk_distribution.Enum diskDistribution) { + private static String getSimpleGroupConfig(int redundancy, int nodeCount) { StringBuilder sb = new StringBuilder(); sb.append("raw:redundancy ").append(redundancy).append("\n").append("group[4]\n"); @@ -205,7 +199,6 @@ public abstract class StateRestApiTest { for (int i=1; i<nodeCount; i += 2) { sb.append("group[" + group + "].nodes[").append(i / 2).append("].index ").append(i).append("\n"); } - sb.append("disk_distribution ").append(diskDistribution.toString()).append("\n"); return sb.toString(); } diff --git a/config-model/pom.xml b/config-model/pom.xml index 79e892903fa..a634a40c93b 100644 --- a/config-model/pom.xml +++ b/config-model/pom.xml @@ -491,9 +491,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-install-plugin</artifactId> - <configuration> - <updateReleaseInfo>true</updateReleaseInfo> - </configuration> </plugin> <plugin> <groupId>com.github.os72</groupId> diff --git a/config-provisioning/pom.xml b/config-provisioning/pom.xml index ab9418ec488..e405f1192b1 100644 --- a/config-provisioning/pom.xml +++ b/config-provisioning/pom.xml @@ -104,9 +104,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-install-plugin</artifactId> - <configuration> - <updateReleaseInfo>true</updateReleaseInfo> - </configuration> </plugin> <plugin> <groupId>com.yahoo.vespa</groupId> diff --git a/config/pom.xml b/config/pom.xml index 0a95c0e1144..83a25b8631d 100755 --- a/config/pom.xml +++ b/config/pom.xml @@ -191,9 +191,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-install-plugin</artifactId> - <configuration> - <updateReleaseInfo>true</updateReleaseInfo> - </configuration> </plugin> <plugin> <groupId>com.yahoo.vespa</groupId> diff --git a/configdefinitions/pom.xml b/configdefinitions/pom.xml index 47cc106c789..51221c4899f 100644 --- a/configdefinitions/pom.xml +++ b/configdefinitions/pom.xml @@ -56,9 +56,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-install-plugin</artifactId> - <configuration> - <updateReleaseInfo>true</updateReleaseInfo> - </configuration> </plugin> <plugin> <groupId>com.yahoo.vespa</groupId> diff --git a/configdefinitions/src/vespa/stor-distribution.def b/configdefinitions/src/vespa/stor-distribution.def index 7c8afdf7682..64c1316d46b 100644 --- a/configdefinitions/src/vespa/stor-distribution.def +++ b/configdefinitions/src/vespa/stor-distribution.def @@ -67,4 +67,5 @@ group[].nodes[].retired bool default=false ## MODULO_INDEX with node index in seed ## MODULO_KNUTH with random(node index) in seed ## MODULO_BID using all used bits, except count bits, and random(node index) +## TODO: Deprecated and unused, remove in Vespa 9 disk_distribution enum { MODULO, MODULO_INDEX, MODULO_KNUTH, MODULO_BID } default=MODULO_BID diff --git a/configserver/pom.xml b/configserver/pom.xml index ef0fde3e57e..5bd155c797b 100644 --- a/configserver/pom.xml +++ b/configserver/pom.xml @@ -345,9 +345,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-install-plugin</artifactId> - <configuration> - <updateReleaseInfo>true</updateReleaseInfo> - </configuration> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> diff --git a/defaults/pom.xml b/defaults/pom.xml index ffafc683fd6..4a5299e1782 100644 --- a/defaults/pom.xml +++ b/defaults/pom.xml @@ -76,9 +76,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-install-plugin</artifactId> - <configuration> - <updateReleaseInfo>true</updateReleaseInfo> - </configuration> </plugin> <plugin> <groupId>com.yahoo.vespa</groupId> diff --git a/docprocs/pom.xml b/docprocs/pom.xml index eb988610168..2a28e6e5bd8 100644 --- a/docprocs/pom.xml +++ b/docprocs/pom.xml @@ -147,9 +147,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-install-plugin</artifactId> - <configuration> - <updateReleaseInfo>true</updateReleaseInfo> - </configuration> </plugin> </plugins> </build> diff --git a/documentgen-test/pom.xml b/documentgen-test/pom.xml index 0477c834477..2d9ce13dc90 100644 --- a/documentgen-test/pom.xml +++ b/documentgen-test/pom.xml @@ -96,9 +96,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-install-plugin</artifactId> - <configuration> - <updateReleaseInfo>true</updateReleaseInfo> - </configuration> </plugin> <plugin> <!-- We're testing this plugin in this module. --> <groupId>com.yahoo.vespa</groupId> diff --git a/jrt/pom.xml b/jrt/pom.xml index 353e0df777d..926756da4a0 100644 --- a/jrt/pom.xml +++ b/jrt/pom.xml @@ -58,9 +58,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-install-plugin</artifactId> - <configuration> - <updateReleaseInfo>true</updateReleaseInfo> - </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> diff --git a/metrics/pom.xml b/metrics/pom.xml index 2cf5ccc57d1..f44a2569ace 100644 --- a/metrics/pom.xml +++ b/metrics/pom.xml @@ -78,9 +78,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-install-plugin</artifactId> - <configuration> - <updateReleaseInfo>true</updateReleaseInfo> - </configuration> </plugin> <plugin> <!-- Remove when v2.1 is the default diff --git a/parent/pom.xml b/parent/pom.xml index fe99e72c03e..b0ba6e89f6e 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -114,9 +114,6 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-install-plugin</artifactId> <version>${maven-install-plugin.version}</version> - <configuration> - <updateReleaseInfo>true</updateReleaseInfo> - </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> diff --git a/searchlib/pom.xml b/searchlib/pom.xml index e1e61c954b9..5555c83adde 100644 --- a/searchlib/pom.xml +++ b/searchlib/pom.xml @@ -95,9 +95,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-install-plugin</artifactId> - <configuration> - <updateReleaseInfo>true</updateReleaseInfo> - </configuration> </plugin> <plugin> <groupId>com.yahoo.vespa</groupId> diff --git a/vdslib/pom.xml b/vdslib/pom.xml index 4067fc9d8d4..e966d8ce6b6 100644 --- a/vdslib/pom.xml +++ b/vdslib/pom.xml @@ -72,9 +72,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-install-plugin</artifactId> - <configuration> - <updateReleaseInfo>true</updateReleaseInfo> - </configuration> </plugin> </plugins> </build> diff --git a/vdslib/src/main/java/com/yahoo/vdslib/distribution/Distribution.java b/vdslib/src/main/java/com/yahoo/vdslib/distribution/Distribution.java index 0e8e755c236..4f9186a0569 100644 --- a/vdslib/src/main/java/com/yahoo/vdslib/distribution/Distribution.java +++ b/vdslib/src/main/java/com/yahoo/vdslib/distribution/Distribution.java @@ -508,10 +508,6 @@ public class Distribution { } public static String getDefaultDistributionConfig(int redundancy, int nodeCount) { - return getDefaultDistributionConfig(redundancy, nodeCount, StorDistributionConfig.Disk_distribution.MODULO_BID); - } - - public static String getDefaultDistributionConfig(int redundancy, int nodeCount, StorDistributionConfig.Disk_distribution.Enum diskDistribution) { StringBuilder sb = new StringBuilder(); sb.append("raw:redundancy ").append(redundancy).append("\n") .append("group[1]\n") @@ -522,7 +518,6 @@ public class Distribution { for (int i=0; i<nodeCount; ++i) { sb.append("group[0].nodes[").append(i).append("].index ").append(i).append("\n"); } - sb.append("disk_distribution ").append(diskDistribution.toString()).append("\n"); return sb.toString(); } diff --git a/vespa-documentgen-plugin/pom.xml b/vespa-documentgen-plugin/pom.xml index f3357d64e27..b73c1ab7595 100644 --- a/vespa-documentgen-plugin/pom.xml +++ b/vespa-documentgen-plugin/pom.xml @@ -76,9 +76,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-install-plugin</artifactId> - <configuration> - <updateReleaseInfo>true</updateReleaseInfo> - </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> diff --git a/vespajlib/pom.xml b/vespajlib/pom.xml index ff244ad07f8..9b10f82c986 100644 --- a/vespajlib/pom.xml +++ b/vespajlib/pom.xml @@ -117,9 +117,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-install-plugin</artifactId> - <configuration> - <updateReleaseInfo>true</updateReleaseInfo> - </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> diff --git a/vespalog/pom.xml b/vespalog/pom.xml index 8bb72743b38..f8260471fa2 100644 --- a/vespalog/pom.xml +++ b/vespalog/pom.xml @@ -67,9 +67,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-install-plugin</artifactId> - <configuration> - <updateReleaseInfo>true</updateReleaseInfo> - </configuration> </plugin> <plugin> <groupId>com.yahoo.vespa</groupId> diff --git a/zkfacade/pom.xml b/zkfacade/pom.xml index 58a0601424d..dd890fef3a8 100644 --- a/zkfacade/pom.xml +++ b/zkfacade/pom.xml @@ -119,9 +119,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-install-plugin</artifactId> - <configuration> - <updateReleaseInfo>true</updateReleaseInfo> - </configuration> </plugin> <plugin> <groupId>com.yahoo.vespa</groupId> diff --git a/zookeeper-server/pom.xml b/zookeeper-server/pom.xml index 053361c7e66..c1f92eece63 100644 --- a/zookeeper-server/pom.xml +++ b/zookeeper-server/pom.xml @@ -52,9 +52,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-install-plugin</artifactId> - <configuration> - <updateReleaseInfo>true</updateReleaseInfo> - </configuration> </plugin> <plugin> <groupId>com.yahoo.vespa</groupId> diff --git a/zookeeper-server/zookeeper-server-3.8.1/pom.xml b/zookeeper-server/zookeeper-server-3.8.1/pom.xml index 72da1ba26c4..b90a5feefa3 100644 --- a/zookeeper-server/zookeeper-server-3.8.1/pom.xml +++ b/zookeeper-server/zookeeper-server-3.8.1/pom.xml @@ -89,9 +89,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-install-plugin</artifactId> - <configuration> - <updateReleaseInfo>true</updateReleaseInfo> - </configuration> </plugin> <plugin> <groupId>com.yahoo.vespa</groupId> diff --git a/zookeeper-server/zookeeper-server-common/pom.xml b/zookeeper-server/zookeeper-server-common/pom.xml index 13c3660bfa2..33af7e3a296 100644 --- a/zookeeper-server/zookeeper-server-common/pom.xml +++ b/zookeeper-server/zookeeper-server-common/pom.xml @@ -40,9 +40,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-install-plugin</artifactId> - <configuration> - <updateReleaseInfo>true</updateReleaseInfo> - </configuration> </plugin> <plugin> <groupId>com.yahoo.vespa</groupId> diff --git a/zookeeper-server/zookeeper-server/pom.xml b/zookeeper-server/zookeeper-server/pom.xml index d8dbe35ec9c..d37709da6cd 100644 --- a/zookeeper-server/zookeeper-server/pom.xml +++ b/zookeeper-server/zookeeper-server/pom.xml @@ -89,9 +89,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-install-plugin</artifactId> - <configuration> - <updateReleaseInfo>true</updateReleaseInfo> - </configuration> </plugin> <plugin> <groupId>com.yahoo.vespa</groupId> |