summaryrefslogtreecommitdiffstats
path: root/defaults
diff options
context:
space:
mode:
authorgjoranv <gjoranv@gmail.com>2017-11-30 15:56:29 +0100
committerGitHub <noreply@github.com>2017-11-30 15:56:29 +0100
commitf35c228d1ac4cad6cbc8a348c0affccdfac6339b (patch)
treed1399bbd04dd14cf4b71a9235db2fe0906d1fb46 /defaults
parent1e32fbb46c0043a083a4cc5c8caef41c05f2403a (diff)
Revert "Gjoranv/split parent2"
Diffstat (limited to 'defaults')
-rw-r--r--defaults/pom.xml7
1 files changed, 3 insertions, 4 deletions
diff --git a/defaults/pom.xml b/defaults/pom.xml
index 4d1a08aacc2..2f3f06780e7 100644
--- a/defaults/pom.xml
+++ b/defaults/pom.xml
@@ -5,10 +5,9 @@
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>
- <relativePath>../parent/pom.xml</relativePath>
+ <groupId>com.yahoo.vespa</groupId>
+ <artifactId>parent</artifactId>
+ <version>6-SNAPSHOT</version>
</parent>
<groupId>com.yahoo.vespa</groupId>
<artifactId>defaults</artifactId>