tamaya-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ple...@apache.org
Subject incubator-tamaya git commit: TAMAYA-13 Dependency cleanup for JUnit
Date Sun, 30 Nov 2014 21:54:40 GMT
Repository: incubator-tamaya
Updated Branches:
  refs/heads/master 96f77d4c3 -> 660d36567


TAMAYA-13 Dependency cleanup for JUnit


Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/660d3656
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/660d3656
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/660d3656

Branch: refs/heads/master
Commit: 660d36567a9a68aff64f025ba9e553568a0f6018
Parents: 96f77d4
Author: Oliver B. Fischer <plexus@apache.org>
Authored: Sun Nov 30 22:54:36 2014 +0100
Committer: Oliver B. Fischer <plexus@apache.org>
Committed: Sun Nov 30 22:54:36 2014 +0100

----------------------------------------------------------------------
 core/pom.xml                                     |  1 -
 modules/cdi/pom.xml                              | 12 +++++++++++-
 .../apache/tamaya/ext/cdi/ConfiguredTest.java    |  7 +++----
 modules/managed/pom.xml                          |  1 -
 modules/metamodel/pom.xml                        |  1 -
 modules/pom.xml                                  |  1 -
 pom.xml                                          | 19 +++++++++++++++++--
 7 files changed, 31 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/660d3656/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 77db85a..2b6f305 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -32,7 +32,6 @@ under the License.
 
     <properties>
         <jdkVersion>1.8</jdkVersion>
-        <junit.version>4.8.2</junit.version>
         <slf4j.version>1.7.2</slf4j.version>
         <log4j.version>1.2.17</log4j.version>
         <log4j2.version>2.1</log4j2.version>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/660d3656/modules/cdi/pom.xml
----------------------------------------------------------------------
diff --git a/modules/cdi/pom.xml b/modules/cdi/pom.xml
index 54d27c1..9f12b7a 100644
--- a/modules/cdi/pom.xml
+++ b/modules/cdi/pom.xml
@@ -32,7 +32,6 @@ under the License.
 
     <properties>
         <jdkVersion>1.8</jdkVersion>
-        <junit.version>4.8.2</junit.version>
         <maven.compile.targetLevel>${jdkVersion}</maven.compile.targetLevel>
         <maven.compile.sourceLevel>${jdkVersion}</maven.compile.sourceLevel>
         <owb.version>1.5.0-SNAPSHOT</owb.version>
@@ -75,6 +74,17 @@ under the License.
             <scope>test</scope>
         </dependency>
         <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-library</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>tamaya-core</artifactId>
             <version>${project.version}</version>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/660d3656/modules/cdi/src/test/java/org/apache/tamaya/ext/cdi/ConfiguredTest.java
----------------------------------------------------------------------
diff --git a/modules/cdi/src/test/java/org/apache/tamaya/ext/cdi/ConfiguredTest.java b/modules/cdi/src/test/java/org/apache/tamaya/ext/cdi/ConfiguredTest.java
index 571ae8c..3869b8b 100644
--- a/modules/cdi/src/test/java/org/apache/tamaya/ext/cdi/ConfiguredTest.java
+++ b/modules/cdi/src/test/java/org/apache/tamaya/ext/cdi/ConfiguredTest.java
@@ -16,14 +16,12 @@
 package org.apache.tamaya.ext.cdi;
 
 import org.apache.deltaspike.testcontrol.api.junit.CdiTestRunner;
-import org.junit.Assert;
+import org.hamcrest.MatcherAssert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import javax.enterprise.inject.spi.CDI;
-import java.util.OptionalDouble;
 
-import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 
 /**
@@ -40,7 +38,8 @@ public class ConfiguredTest{
         System.out.println("********************************************");
 
         double actual = 1234.5678;
-        assertThat(item.getDoubleValue(),is(actual));
+
+        MatcherAssert.assertThat(item.getDoubleValue(), is(actual));
     }
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/660d3656/modules/managed/pom.xml
----------------------------------------------------------------------
diff --git a/modules/managed/pom.xml b/modules/managed/pom.xml
index 15b2372..61c9a39 100644
--- a/modules/managed/pom.xml
+++ b/modules/managed/pom.xml
@@ -32,7 +32,6 @@ under the License.
 
     <properties>
         <jdkVersion>1.8</jdkVersion>
-        <junit.version>4.8.2</junit.version>
         <maven.compile.targetLevel>${jdkVersion}</maven.compile.targetLevel>
         <maven.compile.sourceLevel>${jdkVersion}</maven.compile.sourceLevel>
     </properties>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/660d3656/modules/metamodel/pom.xml
----------------------------------------------------------------------
diff --git a/modules/metamodel/pom.xml b/modules/metamodel/pom.xml
index 735fd17..c8161f1 100644
--- a/modules/metamodel/pom.xml
+++ b/modules/metamodel/pom.xml
@@ -32,7 +32,6 @@ under the License.
 
     <properties>
         <jdkVersion>1.8</jdkVersion>
-        <junit.version>4.8.2</junit.version>
         <maven.compile.targetLevel>${jdkVersion}</maven.compile.targetLevel>
         <maven.compile.sourceLevel>${jdkVersion}</maven.compile.sourceLevel>
     </properties>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/660d3656/modules/pom.xml
----------------------------------------------------------------------
diff --git a/modules/pom.xml b/modules/pom.xml
index 583fc17..40771b8 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -33,7 +33,6 @@ under the License.
     <properties>
         <github.global.server>github</github.global.server>
         <jdkVersion>1.8</jdkVersion>
-        <junit.version>4.8.2</junit.version>
         <maven.compile.targetLevel>${jdkVersion}</maven.compile.targetLevel>
         <maven.compile.sourceLevel>${jdkVersion}</maven.compile.sourceLevel>
     </properties>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/660d3656/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ba26380..5c07dcf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,10 +48,11 @@ under the License.
         <maven.compile.deprecation>true</maven.compile.deprecation>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<junit.version>4.8.2</junit.version>
+		<junit.version>4.11</junit.version>
 
         <!-- Dependency and plugin relate version properties go here -->
         <asciidoctor.version>1.5.0</asciidoctor.version>
+        <hamcrest.version>1.3</hamcrest.version>
         <findbugs.version>3.0.0</findbugs.version>
 	</properties>
 
@@ -303,9 +304,23 @@ under the License.
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
-                <version>4.11</version>
+                <version>${junit.version}</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>org.hamcrest</groupId>
+                <artifactId>hamcrest-core</artifactId>
+                <version>${hamcrest.version}</version>
+                <scope>test</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.hamcrest</groupId>
+                <artifactId>hamcrest-library</artifactId>
+                <version>${hamcrest.version}</version>
+                <scope>test</scope>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>
 


Mime
View raw message