diff options
author | gjoranv <gjoranv@gmail.com> | 2022-10-26 11:55:15 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-26 11:55:15 +0200 |
commit | 06d38d2afac148a94828d9123e71842ff6a54a95 (patch) | |
tree | 5175acd3ecae6620ece38dd7f0a158b2a455db92 | |
parent | 778c19f810e86598d3d96f5e7acc112597b2af07 (diff) | |
parent | e1fbfcbe1572ab12276504b03f40a31eb84cb7bf (diff) |
Merge pull request #24591 from vespa-engine/hmusum/remove-config_test
Remove config_test module
-rw-r--r-- | config_test/.gitignore | 2 | ||||
-rw-r--r-- | config_test/OWNERS | 1 | ||||
-rw-r--r-- | config_test/README.md | 3 | ||||
-rw-r--r-- | config_test/pom.xml | 55 | ||||
-rw-r--r-- | config_test/src/main/java/com/yahoo/configtest/Demo.java | 14 | ||||
-rw-r--r-- | config_test/src/main/resources/configdefinitions/configtest.greeting.def | 10 | ||||
-rw-r--r-- | pom.xml | 1 |
7 files changed, 0 insertions, 86 deletions
diff --git a/config_test/.gitignore b/config_test/.gitignore deleted file mode 100644 index 3cc25b51fc4..00000000000 --- a/config_test/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/pom.xml.build -/target diff --git a/config_test/OWNERS b/config_test/OWNERS deleted file mode 100644 index 338ed581212..00000000000 --- a/config_test/OWNERS +++ /dev/null @@ -1 +0,0 @@ -hmusum diff --git a/config_test/README.md b/config_test/README.md deleted file mode 100644 index 7ff633d935f..00000000000 --- a/config_test/README.md +++ /dev/null @@ -1,3 +0,0 @@ -<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> -# Test using cloud config without Vespa - diff --git a/config_test/pom.xml b/config_test/pom.xml deleted file mode 100644 index d2c8abf42ff..00000000000 --- a/config_test/pom.xml +++ /dev/null @@ -1,55 +0,0 @@ -<?xml version="1.0"?> -<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <groupId>com.yahoo.vespa</groupId> - <artifactId>config_test</artifactId> - <packaging>container-plugin</packaging> - <version>8-SNAPSHOT</version> - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.13.2</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>config-lib</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.8.1</version> - <configuration> - <source>1.8</source> - <target>1.8</target> - <compilerArgs> - <arg>-Xlint:all</arg> - <arg>-Werror</arg> - </compilerArgs> - </configuration> - </plugin> - <plugin> - <groupId>com.yahoo.vespa</groupId> - <artifactId>bundle-plugin</artifactId> - <version>${project.version}</version> - <extensions>true</extensions> - <configuration> - <configGenVersion>${project.version}</configGenVersion> - </configuration> - </plugin> - </plugins> - </build> - <properties> - <maven.deploy.skip>true</maven.deploy.skip> - <maven.javadoc.skip>true</maven.javadoc.skip> - <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - </properties> -</project> diff --git a/config_test/src/main/java/com/yahoo/configtest/Demo.java b/config_test/src/main/java/com/yahoo/configtest/Demo.java deleted file mode 100644 index 792fffa36a9..00000000000 --- a/config_test/src/main/java/com/yahoo/configtest/Demo.java +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.configtest; - -/** - * Just check we manage to compile something that requires configuration and - * has no dependencies to Vespa. - */ -public class Demo { - public final String greeting; - - public Demo(GreetingConfig config) { - greeting = config.greeting(); - } -} diff --git a/config_test/src/main/resources/configdefinitions/configtest.greeting.def b/config_test/src/main/resources/configdefinitions/configtest.greeting.def deleted file mode 100644 index 901362ae386..00000000000 --- a/config_test/src/main/resources/configdefinitions/configtest.greeting.def +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -namespace=configtest - -greeting string default="Hello, world." -arbitrary double - -values[].marker int -values[].operations[].type enum { NALLE, BAMSE, BRAKAR } -values[].operations[].arguments[].key string -values[].operations[].arguments[].value string @@ -50,7 +50,6 @@ <module>config-proxy</module> <module>configserver</module> <module>configserver-flags</module> - <module>config_test</module> <module>container</module> <module>container-apache-http-client-bundle</module> <module>container-core</module> |