diff options
| -rw-r--r-- | bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateSourcesMojo.java | 10 | ||||
| -rw-r--r-- | container-dev/pom.xml | 1 | ||||
| -rw-r--r-- | container/OWNERS | 1 | ||||
| -rw-r--r-- | container/pom.xml | 35 | ||||
| -rwxr-xr-x | docker/enter-build-container.sh | 2 | ||||
| -rw-r--r-- | pom.xml | 1 | ||||
| -rw-r--r-- | vespaclient-container-plugin/pom.xml | 2 |
7 files changed, 44 insertions, 8 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 cb2e54024b4..fe8b9cc3972 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 @@ -75,13 +75,9 @@ public class GenerateSourcesMojo extends AbstractMojo { if (configGenVersion != null && !configGenVersion.isEmpty()) { return configGenVersion; } - Dependency containerDev = getVespaDependency("container-dev"); - if (containerDev != null) - return containerDev.getVersion(); - - Dependency prelude = getVespaDependency("prelude"); - if (prelude != null) - return prelude.getVersion(); + Dependency containerInternal = getVespaDependency("container-dev"); + if (containerInternal != null) + return containerInternal.getVersion(); Dependency docproc = getVespaDependency("docproc"); if (docproc != null) diff --git a/container-dev/pom.xml b/container-dev/pom.xml index 9b61e60d759..c180780faf9 100644 --- a/container-dev/pom.xml +++ b/container-dev/pom.xml @@ -1,5 +1,6 @@ <?xml version="1.0"?> <!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- This module collects all common dependencies of Vespa-internal modules, i.e the non-leaf container modules --> <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 diff --git a/container/OWNERS b/container/OWNERS new file mode 100644 index 00000000000..3b2ba1ede81 --- /dev/null +++ b/container/OWNERS @@ -0,0 +1 @@ +gjoranv diff --git a/container/pom.xml b/container/pom.xml new file mode 100644 index 00000000000..e46b4a4d419 --- /dev/null +++ b/container/pom.xml @@ -0,0 +1,35 @@ +<?xml version="1.0"?> +<!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- This module collects all dependencies applications need to create container components. --> +<!-- It should be considered an external Vespa API. --> +<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> + <parent> + <groupId>com.yahoo.vespa</groupId> + <artifactId>parent</artifactId> + <version>6-SNAPSHOT</version> + </parent> + <artifactId>container</artifactId> + <version>6-SNAPSHOT</version> + <packaging>jar</packaging> + <dependencies> + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>container-dev</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>vespaclient-container-plugin</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>application</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> +</project> diff --git a/docker/enter-build-container.sh b/docker/enter-build-container.sh index ed7a2b4a130..4d2f442622f 100755 --- a/docker/enter-build-container.sh +++ b/docker/enter-build-container.sh @@ -12,5 +12,5 @@ cd $DIR DOCKER_IMAGE="vespabuild" docker build -t "$DOCKER_IMAGE" -f Dockerfile.build . -docker run -ti --rm -v $(pwd)/..:/vespa --entrypoint /vespa/docker/enter-build-container-internal.sh "$DOCKER_IMAGE" +docker run -ti --rm -v $(pwd)/..:/vespa --entrypoint /vespa/docker/enter-build-container-dev.sh "$DOCKER_IMAGE" @@ -1119,6 +1119,7 @@ <module>config-proxy</module> <module>configserver</module> <module>config_test</module> + <module>container</module> <module>container-core</module> <module>container-accesslogging</module> <module>container-dev</module> diff --git a/vespaclient-container-plugin/pom.xml b/vespaclient-container-plugin/pom.xml index 422565f55ae..63bdc1eb5fa 100644 --- a/vespaclient-container-plugin/pom.xml +++ b/vespaclient-container-plugin/pom.xml @@ -1,5 +1,7 @@ <?xml version="1.0"?> <!-- Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> +<!-- Implementation of document-api in the container. --> +<!-- TODO: Rename to container-documentapi on Vespa 7 --> <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> |