FORGE-2705: Moved ArchetypeHelper to maven API and deprecated the one…

… in impl-projects
forge · Nov 29, 2016 · 4855d5a · 4855d5a
1 parent 90e2465
commit 4855d5a
Show file tree

Hide file tree

Showing 8 changed files with 662 additions and 637 deletions.
diff --git a/maven/api/src/main/java/org/jboss/forge/addon/maven/archetype/ArchetypeHelper.java b/maven/api/src/main/java/org/jboss/forge/addon/maven/archetype/ArchetypeHelper.java
diff --git a/...cts/archetype/SimpleNamespaceContext.java → ...ven/archetype/SimpleNamespaceContext.java b/...cts/archetype/SimpleNamespaceContext.java → ...ven/archetype/SimpleNamespaceContext.java
@@ -4,7 +4,7 @@
  * Licensed under the Eclipse Public License version 1.0, available at
  * http://www.eclipse.org/legal/epl-v10.html
  */
-package org.jboss.forge.addon.maven.projects.archetype;
+package org.jboss.forge.addon.maven.archetype;
 
 import java.util.HashMap;
 import java.util.Iterator;
@@ -17,10 +17,10 @@
  * 
  * @author <a href="ggastald@redhat.com">George Gastaldi</a>
  */
-public class SimpleNamespaceContext implements NamespaceContext
+class SimpleNamespaceContext implements NamespaceContext
 {
-   private Map<String, String> prefix2Ns = new HashMap<String, String>();
-   private Map<String, String> ns2Prefix = new HashMap<String, String>();
+   private Map<String, String> prefix2Ns = new HashMap<>();
+   private Map<String, String> ns2Prefix = new HashMap<>();
 
    public SimpleNamespaceContext()
    {

diff --git a/maven/impl-projects/pom.xml b/maven/impl-projects/pom.xml
@@ -7,9 +7,6 @@
    </parent>
    <artifactId>maven-impl-projects</artifactId>
    <name>Forge - Maven Projects Impl</name>
-   <properties>
-      <fabric8.archetypes.version>2.2.95</fabric8.archetypes.version>
-   </properties>
    <dependencies>
       <dependency>
          <groupId>org.jboss.forge.furnace.container</groupId>
@@ -95,69 +92,6 @@
          <classifier>forge-addon</classifier>
          <scope>provided</scope>
       </dependency>
-
-      <!-- testing -->
-      <dependency>
-         <groupId>org.assertj</groupId>
-         <artifactId>assertj-core</artifactId>
-         <version>1.7.1</version>
-         <scope>test</scope>
-      </dependency>
-      <dependency>
-         <groupId>io.fabric8.archetypes</groupId>
-         <artifactId>golang-example-archetype</artifactId>
-         <version>${fabric8.archetypes.version}</version>
-         <scope>test</scope>
-      </dependency>
-      <dependency>
-         <groupId>io.fabric8.archetypes</groupId>
-         <artifactId>cdi-camel-archetype</artifactId>
-         <version>${fabric8.archetypes.version}</version>
-         <scope>test</scope>
-      </dependency>
    </dependencies>
-
-   <build>
-      <plugins>
-         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-dependency-plugin</artifactId>
-            <executions>
-               <execution>
-                  <id>copy</id>
-                  <phase>test-compile</phase>
-                  <goals>
-                     <goal>copy</goal>
-                  </goals>
-                  <configuration>
-                     <artifactItems>
-                        <artifactItem>
-                           <groupId>io.fabric8.archetypes</groupId>
-                           <artifactId>cdi-camel-archetype</artifactId>
-                           <version>${fabric8.archetypes.version}</version>
-                           <type>jar</type>
-                           <overWrite>false</overWrite>
-                           <outputDirectory>${project.build.directory}/test-archetypes</outputDirectory>
-                           <destFileName>cdi-camel-archetype.jar</destFileName>
-                        </artifactItem>
-                        <artifactItem>
-                           <groupId>io.fabric8.archetypes</groupId>
-                           <artifactId>golang-example-archetype</artifactId>
-                           <version>${fabric8.archetypes.version}</version>
-                           <type>jar</type>
-                           <overWrite>false</overWrite>
-                           <outputDirectory>${project.build.directory}/test-archetypes</outputDirectory>
-                           <destFileName>golang-example-archetype.jar</destFileName>
-                        </artifactItem>
-                     </artifactItems>
-                     <!-- <outputDirectory>${project.build.directory}/wars</outputDirectory> -->
-                     <overWriteReleases>false</overWriteReleases>
-                     <overWriteSnapshots>true</overWriteSnapshots>
-                  </configuration>
-               </execution>
-            </executions>
-         </plugin>
-      </plugins>
-   </build>
 </project>