Skip to content
This repository has been archived by the owner on Jun 7, 2021. It is now read-only.

THORN-2031: Project rename #72

Merged
merged 2 commits into from
May 22, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -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.
16 changes: 8 additions & 8 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.wildfly.swarm</groupId>
<groupId>io.thorntail</groupId>
<artifactId>parent</artifactId>
<version>9</version>
<version>10</version>
</parent>

<artifactId>wildfly-swarm-fraction-plugin</artifactId>
<artifactId>thorntail-fraction-plugin</artifactId>

<name>WildFly Swarm: Fraction Plugin</name>
<description>Plugin to create fraction packages for Wildfly Swarm proper.</description>
<name>Thorntail: Fraction Plugin</name>
<description>Plugin to create fraction packages for Thorntail proper.</description>
<version>87-SNAPSHOT</version>

<packaging>maven-plugin</packaging>
Expand All @@ -36,9 +36,9 @@
</properties>

<scm>
<connection>scm:git:[email protected]:wildfly-swarm/wildfly-swarm-fraction-plugin.git</connection>
<developerConnection>scm:git:[email protected]:wildfly-swarm/wildfly-swarm-fraction-plugin.git</developerConnection>
<url>https://github.com/wildfly-swarm/wildfly-swarm-fraction-plugin</url>
<connection>scm:git:[email protected]:thorntail/thorntail-fraction-plugin.git</connection>
<developerConnection>scm:git:[email protected]:thorntail/thorntail-fraction-plugin.git</developerConnection>
<url>https://github.com/thorntail/thorntail-fraction-plugin</url>
<tag>HEAD</tag>
</scm>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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
Expand Down
8 changes: 6 additions & 2 deletions src/main/java/org/wildfly/swarm/plugin/FractionRegistry.java
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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());
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/wildfly/swarm/plugin/bom/BomMojo.java
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
}

List<DependencyMetadata> 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) {
Expand Down