Break out the dependency-scrobbling bits from BuildTool and possibly

be smarter about gathering stuff.
thorntail · Nov 13, 2015 · 9476c4a · 9476c4a
1 parent 4dcb04b
commit 9476c4a
Show file tree

Hide file tree

Showing 8 changed files with 817 additions and 368 deletions.
diff --git a/bootstrap/src/main/java/org/wildfly/swarm/bootstrap/util/MavenArtifactDescriptor.java b/bootstrap/src/main/java/org/wildfly/swarm/bootstrap/util/MavenArtifactDescriptor.java
@@ -2,8 +2,6 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 
 /**
  * @author Bob McWhirter
@@ -156,10 +154,10 @@ public String mavenGav() {
                 this.version;
     }
 
-    public String repoPath(boolean forClasspath) {
+    public String repoPath(boolean forJar) {
         char delim = File.separatorChar;
 
-        if (forClasspath) {
+        if (forJar) {
             delim = '/';
         }
 

diff --git a/bootstrap/src/main/java/org/wildfly/swarm/bootstrap/util/WildFlySwarmBootstrapConf.java b/bootstrap/src/main/java/org/wildfly/swarm/bootstrap/util/WildFlySwarmBootstrapConf.java
@@ -37,6 +37,7 @@ public void addEntry(MavenArtifactDescriptor entry) {
         this.entries.add( entry );
     }
 
+
     public void addEntry(String gav) throws IOException {
         String[] parts = gav.split(":");
 
@@ -55,8 +56,8 @@ public void addEntry(String groupId, String artifactId, String type, String clas
         this.entries.add(new MavenArtifactDescriptor(groupId, artifactId, type, classifier, version));
     }
 
-    public List<MavenArtifactDescriptor> getEntries() {
-        return Collections.unmodifiableList(this.entries);
+    public List<? extends MavenArtifactDescriptor> getEntries() {
+        return Collections.unmodifiableList( this.entries);
     }
 
     public WildFlySwarmBootstrapConf(InputStream in) throws IOException {

diff --git a/pom.xml b/pom.xml
@@ -125,6 +125,7 @@
           <systemPropertyVariables>
             <jboss.bind.address>127.0.0.1</jboss.bind.address>
             <maven.repo.local>${maven.repo.local}</maven.repo.local>
+            <project.version>${project.version}</project.version>
           </systemPropertyVariables>
         </configuration>
       </plugin>

diff --git a/tools/src/main/java/org/wildfly/swarm/tools/ArtifactSpec.java b/tools/src/main/java/org/wildfly/swarm/tools/ArtifactSpec.java
@@ -16,7 +16,6 @@
 package org.wildfly.swarm.tools;
 
 import java.io.File;
-import java.io.IOException;
 
 import org.wildfly.swarm.bootstrap.util.MavenArtifactDescriptor;
 
@@ -33,14 +32,16 @@ public class ArtifactSpec extends MavenArtifactDescriptor {
 
     public boolean gathered = false;
 
-    public static ArtifactSpec fromMscGav(String gav) throws IOException {
+    public boolean bootstrapped = false;
+
+    public static ArtifactSpec fromMscGav(String gav) {
         String[] parts = gav.split(":");
         if (parts.length == 3) {
             return new ArtifactSpec("compile", parts[0], parts[1], parts[2], "jar", null, null);
         } else if (parts.length == 4) {
             return new ArtifactSpec("compile", parts[0], parts[1], parts[2], "jar", parts[3], null);
         } else {
-            throw new IOException("Invalid gav: " + gav);
+            throw new RuntimeException("Invalid gav: " + gav);
         }
     }