You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ma...@apache.org on 2017/08/20 18:54:12 UTC
[1/2] archiva git commit: Removing indexer directory from source
Repository: archiva
Updated Branches:
refs/heads/master 7a2710ec0 -> 6cee4606c
Removing indexer directory from source
This directory seems to be accidentally in the source
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/83622e8d
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/83622e8d
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/83622e8d
Branch: refs/heads/master
Commit: 83622e8dd11302019a6fcbba8bd9ec4974c03ef1
Parents: 7a2710e
Author: Martin Stockhammer <ma...@apache.org>
Authored: Sun Aug 20 20:46:58 2017 +0200
Committer: Martin Stockhammer <ma...@apache.org>
Committed: Sun Aug 20 20:46:58 2017 +0200
----------------------------------------------------------------------
.../repositories/default-repository/.indexer/_0.cfe | Bin 299 -> 0 bytes
.../repositories/default-repository/.indexer/_0.cfs | Bin 1053 -> 0 bytes
.../repositories/default-repository/.indexer/_0.si | Bin 364 -> 0 bytes
.../default-repository/.indexer/segments_2 | Bin 136 -> 0 bytes
.../default-repository/.indexer/write.lock | 0
5 files changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/83622e8d/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/repositories/default-repository/.indexer/_0.cfe
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/repositories/default-repository/.indexer/_0.cfe b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/repositories/default-repository/.indexer/_0.cfe
deleted file mode 100644
index 4ece536..0000000
Binary files a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/repositories/default-repository/.indexer/_0.cfe and /dev/null differ
http://git-wip-us.apache.org/repos/asf/archiva/blob/83622e8d/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/repositories/default-repository/.indexer/_0.cfs
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/repositories/default-repository/.indexer/_0.cfs b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/repositories/default-repository/.indexer/_0.cfs
deleted file mode 100644
index a66fea1..0000000
Binary files a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/repositories/default-repository/.indexer/_0.cfs and /dev/null differ
http://git-wip-us.apache.org/repos/asf/archiva/blob/83622e8d/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/repositories/default-repository/.indexer/_0.si
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/repositories/default-repository/.indexer/_0.si b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/repositories/default-repository/.indexer/_0.si
deleted file mode 100644
index 84e9c5a..0000000
Binary files a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/repositories/default-repository/.indexer/_0.si and /dev/null differ
http://git-wip-us.apache.org/repos/asf/archiva/blob/83622e8d/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/repositories/default-repository/.indexer/segments_2
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/repositories/default-repository/.indexer/segments_2 b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/repositories/default-repository/.indexer/segments_2
deleted file mode 100644
index 3d64213..0000000
Binary files a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/repositories/default-repository/.indexer/segments_2 and /dev/null differ
http://git-wip-us.apache.org/repos/asf/archiva/blob/83622e8d/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/repositories/default-repository/.indexer/write.lock
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/repositories/default-repository/.indexer/write.lock b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/repositories/default-repository/.indexer/write.lock
deleted file mode 100644
index e69de29..0000000
[2/2] archiva git commit: Adding different guava dependency for
webtests
Posted by ma...@apache.org.
Adding different guava dependency for webtests
Workaround to get the selenium tests running. Better would
be a solution that allows the new guava version for the complete
project.
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/6cee4606
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/6cee4606
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/6cee4606
Branch: refs/heads/master
Commit: 6cee4606ca60a6a13607b7fcb3c60deca08e67d2
Parents: 83622e8
Author: Martin Stockhammer <ma...@apache.org>
Authored: Sun Aug 20 20:52:59 2017 +0200
Committer: Martin Stockhammer <ma...@apache.org>
Committed: Sun Aug 20 20:52:59 2017 +0200
----------------------------------------------------------------------
.../archiva-web/archiva-webapp-test/pom.xml | 13 +++++++++++++
1 file changed, 13 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/6cee4606/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-webapp-test/pom.xml b/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
index 30fd890..6c51eff 100644
--- a/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
@@ -65,6 +65,19 @@
</exclusions>
</dependency>
+ <!--
+ jcr-oak currently needs guava 15.0 and selenium webdriver needs 22.0
+ This is a rather poor workaround here better would be a way to use
+ the higher version for all scopes.
+ TODO: Check what's necessary to get jcr oak running with 22.0
+ -->
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>22.0</version>
+ <scope>test</scope>
+ </dependency>
+
<!-- Selenium dependencies -->
<dependency>
<groupId>org.seleniumhq.selenium</groupId>