diff options
| author | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-12-13 15:26:41 +0100 |
|---|---|---|
| committer | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-12-13 15:26:41 +0100 |
| commit | d3c1c98b5e67cf8f9bb9f3efdef3161f63c19ffc (patch) | |
| tree | 05aea3ca495d6acf87ee3817d6f2957a57c39339 /pom.xml | |
| parent | 3783a9b21f8ab7ca3700903d9780a9f7374cf0c5 (diff) | |
| parent | 540b84751e90d60c13c4da3e1e15d47b720c327e (diff) | |
Merge with master
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 10 |
1 files changed, 7 insertions, 3 deletions
@@ -3,11 +3,10 @@ <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>parent</artifactId> + <artifactId>vespa</artifactId> <packaging>pom</packaging> <version>6-SNAPSHOT</version> - <name>parent</name> - <description>Parent artifact for all Vespa maven projects.</description> + <description>Aggregator pom for vespa.</description> <url>https://github.com/vespa-engine</url> <licenses> @@ -24,6 +23,7 @@ </developer> </developers> +<<<<<<< HEAD <distributionManagement> <repository> <id>bintray-vespa-repo</id> @@ -959,6 +959,8 @@ <surefire.version>2.19.1</surefire.version> <!-- NOTE bjorncs 15.06.2017: Version 2.20 has OoM issues --> </properties> +======= +>>>>>>> master <modules> <module>application</module> <module>application-deploy-plugin</module> @@ -989,6 +991,7 @@ <module>container-core</module> <module>container-accesslogging</module> <module>container-dependencies-enforcer</module> + <module>container-dependency-versions</module> <module>container-dev</module> <module>container-di</module> <module>container-disc</module> @@ -1033,6 +1036,7 @@ <module>node-maintainer</module> <module>orchestrator-restapi</module> <module>orchestrator</module> + <module>parent</module> <module>predicate-search</module> <module>predicate-search-core</module> <module>processing</module> |