diff --git a/README.md b/README.md index c3abfb3..3608579 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ -# `wildfly-swarm-fraction-plugin` +# `thorntail-fraction-plugin` [![License](https://img.shields.io/:license-Apache2-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0) -[![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.wildfly.swarm/wildfly-swarm-fraction-plugin/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.wildfly.swarm/wildfly-swarm-fraction-plugin) +[![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.thorntail/thorntail-fraction-plugin/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.thorntail/thorntail-fraction-plugin) -This is a Maven plugin which is primarily used by the `wildfly-swarm` project. +This is a Maven plugin which is primarily used by the `thorntail` project. Contains no user-serviceable parts. diff --git a/pom.xml b/pom.xml index 544ead4..a105253 100644 --- a/pom.xml +++ b/pom.xml @@ -8,15 +8,15 @@ 4.0.0 - org.wildfly.swarm + io.thorntail parent - 9 + 10 - wildfly-swarm-fraction-plugin + thorntail-fraction-plugin - WildFly Swarm: Fraction Plugin - Plugin to create fraction packages for Wildfly Swarm proper. + Thorntail: Fraction Plugin + Plugin to create fraction packages for Thorntail proper. 87-SNAPSHOT maven-plugin @@ -36,9 +36,9 @@ - scm:git:git@github.com:wildfly-swarm/wildfly-swarm-fraction-plugin.git - scm:git:git@github.com:wildfly-swarm/wildfly-swarm-fraction-plugin.git - https://github.com/wildfly-swarm/wildfly-swarm-fraction-plugin + scm:git:git@github.com:thorntail/thorntail-fraction-plugin.git + scm:git:git@github.com:thorntail/thorntail-fraction-plugin.git + https://github.com/thorntail/thorntail-fraction-plugin HEAD diff --git a/src/main/java/org/wildfly/swarm/plugin/AbstractFractionsMojo.java b/src/main/java/org/wildfly/swarm/plugin/AbstractFractionsMojo.java index 4630fa1..c7982df 100644 --- a/src/main/java/org/wildfly/swarm/plugin/AbstractFractionsMojo.java +++ b/src/main/java/org/wildfly/swarm/plugin/AbstractFractionsMojo.java @@ -93,14 +93,14 @@ private void buildProjects() throws MojoExecutionException { } protected MavenProject findRoot(MavenProject current) { - if (current.getArtifactId().equals("wildfly-swarm")) { + if (current.getArtifactId().equals("thorntail")) { return current; } return findRoot(current.getParent()); } protected boolean isSwarmProject(Dependency dependency) { - return dependency.getGroupId().startsWith("org.wildfly.swarm"); + return dependency.getGroupId().startsWith(FractionRegistry.THORNTAIL_GROUP_ID); } private boolean isNotArquillianArtifact(MavenProject project) { @@ -116,7 +116,7 @@ protected boolean isNotArquillianArtifact(ProjectBuildingResult result) { } protected FractionMetadata arquillianFraction(String version) { - return new FractionMetadata("org.wildfly.swarm", "arquillian", version, Scope.TEST.getValue()); + return new FractionMetadata(FractionRegistry.THORNTAIL_GROUP_ID, "arquillian", version, Scope.TEST.getValue()); } @Inject diff --git a/src/main/java/org/wildfly/swarm/plugin/FractionRegistry.java b/src/main/java/org/wildfly/swarm/plugin/FractionRegistry.java index fa399b3..c7e52cb 100644 --- a/src/main/java/org/wildfly/swarm/plugin/FractionRegistry.java +++ b/src/main/java/org/wildfly/swarm/plugin/FractionRegistry.java @@ -27,6 +27,10 @@ */ public class FractionRegistry { + public static final String THORNTAIL_GROUP_ID = "io.thorntail"; + + public static final String SPI_ARTIFACT_ID = "spi"; + private static final String FRACTION_TAGS_PROPERTY_NAME = "swarm.fraction.tags"; private static final String FRACTION_INTERNAL_PROPERTY_NAME = "swarm.fraction.internal"; @@ -60,7 +64,7 @@ public FractionMetadata of(MavenProject project) { if (project == null) { return null; } - if (project.getGroupId().equals("org.wildfly.swarm") && project.getArtifactId().equals("bootstrap")) { + if (project.getGroupId().equals(THORNTAIL_GROUP_ID) && project.getArtifactId().equals("bootstrap")) { return null; } Key key = Key.of(project); @@ -262,7 +266,7 @@ public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOEx } private static Path findJavaFraction(MavenProject project) { - if (project.getGroupId().equals("org.wildfly.swarm") && project.getArtifactId().equals("spi")) { + if (project.getGroupId().equals(THORNTAIL_GROUP_ID) && project.getArtifactId().equals(SPI_ARTIFACT_ID)) { return null; } Path src = Paths.get(project.getBuild().getSourceDirectory()); diff --git a/src/main/java/org/wildfly/swarm/plugin/bom/BomMojo.java b/src/main/java/org/wildfly/swarm/plugin/bom/BomMojo.java index 1b1c549..841eb2b 100644 --- a/src/main/java/org/wildfly/swarm/plugin/bom/BomMojo.java +++ b/src/main/java/org/wildfly/swarm/plugin/bom/BomMojo.java @@ -82,7 +82,7 @@ public void execute() throws MojoExecutionException, MojoFailureException { } List bomItems = new ArrayList<>(); - bomItems.add(new DependencyMetadata("org.wildfly.swarm", "fraction-metadata", this.project.getVersion(), null, "jar", "compile")); + bomItems.add(new DependencyMetadata(FractionRegistry.THORNTAIL_GROUP_ID, "fraction-metadata", this.project.getVersion(), null, "jar", "compile")); bomItems.addAll(fractions); bomItems.addAll(FractionRegistry.INSTANCE.bomInclusions()); if (!this.product) {