Moved forge-maven and dependency-api to dependencies addon

addon-manager/addon/pom.xml

@@ -12,6 +12,12 @@
    <name>Forge - Addon Manager Addon</name>
 
    <dependencies>
+      <dependency>
+         <groupId>org.jboss.forge</groupId>
+         <artifactId>dependencies</artifactId>
+         <version>2.0.0-SNAPSHOT</version>
+         <classifier>forge-addon</classifier>
+      </dependency>
       <dependency>
          <groupId>org.jboss.forge</groupId>
          <artifactId>addon-manager-api</artifactId>

addon-manager/api/pom.xml

@@ -17,8 +17,9 @@
       </dependency>
       <dependency>
          <groupId>org.jboss.forge</groupId>
-         <artifactId>forge-dependency-api</artifactId>
-         <scope>compile</scope>
+         <artifactId>dependencies</artifactId>
+         <version>2.0.0-SNAPSHOT</version>
+         <classifier>forge-addon</classifier>
       </dependency>
    </dependencies>
 </project>

addon-manager/api/src/main/java/org/jboss/forge/addon/manager/InstallRequest.java

@@ -9,7 +9,7 @@
 
 import java.util.List;
 
-import org.jboss.forge.addon.dependency.DependencyNode;
+import org.jboss.forge.dependencies.DependencyNode;
 
 /**
  * When an addon is installed, another addons could be required. This object returns the necessary information for the

addon-manager/impl/pom.xml

@@ -22,11 +22,5 @@
          <artifactId>addon-manager-api</artifactId>
          <scope>compile</scope>
       </dependency>
-      <dependency>
-         <groupId>org.jboss.forge</groupId>
-         <artifactId>forge-maven</artifactId>
-         <scope>compile</scope>
-      </dependency>
-
    </dependencies>
 </project>

addon-manager/impl/src/main/java/org/jboss/forge/addon/manager/impl/AddonManagerImpl.java

@@ -9,14 +9,14 @@
 
 import javax.inject.Inject;
 
-import org.jboss.forge.addon.dependency.DependencyNode;
-import org.jboss.forge.addon.dependency.builder.DependencyQueryBuilder;
-import org.jboss.forge.addon.dependency.spi.DependencyResolver;
 import org.jboss.forge.addon.manager.AddonManager;
 import org.jboss.forge.addon.manager.InstallRequest;
 import org.jboss.forge.container.AddonId;
 import org.jboss.forge.container.AddonRepository;
 import org.jboss.forge.container.services.Exported;
+import org.jboss.forge.dependencies.DependencyNode;
+import org.jboss.forge.dependencies.builder.DependencyQueryBuilder;
+import org.jboss.forge.dependencies.spi.DependencyResolver;
 
 /**
  * Installs addons into an {@link AddonRepository}

addon-manager/impl/src/main/java/org/jboss/forge/addon/manager/impl/InstallRequestImpl.java

@@ -15,17 +15,17 @@
 import java.util.Stack;
 import java.util.logging.Logger;
 
-import org.jboss.forge.addon.dependency.Coordinate;
-import org.jboss.forge.addon.dependency.DependencyNode;
-import org.jboss.forge.addon.dependency.collection.Dependencies;
-import org.jboss.forge.addon.dependency.collection.Predicate;
 import org.jboss.forge.addon.manager.AddonManager;
 import org.jboss.forge.addon.manager.InstallRequest;
 import org.jboss.forge.addon.manager.impl.filters.DirectAddonFilter;
 import org.jboss.forge.addon.manager.impl.filters.LocalResourceFilter;
 import org.jboss.forge.container.AddonDependency;
 import org.jboss.forge.container.AddonId;
 import org.jboss.forge.container.AddonRepository;
+import org.jboss.forge.dependencies.Coordinate;
+import org.jboss.forge.dependencies.DependencyNode;
+import org.jboss.forge.dependencies.collection.Dependencies;
+import org.jboss.forge.dependencies.collection.Predicate;
 
 /**
  * When an addon is installed, another addons could be required. This object returns the necessary information for the

addon-manager/impl/src/main/java/org/jboss/forge/addon/manager/impl/filters/DirectAddonFilter.java

@@ -1,9 +1,9 @@
 package org.jboss.forge.addon.manager.impl.filters;
 
-import org.jboss.forge.addon.dependency.Coordinate;
-import org.jboss.forge.addon.dependency.DependencyNode;
-import org.jboss.forge.addon.dependency.collection.Dependencies;
-import org.jboss.forge.addon.dependency.collection.Predicate;
+import org.jboss.forge.dependencies.Coordinate;
+import org.jboss.forge.dependencies.DependencyNode;
+import org.jboss.forge.dependencies.collection.Dependencies;
+import org.jboss.forge.dependencies.collection.Predicate;
 
 /**
  * Checks if an addon node is a direct dependency of another node (root)

addon-manager/impl/src/main/java/org/jboss/forge/addon/manager/impl/filters/LocalResourceFilter.java

@@ -1,8 +1,8 @@
 package org.jboss.forge.addon.manager.impl.filters;
 
-import org.jboss.forge.addon.dependency.DependencyNode;
-import org.jboss.forge.addon.dependency.collection.Dependencies;
-import org.jboss.forge.addon.dependency.collection.Predicate;
+import org.jboss.forge.dependencies.DependencyNode;
+import org.jboss.forge.dependencies.collection.Dependencies;
+import org.jboss.forge.dependencies.collection.Predicate;
 
 /**
  * Figures out if a dependency should be treated as a JAR or as an Addon.

arquillian/classpath/src/main/java/org/jboss/forge/arquillian/ForgeDeployableContainer.java

@@ -18,7 +18,6 @@
 import org.jboss.arquillian.container.spi.client.protocol.metadata.ProtocolMetaData;
 import org.jboss.arquillian.core.api.Instance;
 import org.jboss.arquillian.core.api.annotation.Inject;
-import org.jboss.forge.addon.dependency.spi.DependencyResolver;
 import org.jboss.forge.addon.manager.AddonManager;
 import org.jboss.forge.addon.manager.InstallRequest;
 import org.jboss.forge.addon.manager.impl.AddonManagerImpl;
@@ -36,6 +35,7 @@
 import org.jboss.forge.container.impl.AddonRepositoryImpl;
 import org.jboss.forge.container.util.ClassLoaders;
 import org.jboss.forge.container.util.Threads;
+import org.jboss.forge.dependencies.spi.DependencyResolver;
 import org.jboss.shrinkwrap.api.Archive;
 import org.jboss.shrinkwrap.descriptor.api.Descriptor;
 

bootstrap/src/main/java/org/jboss/forge/bootstrap/Bootstrap.java

@@ -13,12 +13,12 @@
 import java.util.ServiceLoader;
 import java.util.logging.Logger;
 
-import org.jboss.forge.addon.dependency.spi.DependencyResolver;
 import org.jboss.forge.addon.manager.AddonManager;
 import org.jboss.forge.addon.manager.InstallRequest;
 import org.jboss.forge.addon.manager.impl.AddonManagerImpl;
 import org.jboss.forge.container.AddonId;
 import org.jboss.forge.container.Forge;
+import org.jboss.forge.dependencies.spi.DependencyResolver;
 
 /**
  * A class with a main method to bootstrap Forge.

dependencies/addon/pom.xml

@@ -0,0 +1,35 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+   <modelVersion>4.0.0</modelVersion>
+   <parent>
+      <groupId>org.jboss.forge</groupId>
+      <artifactId>dependencies-parent</artifactId>
+      <version>2.0.0-SNAPSHOT</version>
+      <relativePath>../pom.xml</relativePath>
+   </parent>
+   <artifactId>dependencies</artifactId>
+   <name>Forge - Dependencies Addon</name>
+   <dependencies>
+      <dependency>
+         <groupId>org.jboss.forge</groupId>
+         <artifactId>dependencies-api</artifactId>
+         <scope>compile</scope>
+      </dependency>
+      <dependency>
+         <groupId>org.jboss.forge</groupId>
+         <artifactId>dependencies-impl</artifactId>
+         <scope>runtime</scope>
+      </dependency>
+   </dependencies>
+   <build>
+      <plugins>
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-jar-plugin</artifactId>
+            <configuration>
+               <classifier>forge-addon</classifier>
+            </configuration>
+         </plugin>
+      </plugins>
+   </build>
+</project>

dependency-api/pom.xml → dependencies/api/pom.xml

@@ -3,9 +3,9 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
       <groupId>org.jboss.forge</groupId>
-      <artifactId>forge-parent</artifactId>
+      <artifactId>dependencies-parent</artifactId>
       <version>2.0.0-SNAPSHOT</version>
    </parent>
-   <artifactId>forge-dependency-api</artifactId>
-   <name>Forge - Addon Dependency API</name>
-</project>
+   <artifactId>dependencies-api</artifactId>
+   <name>Forge - Dependencies API</name>
+</project>

dependency-api/src/main/java/org/jboss/forge/addon/dependency/Coordinate.java → dependencies/api/src/main/java/org/jboss/forge/dependencies/Coordinate.java

@@ -5,7 +5,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.jboss.forge.addon.dependency;
+package org.jboss.forge.dependencies;
 
 /**
  *

dependency-api/src/main/java/org/jboss/forge/addon/dependency/Dependency.java → dependencies/api/src/main/java/org/jboss/forge/dependencies/Dependency.java

@@ -5,7 +5,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.jboss.forge.addon.dependency;
+package org.jboss.forge.dependencies;
 
 import java.io.File;
 

dependency-api/src/main/java/org/jboss/forge/addon/dependency/DependencyNode.java → dependencies/api/src/main/java/org/jboss/forge/dependencies/DependencyNode.java

@@ -5,7 +5,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.jboss.forge.addon.dependency;
+package org.jboss.forge.dependencies;
 
 import java.util.List;
 

dependency-api/src/main/java/org/jboss/forge/addon/dependency/DependencyQuery.java → dependencies/api/src/main/java/org/jboss/forge/dependencies/DependencyQuery.java

@@ -5,11 +5,11 @@
  * http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.jboss.forge.addon.dependency;
+package org.jboss.forge.dependencies;
 
 import java.util.List;
 
-import org.jboss.forge.addon.dependency.collection.Predicate;
+import org.jboss.forge.dependencies.collection.Predicate;
 
 /**
  * A parameter object which is used to search dependencies

dependency-api/src/main/java/org/jboss/forge/addon/dependency/DependencyRepository.java → dependencies/api/src/main/java/org/jboss/forge/dependencies/DependencyRepository.java

@@ -5,7 +5,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.jboss.forge.addon.dependency;
+package org.jboss.forge.dependencies;
 
 /**
  * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>

dependency-api/src/main/java/org/jboss/forge/addon/dependency/builder/CoordinateBuilder.java → dependencies/api/src/main/java/org/jboss/forge/dependencies/builder/CoordinateBuilder.java

@@ -5,12 +5,12 @@
  * http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.jboss.forge.addon.dependency.builder;
+package org.jboss.forge.dependencies.builder;
 
 import java.util.Map;
 
-import org.jboss.forge.addon.dependency.Coordinate;
-import org.jboss.forge.addon.dependency.Dependency;
+import org.jboss.forge.dependencies.Coordinate;
+import org.jboss.forge.dependencies.Dependency;
 
 public class CoordinateBuilder implements Coordinate
 {

dependency-api/src/main/java/org/jboss/forge/addon/dependency/builder/DependencyBuilder.java → dependencies/api/src/main/java/org/jboss/forge/dependencies/builder/DependencyBuilder.java

@@ -5,12 +5,12 @@
  * http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.jboss.forge.addon.dependency.builder;
+package org.jboss.forge.dependencies.builder;
 
 import java.io.File;
 
-import org.jboss.forge.addon.dependency.Coordinate;
-import org.jboss.forge.addon.dependency.Dependency;
+import org.jboss.forge.dependencies.Coordinate;
+import org.jboss.forge.dependencies.Dependency;
 
 /**
  * Builder to create {@link Dependency} objects. This class implements {@link Dependency} for easy consumption. (I.e.:

dependency-api/src/main/java/org/jboss/forge/addon/dependency/builder/DependencyNodeBuilder.java → dependencies/api/src/main/java/org/jboss/forge/dependencies/builder/DependencyNodeBuilder.java

@@ -5,14 +5,14 @@
  * http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.jboss.forge.addon.dependency.builder;
+package org.jboss.forge.dependencies.builder;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jboss.forge.addon.dependency.Dependency;
-import org.jboss.forge.addon.dependency.DependencyNode;
-import org.jboss.forge.addon.dependency.collection.Dependencies;
+import org.jboss.forge.dependencies.Dependency;
+import org.jboss.forge.dependencies.DependencyNode;
+import org.jboss.forge.dependencies.collection.Dependencies;
 
 /**
  * Creates a {@link DependencyNode} object

dependency-api/src/main/java/org/jboss/forge/addon/dependency/builder/DependencyQueryBuilder.java → dependencies/api/src/main/java/org/jboss/forge/dependencies/builder/DependencyQueryBuilder.java

@@ -5,17 +5,17 @@
  * http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.jboss.forge.addon.dependency.builder;
+package org.jboss.forge.dependencies.builder;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import org.jboss.forge.addon.dependency.Coordinate;
-import org.jboss.forge.addon.dependency.Dependency;
-import org.jboss.forge.addon.dependency.DependencyQuery;
-import org.jboss.forge.addon.dependency.DependencyRepository;
-import org.jboss.forge.addon.dependency.collection.Predicate;
+import org.jboss.forge.dependencies.Coordinate;
+import org.jboss.forge.dependencies.Dependency;
+import org.jboss.forge.dependencies.DependencyQuery;
+import org.jboss.forge.dependencies.DependencyRepository;
+import org.jboss.forge.dependencies.collection.Predicate;
 
 /**
  * Builds a {@link DependencyQuery} object

dependency-api/src/main/java/org/jboss/forge/addon/dependency/collection/Dependencies.java → dependencies/api/src/main/java/org/jboss/forge/dependencies/collection/Dependencies.java

@@ -5,7 +5,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.jboss.forge.addon.dependency.collection;
+package org.jboss.forge.dependencies.collection;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -18,9 +18,9 @@
 
 import javax.swing.tree.DefaultMutableTreeNode;
 
-import org.jboss.forge.addon.dependency.Coordinate;
-import org.jboss.forge.addon.dependency.Dependency;
-import org.jboss.forge.addon.dependency.DependencyNode;
+import org.jboss.forge.dependencies.Coordinate;
+import org.jboss.forge.dependencies.Dependency;
+import org.jboss.forge.dependencies.DependencyNode;
 
 /**
  * Provides utility methods for working with {@link Dependency} and {@link DependencyNode} objects

dependency-api/src/main/java/org/jboss/forge/addon/dependency/collection/Predicate.java → dependencies/api/src/main/java/org/jboss/forge/dependencies/collection/Predicate.java

@@ -5,7 +5,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.jboss.forge.addon.dependency.collection;
+package org.jboss.forge.dependencies.collection;
 
 /**
  * A Predicate determines a true or false value for a given input.

dependency-api/src/main/java/org/jboss/forge/addon/dependency/spi/DependencyResolver.java → dependencies/api/src/main/java/org/jboss/forge/dependencies/spi/DependencyResolver.java

@@ -5,15 +5,15 @@
  * http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.jboss.forge.addon.dependency.spi;
+package org.jboss.forge.dependencies.spi;
 
 import java.util.List;
 import java.util.Set;
 
-import org.jboss.forge.addon.dependency.Coordinate;
-import org.jboss.forge.addon.dependency.Dependency;
-import org.jboss.forge.addon.dependency.DependencyNode;
-import org.jboss.forge.addon.dependency.DependencyQuery;
+import org.jboss.forge.dependencies.Coordinate;
+import org.jboss.forge.dependencies.Dependency;
+import org.jboss.forge.dependencies.DependencyNode;
+import org.jboss.forge.dependencies.DependencyQuery;
 
 public interface DependencyResolver
 {

dependency-api/src/test/java/org/jboss/forge/addon/dependency/collection/DependenciesTest.java → dependencies/api/src/test/java/org/jboss/forge/addon/dependency/collection/DependenciesTest.java

@@ -9,9 +9,10 @@
 
 import java.util.Iterator;
 
-import org.jboss.forge.addon.dependency.DependencyNode;
-import org.jboss.forge.addon.dependency.builder.DependencyBuilder;
-import org.jboss.forge.addon.dependency.builder.DependencyNodeBuilder;
+import org.jboss.forge.dependencies.DependencyNode;
+import org.jboss.forge.dependencies.builder.DependencyBuilder;
+import org.jboss.forge.dependencies.builder.DependencyNodeBuilder;
+import org.jboss.forge.dependencies.collection.Dependencies;
 import org.junit.Assert;
 import org.junit.Test;