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: Update Hamcrest (1.3 -> 2.0.0.0)
Date Sun, 14 Feb 2016 20:13:00 GMT
Repository: incubator-tamaya
Updated Branches:
  refs/heads/master ea94e011a -> 0148fda48


Update Hamcrest (1.3 -> 2.0.0.0)


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

Branch: refs/heads/master
Commit: 0148fda485e27ccebc5830d395a2fabb28944707
Parents: ea94e01
Author: Oliver B. Fischer <plexus@apache.org>
Authored: Sun Feb 14 21:12:56 2016 +0100
Committer: Oliver B. Fischer <plexus@apache.org>
Committed: Sun Feb 14 21:12:56 2016 +0100

----------------------------------------------------------------------
 code/core/pom.xml                  |  6 +-----
 modules/builder/pom.xml            |  9 ++-------
 modules/integration/camel/pom.xml  |  7 +------
 modules/integration/cdi-se/pom.xml |  7 +------
 modules/integration/cdi/pom.xml    |  7 +------
 modules/integration/etcd/pom.xml   |  7 +------
 modules/integration/spring/pom.xml |  7 +------
 modules/json/pom.xml               |  6 +-----
 modules/server/pom.xml             | 10 +---------
 pom.xml                            | 11 ++---------
 sandbox/jodatime/pom.xml           |  4 ++--
 sandbox/ui/jsf/pom.xml             |  7 +------
 12 files changed, 15 insertions(+), 73 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/0148fda4/code/core/pom.xml
----------------------------------------------------------------------
diff --git a/code/core/pom.xml b/code/core/pom.xml
index 4a496db..c93a72d 100644
--- a/code/core/pom.xml
+++ b/code/core/pom.xml
@@ -46,11 +46,7 @@ under the License.
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-library</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-core</artifactId>
+            <artifactId>java-hamcrest</artifactId>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/0148fda4/modules/builder/pom.xml
----------------------------------------------------------------------
diff --git a/modules/builder/pom.xml b/modules/builder/pom.xml
index c7da3f8..32dc6b5 100644
--- a/modules/builder/pom.xml
+++ b/modules/builder/pom.xml
@@ -66,14 +66,9 @@ under the License.
             <scope>test</scope>
         </dependency>
 
-
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-library</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-core</artifactId>
+            <artifactId>java-hamcrest</artifactId>
         </dependency>
 
         <dependency>
@@ -106,4 +101,4 @@ under the License.
         </plugins>
     </build -->
     
