Updated parent version to 2.0.0.Final and removed dependency version …

…from tests
forge · Jan 30, 2014 · cf00fb1 · cf00fb1
1 parent 172fa0e
commit cf00fb1
Show file tree

Hide file tree

Showing 11 changed files with 80 additions and 83 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,13 +4,13 @@
    <parent>
       <groupId>org.jboss.forge</groupId>
       <artifactId>forge-parent</artifactId>
-      <version>2.0.0-SNAPSHOT</version>
+      <version>2.0.0.Final</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
 
    <groupId>org.jboss.forge.addon</groupId>
    <artifactId>gradle-parent</artifactId>
-
+   <version>2.0.0-SNAPSHOT</version>
    <packaging>pom</packaging>
    <name>Forge - Gradle Addon Parent</name>
 
@@ -21,14 +21,17 @@
       <module>addon</module>
       <module>tests</module>
    </modules>
-
+   
    <repositories>
       <repository>
          <id>Gradle Repository</id>
          <url>http://repo.gradle.org/gradle/libs-releases-local/</url>
       </repository>
    </repositories>
 
+   <properties>
+      <version.forge>2.0.0.Final</version.forge>
+   </properties>
    <dependencyManagement>
       <dependencies>
          <dependency>
@@ -55,37 +58,37 @@
          <dependency>
             <groupId>org.jboss.forge.addon</groupId>
             <artifactId>environment</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>${version.forge}</version>
             <classifier>forge-addon</classifier>
          </dependency>
          <dependency>
             <groupId>org.jboss.forge.addon</groupId>
             <artifactId>resources</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>${version.forge}</version>
             <classifier>forge-addon</classifier>
          </dependency>
          <dependency>
             <groupId>org.jboss.forge.addon</groupId>
             <artifactId>dependencies</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>${version.forge}</version>
             <classifier>forge-addon</classifier>
          </dependency>
          <dependency>
             <groupId>org.jboss.forge.addon</groupId>
             <artifactId>parser-java</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>${version.forge}</version>
             <classifier>forge-addon</classifier>
          </dependency>
          <dependency>
             <groupId>org.jboss.forge.addon</groupId>
             <artifactId>projects</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>${version.forge}</version>
             <classifier>forge-addon</classifier>
          </dependency>
          <dependency>
             <groupId>org.jboss.forge.addon</groupId>
             <artifactId>ui</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>${version.forge}</version>
             <classifier>forge-addon</classifier>
          </dependency>
 

diff --git a/tests/pom.xml b/tests/pom.xml
@@ -40,5 +40,11 @@
          <classifier>forge-addon</classifier>
          <scope>provided</scope>
       </dependency>
+      <dependency>
+         <groupId>org.jboss.forge.addon</groupId>
+         <artifactId>maven</artifactId>
+         <classifier>forge-addon</classifier>
+         <scope>test</scope>
+      </dependency>
    </dependencies>
 </project>
diff --git a/tests/src/test/java/org/jboss/forge/addon/gradle/projects/GradleComplexProjectTest.java b/tests/src/test/java/org/jboss/forge/addon/gradle/projects/GradleComplexProjectTest.java
@@ -35,11 +35,11 @@ public class GradleComplexProjectTest
 {
    @Deployment
    @Dependencies({
-            @AddonDependency(name = "org.jboss.forge.addon:resources", version = "2.0.0-SNAPSHOT"),
-            @AddonDependency(name = "org.jboss.forge.addon:projects", version = "2.0.0-SNAPSHOT"),
-            @AddonDependency(name = "org.jboss.forge.addon:parser-java", version = "2.0.0-SNAPSHOT"),
-            @AddonDependency(name = "org.jboss.forge.addon:gradle", version = "2.0.0-SNAPSHOT"),
-            @AddonDependency(name = "org.jboss.forge.addon:maven", version = "2.0.0-SNAPSHOT")
+            @AddonDependency(name = "org.jboss.forge.addon:resources"),
+            @AddonDependency(name = "org.jboss.forge.addon:projects"),
+            @AddonDependency(name = "org.jboss.forge.addon:parser-java"),
+            @AddonDependency(name = "org.jboss.forge.addon:gradle"),
+            @AddonDependency(name = "org.jboss.forge.addon:maven")
    })
    public static ForgeArchive getDeployment()
    {
@@ -57,47 +57,47 @@ public static ForgeArchive getDeployment()
    public void setUp()
    {
       subproject = projectProvider.create("subproject",
-                        GradleTestProjectProvider.COMPLEX_RESOURCES_PATH,
-                        GradleTestProjectProvider.COMPLEX_RESOURCES);
+               GradleTestProjectProvider.COMPLEX_RESOURCES_PATH,
+               GradleTestProjectProvider.COMPLEX_RESOURCES);
    }
 
    @After
    public void cleanUp()
    {
       projectProvider.clean();
    }
-   
+
    @Test
    public void testChangeName()
    {
       MetadataFacet facet = subproject.getFacet(MetadataFacet.class);
-      
+
       assertEquals("x", facet.getProjectName());
       facet.setProjectName("newname");
 
       Project sameProject = projectProvider.create("",
-                        GradleTestProjectProvider.COMPLEX_RESOURCES_PATH);
+               GradleTestProjectProvider.COMPLEX_RESOURCES_PATH);
       MetadataFacet sameFacet = sameProject.getFacet(MetadataFacet.class);
-      
+
       assertEquals("newname", sameFacet.getProjectName());
    }
