jena-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject [1/5] jena git commit: JENA-1555, JENA-1554: Update awaitility ; add Apache Commons compress
Date Tue, 05 Jun 2018 19:29:58 GMT
Repository: jena
Updated Branches:
  refs/heads/master daa5565f2 -> 205fac61a


JENA-1555, JENA-1554: Update awaitility ; add Apache Commons compress


Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/eb9ba394
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/eb9ba394
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/eb9ba394

Branch: refs/heads/master
Commit: eb9ba394f59ae5f827a54db718b032d797d1bafb
Parents: daa5565
Author: Andy Seaborne <andy@apache.org>
Authored: Sun Jun 3 09:51:44 2018 +0100
Committer: Andy Seaborne <andy@apache.org>
Committed: Sun Jun 3 09:51:44 2018 +0100

----------------------------------------------------------------------
 jena-arq/pom.xml                                         |  2 +-
 .../core/mem/TestDatasetGraphInMemoryThreading.java      |  2 +-
 jena-base/pom.xml                                        |  7 ++++++-
 .../java/org/apache/jena/atlas/lib/TestAlarmClock.java   |  2 +-
 jena-core/pom.xml                                        |  2 +-
 .../java/org/apache/jena/shared/TestLockMRPlusSW.java    |  2 +-
 pom.xml                                                  | 11 +++++++++--
 7 files changed, 20 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/eb9ba394/jena-arq/pom.xml
----------------------------------------------------------------------
diff --git a/jena-arq/pom.xml b/jena-arq/pom.xml
index 78d16c5..9ff9d99 100644
--- a/jena-arq/pom.xml
+++ b/jena-arq/pom.xml
@@ -104,7 +104,7 @@
     </dependency>
 
     <dependency>
-      <groupId>com.jayway.awaitility</groupId>
+      <groupId>org.awaitility</groupId>
       <artifactId>awaitility</artifactId>
       <scope>test</scope>
     </dependency>

http://git-wip-us.apache.org/repos/asf/jena/blob/eb9ba394/jena-arq/src/test/java/org/apache/jena/sparql/core/mem/TestDatasetGraphInMemoryThreading.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/core/mem/TestDatasetGraphInMemoryThreading.java
b/jena-arq/src/test/java/org/apache/jena/sparql/core/mem/TestDatasetGraphInMemoryThreading.java
index 469bf7c..d872871 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/core/mem/TestDatasetGraphInMemoryThreading.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/core/mem/TestDatasetGraphInMemoryThreading.java
@@ -18,7 +18,7 @@
 
 package org.apache.jena.sparql.core.mem;
 
-import static com.jayway.awaitility.Awaitility.await ;
+import static org.awaitility.Awaitility.await ;
 import static org.apache.jena.graph.NodeFactory.createBlankNode ;
 import static org.apache.jena.query.ReadWrite.READ ;
 import static org.apache.jena.query.ReadWrite.WRITE ;

http://git-wip-us.apache.org/repos/asf/jena/blob/eb9ba394/jena-base/pom.xml
----------------------------------------------------------------------
diff --git a/jena-base/pom.xml b/jena-base/pom.xml
index f2284a2..3cb1771 100644
--- a/jena-base/pom.xml
+++ b/jena-base/pom.xml
@@ -59,6 +59,11 @@
       <artifactId>commons-lang3</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-compress</artifactId>
+    </dependency>
+
     <!-- supports persistent data structures -->
     <dependency>
       <groupId>com.github.andrewoma.dexx</groupId>
@@ -72,7 +77,7 @@
     </dependency>
 
     <dependency>
-      <groupId>com.jayway.awaitility</groupId>
+      <groupId>org.awaitility</groupId>
       <artifactId>awaitility</artifactId>
       <scope>test</scope>
     </dependency>

http://git-wip-us.apache.org/repos/asf/jena/blob/eb9ba394/jena-base/src/test/java/org/apache/jena/atlas/lib/TestAlarmClock.java
----------------------------------------------------------------------
diff --git a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestAlarmClock.java b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestAlarmClock.java
index 50037d0..8e7545c 100644
--- a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestAlarmClock.java
+++ b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestAlarmClock.java
@@ -18,7 +18,7 @@
 
 package org.apache.jena.atlas.lib ;
 
-import static com.jayway.awaitility.Awaitility.await ;
+import static org.awaitility.Awaitility.await ;
 import static org.apache.jena.atlas.lib.Lib.sleep ;
 
 import java.util.concurrent.TimeUnit ;

http://git-wip-us.apache.org/repos/asf/jena/blob/eb9ba394/jena-core/pom.xml
----------------------------------------------------------------------
diff --git a/jena-core/pom.xml b/jena-core/pom.xml
index 3ebda27..f3f4fec 100644
--- a/jena-core/pom.xml
+++ b/jena-core/pom.xml
@@ -81,7 +81,7 @@
     </dependency>
 
     <dependency>
-      <groupId>com.jayway.awaitility</groupId>
+      <groupId>org.awaitility</groupId>
       <artifactId>awaitility</artifactId>
       <scope>test</scope>
     </dependency>

http://git-wip-us.apache.org/repos/asf/jena/blob/eb9ba394/jena-core/src/test/java/org/apache/jena/shared/TestLockMRPlusSW.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/shared/TestLockMRPlusSW.java b/jena-core/src/test/java/org/apache/jena/shared/TestLockMRPlusSW.java
index c91d979..aeca31c 100644
--- a/jena-core/src/test/java/org/apache/jena/shared/TestLockMRPlusSW.java
+++ b/jena-core/src/test/java/org/apache/jena/shared/TestLockMRPlusSW.java
@@ -18,7 +18,7 @@
 
 package org.apache.jena.shared;
 
-import static com.jayway.awaitility.Awaitility.await;
+import static org.awaitility.Awaitility.await;
 import static java.lang.Thread.sleep;
 import static java.util.concurrent.Executors.defaultThreadFactory;
 

http://git-wip-us.apache.org/repos/asf/jena/blob/eb9ba394/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 443268e..f3a575e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,6 +68,7 @@
     <ver.commonslang3>3.4</ver.commonslang3>
     <ver.commonscsv>1.5</ver.commonscsv>
     <ver.commons-codec>1.11</ver.commons-codec>
+    <ver.commons-compress>1.16.1</ver.commons-compress>
 
     <ver.dexxcollection>0.7</ver.dexxcollection>
 
@@ -88,7 +89,7 @@
     <ver.spatial4j>0.6</ver.spatial4j>
 
     <ver.mockito>1.9.5</ver.mockito>
-    <ver.awaitility>1.7.0</ver.awaitility>
+    <ver.awaitility>3.1.0</ver.awaitility>
 
     <jdk.version>1.8</jdk.version>
     <targetJdk>${jdk.version}</targetJdk>
@@ -318,6 +319,12 @@
       </dependency>
       
       <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-compress</artifactId>
+        <version>${ver.commons-compress}</version>
+      </dependency>
+      
+      <dependency>
         <groupId>org.apache.thrift</groupId>
         <artifactId>libthrift</artifactId>
         <version>${ver.libthrift}</version>
@@ -527,7 +534,7 @@
       </dependency>
       
       <dependency>
-        <groupId>com.jayway.awaitility</groupId>
+        <groupId>org.awaitility</groupId>
         <artifactId>awaitility</artifactId>
         <version>${ver.awaitility}</version>
       </dependency>


Mime
View raw message