-</project>
\ No newline at end of file
+</project>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/0148fda4/modules/integration/camel/pom.xml
----------------------------------------------------------------------
diff --git a/modules/integration/camel/pom.xml b/modules/integration/camel/pom.xml
index c1968d2..a57e0e9 100644
--- a/modules/integration/camel/pom.xml
+++ b/modules/integration/camel/pom.xml
@@ -70,12 +70,7 @@ under the License.
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-library</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-core</artifactId>
+            <artifactId>java-hamcrest</artifactId>
             <scope>test</scope>
         </dependency>
 

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/0148fda4/modules/integration/cdi-se/pom.xml
----------------------------------------------------------------------
diff --git a/modules/integration/cdi-se/pom.xml b/modules/integration/cdi-se/pom.xml
index cd80e97..231e619 100644
--- a/modules/integration/cdi-se/pom.xml
+++ b/modules/integration/cdi-se/pom.xml
@@ -80,12 +80,7 @@ under the License.
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-library</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-core</artifactId>
+            <artifactId>java-hamcrest</artifactId>
             <scope>test</scope>
         </dependency>
 

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/0148fda4/modules/integration/cdi/pom.xml
----------------------------------------------------------------------
diff --git a/modules/integration/cdi/pom.xml b/modules/integration/cdi/pom.xml
index 0ec0d39..147ac9d 100644
--- a/modules/integration/cdi/pom.xml
+++ b/modules/integration/cdi/pom.xml
@@ -84,12 +84,7 @@ under the License.
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-library</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-core</artifactId>
+            <artifactId>java-hamcrest</artifactId>
             <scope>test</scope>
         </dependency>
 

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/0148fda4/modules/integration/etcd/pom.xml
----------------------------------------------------------------------
diff --git a/modules/integration/etcd/pom.xml b/modules/integration/etcd/pom.xml
index 041d98e..c4bf750 100644
--- a/modules/integration/etcd/pom.xml
+++ b/modules/integration/etcd/pom.xml
@@ -70,12 +70,7 @@ under the License.
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-library</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-core</artifactId>
+            <artifactId>java-hamcrest</artifactId>
             <scope>test</scope>
         </dependency>
 

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/0148fda4/modules/integration/spring/pom.xml
----------------------------------------------------------------------
diff --git a/modules/integration/spring/pom.xml b/modules/integration/spring/pom.xml
index 27df9e7..03fb359 100644
--- a/modules/integration/spring/pom.xml
+++ b/modules/integration/spring/pom.xml
@@ -71,12 +71,7 @@ under the License.
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-library</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-core</artifactId>
+            <artifactId>java-hamcrest</artifactId>
             <scope>test</scope>
         </dependency>
 

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/0148fda4/modules/json/pom.xml
----------------------------------------------------------------------
diff --git a/modules/json/pom.xml b/modules/json/pom.xml
index c5d344f..670516c 100644
--- a/modules/json/pom.xml
+++ b/modules/json/pom.xml
@@ -97,11 +97,7 @@ under the License.
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-library</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-core</artifactId>
+            <artifactId>java-hamcrest</artifactId>
         </dependency>
     </dependencies>
 

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/0148fda4/modules/server/pom.xml
----------------------------------------------------------------------
diff --git a/modules/server/pom.xml b/modules/server/pom.xml
index 28e26e5..45dbc55 100644
--- a/modules/server/pom.xml
+++ b/modules/server/pom.xml
@@ -71,15 +71,7 @@ under the License.
         </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>
+            <artifactId>java-hamcrest</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/0148fda4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3c8553b..19c8ecb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,7 +71,7 @@ under the License.
         <enforcer.version>1.4</enforcer.version>
         <gem.plugin>1.0.7</gem.plugin>
         <sources.plugin>2.4</sources.plugin>
-        <hamcrest.version>1.3</hamcrest.version>
+        <hamcrest.version>2.0.0.0</hamcrest.version>
         <javadoc.version>2.9.1</javadoc.version>
         <!-- Must/should match the JRuby version used by AsciidoctorJ -->
         <jruby.version>1.7.20</jruby.version>
@@ -234,14 +234,7 @@ under the License.
 
             <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>
+                <artifactId>java-hamcrest</artifactId>
                 <version>${hamcrest.version}</version>
                 <scope>test</scope>
             </dependency>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/0148fda4/sandbox/jodatime/pom.xml
----------------------------------------------------------------------
diff --git a/sandbox/jodatime/pom.xml b/sandbox/jodatime/pom.xml
index 98f48cf..13d7c29 100644
--- a/sandbox/jodatime/pom.xml
+++ b/sandbox/jodatime/pom.xml
@@ -66,7 +66,7 @@ under the License.
 
         <dependency>
             <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-library</artifactId>
+            <artifactId>java-hamcrest</artifactId>
             <scope>test</scope>
         </dependency>
 
@@ -104,4 +104,4 @@ under the License.
 
 
     
-</project>
\ No newline at end of file
+</project>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/0148fda4/sandbox/ui/jsf/pom.xml
----------------------------------------------------------------------
diff --git a/sandbox/ui/jsf/pom.xml b/sandbox/ui/jsf/pom.xml
index abba160..aab6a64 100644
--- a/sandbox/ui/jsf/pom.xml
+++ b/sandbox/ui/jsf/pom.xml
@@ -76,12 +76,7 @@ under the License.
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-library</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-core</artifactId>
+            <artifactId>java-hamcrest</artifactId>
             <scope>test</scope>
         </dependency>
 


Mime
View raw message