-   
+
    @Test
    public void testReadInheritedProperties()
    {
       MetadataFacet metadataFacet = subproject.getFacet(MetadataFacet.class);
       assertEquals("org.complexproject", metadataFacet.getTopLevelPackage());
       assertEquals("org.x", metadataFacet.getEffectiveProperties().get("someProperty"));
-      
+
       DependencyFacet dependencyFacet = subproject.getFacet(DependencyFacet.class);
       assertTrue(dependencyFacet.hasEffectiveDependency(
                DependencyBuilder.create("org.x:xyz:SNAPSHOT")));
-      
+
       Dependency dep = dependencyFacet.getEffectiveDependency(
                DependencyBuilder.create("org.x:xyz:SNAPSHOT"));
       assertEquals("compile", dep.getScopeType());
       assertEquals(1, dep.getExcludedCoordinates().size());
-      
+
       Coordinate exclusion = dep.getExcludedCoordinates().get(0);
       assertEquals("org.x", exclusion.getGroupId());
       assertEquals("abc", exclusion.getArtifactId());

diff --git a/tests/src/test/java/org/jboss/forge/addon/gradle/projects/GradleFacetTest.java b/tests/src/test/java/org/jboss/forge/addon/gradle/projects/GradleFacetTest.java
@@ -41,23 +41,21 @@ public class GradleFacetTest
 {
    @Deployment
    @Dependencies({
-            @AddonDependency(name = "org.jboss.forge.addon:resources", version = "2.0.0-SNAPSHOT"),
-            @AddonDependency(name = "org.jboss.forge.addon:projects", version = "2.0.0-SNAPSHOT"),
-            @AddonDependency(name = "org.jboss.forge.addon:parser-java", version = "2.0.0-SNAPSHOT"),
-            @AddonDependency(name = "org.jboss.forge.addon:gradle", version = "2.0.0-SNAPSHOT"),
-            @AddonDependency(name = "org.jboss.forge.addon:maven", version = "2.0.0-SNAPSHOT")
+            @AddonDependency(name = "org.jboss.forge.addon:resources"),
+            @AddonDependency(name = "org.jboss.forge.addon:projects"),
+            @AddonDependency(name = "org.jboss.forge.addon:parser-java"),
+            @AddonDependency(name = "org.jboss.forge.addon:gradle"),
+            @AddonDependency(name = "org.jboss.forge.addon:maven")
    })
    public static ForgeArchive getDeployment()
    {
       return GradleTestProjectProvider.getDeployment(
                GradleTestProjectProvider.SIMPLE_RESOURCES_PATH,
                GradleTestProjectProvider.SIMPLE_RESOURCES);
    }
-
-   private static GradleTestProjectProvider projectProvider;
 
    @Inject
-   private GradleTestProjectProvider injectedProjectProvider;
+   private GradleTestProjectProvider projectProvider;
    @Inject
    private ResourceFactory resourceFactory;
 
@@ -67,10 +65,6 @@ public static ForgeArchive getDeployment()
    @Before
    public void setUp()
    {
-      if (projectProvider == null)
-      {
-         projectProvider = injectedProjectProvider;
-      }
       project = projectProvider.create("",
                GradleTestProjectProvider.SIMPLE_RESOURCES_PATH,
                GradleTestProjectProvider.SIMPLE_RESOURCES);

diff --git a/tests/src/test/java/org/jboss/forge/addon/gradle/projects/GradleJavaProjectTypeTest.java b/tests/src/test/java/org/jboss/forge/addon/gradle/projects/GradleJavaProjectTypeTest.java
@@ -34,11 +34,11 @@ public class GradleJavaProjectTypeTest
 {
    @Deployment
    @Dependencies({
-            @AddonDependency(name = "org.jboss.forge.addon:resources", version = "2.0.0-SNAPSHOT"),
-            @AddonDependency(name = "org.jboss.forge.addon:projects", version = "2.0.0-SNAPSHOT"),
-            @AddonDependency(name = "org.jboss.forge.addon:parser-java", version = "2.0.0-SNAPSHOT"),
-            @AddonDependency(name = "org.jboss.forge.addon:gradle", version = "2.0.0-SNAPSHOT"),
-            @AddonDependency(name = "org.jboss.forge.addon:maven", version = "2.0.0-SNAPSHOT")
+            @AddonDependency(name = "org.jboss.forge.addon:resources"),
+            @AddonDependency(name = "org.jboss.forge.addon:projects"),
+            @AddonDependency(name = "org.jboss.forge.addon:parser-java"),
+            @AddonDependency(name = "org.jboss.forge.addon:gradle"),
+            @AddonDependency(name = "org.jboss.forge.addon:maven")
    })
    public static ForgeArchive getDeployment()
    {

diff --git a/tests/src/test/java/org/jboss/forge/addon/gradle/projects/GradleTestProjectProvider.java b/tests/src/test/java/org/jboss/forge/addon/gradle/projects/GradleTestProjectProvider.java
@@ -50,12 +50,12 @@ public static ForgeArchive getDeployment(String resourcesPath, String... resourc
                .addClass(GradleTestProjectProvider.class)
                .addClass(ProjectAssert.class)
                .addAsAddonDependencies(
-                        AddonDependencyEntry.create("org.jboss.forge.furnace.container:cdi", "2.0.0-SNAPSHOT"),
-                        AddonDependencyEntry.create("org.jboss.forge.addon:resources", "2.0.0-SNAPSHOT"),
-                        AddonDependencyEntry.create("org.jboss.forge.addon:gradle", "2.0.0-SNAPSHOT"),
-                        AddonDependencyEntry.create("org.jboss.forge.addon:projects", "2.0.0-SNAPSHOT"),
-                        AddonDependencyEntry.create("org.jboss.forge.addon:parser-java", "2.0.0-SNAPSHOT"),
-                        AddonDependencyEntry.create("org.jboss.forge.addon:maven", "2.0.0-SNAPSHOT")
+                        AddonDependencyEntry.create("org.jboss.forge.furnace.container:cdi"),
+                        AddonDependencyEntry.create("org.jboss.forge.addon:resources"),
+                        AddonDependencyEntry.create("org.jboss.forge.addon:gradle"),
+                        AddonDependencyEntry.create("org.jboss.forge.addon:projects"),
+                        AddonDependencyEntry.create("org.jboss.forge.addon:parser-java"),
+                        AddonDependencyEntry.create("org.jboss.forge.addon:maven")
                );
       for (String resource : resources)
       {

diff --git a/...src/test/java/org/jboss/forge/addon/gradle/projects/facets/GradleDependencyFacetTest.java b/...src/test/java/org/jboss/forge/addon/gradle/projects/facets/GradleDependencyFacetTest.java
@@ -45,11 +45,11 @@ public class GradleDependencyFacetTest
 {
    @Deployment
    @Dependencies({
-            @AddonDependency(name = "org.jboss.forge.addon:resources", version = "2.0.0-SNAPSHOT"),
-            @AddonDependency(name = "org.jboss.forge.addon:projects", version = "2.0.0-SNAPSHOT"),
-            @AddonDependency(name = "org.jboss.forge.addon:parser-java", version = "2.0.0-SNAPSHOT"),
-            @AddonDependency(name = "org.jboss.forge.addon:gradle", version = "2.0.0-SNAPSHOT"),
-            @AddonDependency(name = "org.jboss.forge.addon:maven", version = "2.0.0-SNAPSHOT")
+            @AddonDependency(name = "org.jboss.forge.addon:resources"),
+            @AddonDependency(name = "org.jboss.forge.addon:projects"),
+            @AddonDependency(name = "org.jboss.forge.addon:parser-java"),
+            @AddonDependency(name = "org.jboss.forge.addon:gradle"),
+            @AddonDependency(name = "org.jboss.forge.addon:maven")
    })
    public static ForgeArchive getDeployment()
    {

diff --git a/...src/test/java/org/jboss/forge/addon/gradle/projects/facets/GradleJavaSourceFacetTest.java b/...src/test/java/org/jboss/forge/addon/gradle/projects/facets/GradleJavaSourceFacetTest.java
@@ -44,11 +44,11 @@ public class GradleJavaSourceFacetTest
 {
    @Deployment
    @Dependencies({
-            @AddonDependency(name = "org.jboss.forge.addon:resources", version = "2.0.0-SNAPSHOT"),
-            @AddonDependency(name = "org.jboss.forge.addon:projects", version = "2.0.0-SNAPSHOT"),
-            @AddonDependency(name = "org.jboss.forge.addon:parser-java", version = "2.0.0-SNAPSHOT"),
-            @AddonDependency(name = "org.jboss.forge.addon:gradle", version = "2.0.0-SNAPSHOT"),
-            @AddonDependency(name = "org.jboss.forge.addon:maven", version = "2.0.0-SNAPSHOT")
+            @AddonDependency(name = "org.jboss.forge.addon:resources"),
+            @AddonDependency(name = "org.jboss.forge.addon:projects"),
+            @AddonDependency(name = "org.jboss.forge.addon:parser-java"),
+            @AddonDependency(name = "org.jboss.forge.addon:gradle"),
+            @AddonDependency(name = "org.jboss.forge.addon:maven")
    })
    public static ForgeArchive getDeployment()
    {
@@ -57,8 +57,6 @@ public static ForgeArchive getDeployment()
                GradleTestProjectProvider.SIMPLE_RESOURCES);
    }
 
-   private static GradleTestProjectProvider projectProvider;
-
    @Inject
    private GradleTestProjectProvider injectedProjectProvider;
    private Project project;
@@ -70,11 +68,7 @@ public static ForgeArchive getDeployment()
    @Before
    public void setUp()
    {
-      if (projectProvider == null)
-      {
-         projectProvider = injectedProjectProvider;
-      }
-      project = projectProvider.create("",
+      project = injectedProjectProvider.create("",
                GradleTestProjectProvider.SIMPLE_RESOURCES_PATH,
                GradleTestProjectProvider.SIMPLE_RESOURCES);
       facet = project.getFacet(JavaSourceFacet.class);
@@ -83,7 +77,7 @@ public void setUp()
    @After
    public void cleanUp()
    {
-      projectProvider.clean();
+      injectedProjectProvider.clean();
    }
 
    @Test

diff --git a/...s/src/test/java/org/jboss/forge/addon/gradle/projects/facets/GradleMetadataFacetTest.java b/...s/src/test/java/org/jboss/forge/addon/gradle/projects/facets/GradleMetadataFacetTest.java
@@ -36,19 +36,19 @@ public class GradleMetadataFacetTest
 {
    @Deployment
    @Dependencies({
-            @AddonDependency(name = "org.jboss.forge.addon:resources", version = "2.0.0-SNAPSHOT"),
-            @AddonDependency(name = "org.jboss.forge.addon:projects", version = "2.0.0-SNAPSHOT"),
-            @AddonDependency(name = "org.jboss.forge.addon:parser-java", version = "2.0.0-SNAPSHOT"),
-            @AddonDependency(name = "org.jboss.forge.addon:gradle", version = "2.0.0-SNAPSHOT"),
-            @AddonDependency(name = "org.jboss.forge.addon:maven", version = "2.0.0-SNAPSHOT")
+            @AddonDependency(name = "org.jboss.forge.addon:resources"),
+            @AddonDependency(name = "org.jboss.forge.addon:projects"),
+            @AddonDependency(name = "org.jboss.forge.addon:parser-java"),
+            @AddonDependency(name = "org.jboss.forge.addon:gradle"),
+            @AddonDependency(name = "org.jboss.forge.addon:maven")
    })
    public static ForgeArchive getDeployment()
    {
       return GradleTestProjectProvider.getDeployment(
                GradleTestProjectProvider.SIMPLE_RESOURCES_PATH,
                GradleTestProjectProvider.SIMPLE_RESOURCES);
    }
-   
+
    private static GradleTestProjectProvider projectProvider;
 
    @Inject

diff --git a/.../src/test/java/org/jboss/forge/addon/gradle/projects/facets/GradlePackagingFacetTest.java b/.../src/test/java/org/jboss/forge/addon/gradle/projects/facets/GradlePackagingFacetTest.java
@@ -33,19 +33,19 @@ public class GradlePackagingFacetTest
 {
    @Deployment
    @Dependencies({
-            @AddonDependency(name = "org.jboss.forge.addon:resources", version = "2.0.0-SNAPSHOT"),
-            @AddonDependency(name = "org.jboss.forge.addon:projects", version = "2.0.0-SNAPSHOT"),
-            @AddonDependency(name = "org.jboss.forge.addon:parser-java", version = "2.0.0-SNAPSHOT"),
-            @AddonDependency(name = "org.jboss.forge.addon:gradle", version = "2.0.0-SNAPSHOT"),
-            @AddonDependency(name = "org.jboss.forge.addon:maven", version = "2.0.0-SNAPSHOT")
+            @AddonDependency(name = "org.jboss.forge.addon:resources"),
+            @AddonDependency(name = "org.jboss.forge.addon:projects"),
+            @AddonDependency(name = "org.jboss.forge.addon:parser-java"),
+            @AddonDependency(name = "org.jboss.forge.addon:gradle"),
+            @AddonDependency(name = "org.jboss.forge.addon:maven")
    })
    public static ForgeArchive getDeployment()
    {
       return GradleTestProjectProvider.getDeployment(
                GradleTestProjectProvider.SIMPLE_RESOURCES_PATH,
                GradleTestProjectProvider.SIMPLE_RESOURCES);
    }
-   
+
    private static GradleTestProjectProvider projectProvider;
 
    @Inject

diff --git a/...s/src/test/java/org/jboss/forge/addon/gradle/projects/facets/GradleResourceFacetTest.java b/...s/src/test/java/org/jboss/forge/addon/gradle/projects/facets/GradleResourceFacetTest.java
@@ -39,19 +39,19 @@ public class GradleResourceFacetTest
 {
    @Deployment
    @Dependencies({
-            @AddonDependency(name = "org.jboss.forge.addon:resources", version = "2.0.0-SNAPSHOT"),
-            @AddonDependency(name = "org.jboss.forge.addon:projects", version = "2.0.0-SNAPSHOT"),
-            @AddonDependency(name = "org.jboss.forge.addon:parser-java", version = "2.0.0-SNAPSHOT"),
-            @AddonDependency(name = "org.jboss.forge.addon:gradle", version = "2.0.0-SNAPSHOT"),
-            @AddonDependency(name = "org.jboss.forge.addon:maven", version = "2.0.0-SNAPSHOT")
+            @AddonDependency(name = "org.jboss.forge.addon:resources"),
+            @AddonDependency(name = "org.jboss.forge.addon:projects"),
+            @AddonDependency(name = "org.jboss.forge.addon:parser-java"),
+            @AddonDependency(name = "org.jboss.forge.addon:gradle"),
+            @AddonDependency(name = "org.jboss.forge.addon:maven")
    })
    public static ForgeArchive getDeployment()
    {
       return GradleTestProjectProvider.getDeployment(
                GradleTestProjectProvider.SIMPLE_RESOURCES_PATH,
                GradleTestProjectProvider.SIMPLE_RESOURCES);
    }
-   
+
    private static GradleTestProjectProvider projectProvider;
 
    @Inject