From 84d8342431208e7da5187cb4d89051042ca22898 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gunnlaugur=20=C3=9E=C3=B3r=20Briem?= Date: Tue, 24 Feb 2015 14:52:27 +0000 Subject: [PATCH 1/2] Fix dependency names/versions and add maven repos ... this way mvn install "just works", without needing to tweak the machine's maven configuration --- .../diachron-archive/archive-system/pom.xml | 14 ++++++++++++-- .../archive-web-services/pom.xml | 4 ++-- CoreServices/archive/diachron-archive/pom.xml | 18 ++++++++++++++++++ 3 files changed, 32 insertions(+), 4 deletions(-) diff --git a/CoreServices/archive/diachron-archive/archive-system/pom.xml b/CoreServices/archive/diachron-archive/archive-system/pom.xml index c71cd59..f894053 100644 --- a/CoreServices/archive/diachron-archive/archive-system/pom.xml +++ b/CoreServices/archive/diachron-archive/archive-system/pom.xml @@ -20,6 +20,16 @@ University Leipzig, AKSW Maven2 Repository http://maven.aksw.org/archiva/repository/internal + + virtjdbc4.snapshots/ + University Leipzig, AKSW Maven2 virtjdbc4 Repository + http://maven.aksw.org/repository/internal/com/openlink/virtuoso/virtjdbc4/ + + + virt_jena2.snapshots/ + University Leipzig, AKSW Maven2 virt_jena2 Repository + http://maven.aksw.org/repository/internal/com/openlink/virtuoso/virt_jena2/ + @@ -42,8 +52,8 @@ com.openlink.virtuoso - virtjena2 - 1.0.0 + virt_jena2 + 7.1.0 org.apache.commons diff --git a/CoreServices/archive/diachron-archive/archive-web-services/pom.xml b/CoreServices/archive/diachron-archive/archive-web-services/pom.xml index 3db2628..25cb2da 100644 --- a/CoreServices/archive/diachron-archive/archive-web-services/pom.xml +++ b/CoreServices/archive/diachron-archive/archive-web-services/pom.xml @@ -56,8 +56,8 @@ com.openlink.virtuoso - virtjena2 - 1.0.0 + virt_jena2 + 7.1.0 javax.servlet diff --git a/CoreServices/archive/diachron-archive/pom.xml b/CoreServices/archive/diachron-archive/pom.xml index a46e257..fa44085 100644 --- a/CoreServices/archive/diachron-archive/pom.xml +++ b/CoreServices/archive/diachron-archive/pom.xml @@ -10,4 +10,22 @@ archive-web-services archive-data-mapping + + + + maven.aksw.snapshots/ + University Leipzig, AKSW Maven2 Repository + http://maven.aksw.org/archiva/repository/internal + + + virtjdbc4.snapshots/ + University Leipzig, AKSW Maven2 virtjdbc4 Repository + http://maven.aksw.org/repository/internal/com/openlink/virtuoso/virtjdbc4/ + + + virt_jena2.snapshots/ + University Leipzig, AKSW Maven2 virt_jena2 Repository + http://maven.aksw.org/repository/internal/com/openlink/virtuoso/virt_jena2/ + + \ No newline at end of file From e0c90a0ea068593d8e7245c147be29afbcfb9ad7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gunnlaugur=20=C3=9E=C3=B3r=20Briem?= Date: Tue, 24 Feb 2015 14:53:45 +0000 Subject: [PATCH 2/2] Set explicit Java 1.6 build target ... to fix some platforms defaulting to targeting Java 1.3 and then failing to compile source files which use syntax from newer Java versions. --- CoreServices/archive/diachron-archive/pom.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/CoreServices/archive/diachron-archive/pom.xml b/CoreServices/archive/diachron-archive/pom.xml index fa44085..7bf4acb 100644 --- a/CoreServices/archive/diachron-archive/pom.xml +++ b/CoreServices/archive/diachron-archive/pom.xml @@ -28,4 +28,17 @@ http://maven.aksw.org/repository/internal/com/openlink/virtuoso/virt_jena2/ + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.3 + + 1.6 + 1.6 + + + + \ No newline at end of file