summaryrefslogtreecommitdiffstats
path: root/vespa-application-maven-plugin/src/main/java/com/yahoo/container/plugin/mojo/ApplicationMojo.java
diff options
context:
space:
mode:
Diffstat (limited to 'vespa-application-maven-plugin/src/main/java/com/yahoo/container/plugin/mojo/ApplicationMojo.java')
-rw-r--r--vespa-application-maven-plugin/src/main/java/com/yahoo/container/plugin/mojo/ApplicationMojo.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/vespa-application-maven-plugin/src/main/java/com/yahoo/container/plugin/mojo/ApplicationMojo.java b/vespa-application-maven-plugin/src/main/java/com/yahoo/container/plugin/mojo/ApplicationMojo.java
index 62bb5c53f8c..6b50ea4b360 100644
--- a/vespa-application-maven-plugin/src/main/java/com/yahoo/container/plugin/mojo/ApplicationMojo.java
+++ b/vespa-application-maven-plugin/src/main/java/com/yahoo/container/plugin/mojo/ApplicationMojo.java
@@ -70,7 +70,7 @@ public class ApplicationMojo extends AbstractMojo {
Version parentVersion = null;
Artifact parentArtifact = current.getParentArtifact();
- if (parentArtifact != null && (parentArtifact.getGroupId().startsWith("com.yahoo.vespa.") || parentArtifact.getGroupId().startsWith("ai.vespa."))) {
+ if (parentArtifact != null && isVespaParent(parentArtifact.getGroupId())) {
parentVersion = Version.from(parentArtifact.getVersion());
if (parentVersion.compareTo(compileVersion) < 0)
throw new IllegalArgumentException("compile version (" + compileVersion + ") cannot be higher than parent version (" + parentVersion + ")");
@@ -93,6 +93,10 @@ public class ApplicationMojo extends AbstractMojo {
}
}
+ static boolean isVespaParent(String groupId) {
+ return groupId.matches("(com\\.yahoo\\.vespa|ai\\.vespa)(\\..+)?");
+ }
+
private void copyBundlesForSubModules(File componentsDir) throws MojoExecutionException {
List<String> modules = emptyListIfNull(project.getModules());
for (String module : modules) {