Skip to content
Permalink
Browse files

Fix 2472 - upgrade derbyversion to 10.12.1.1. This also updates the U…

…pdateHarvestDatabase-template.sh with new 5.0 nas-jar names
  • Loading branch information...
svcarlsen committed Nov 19, 2015
1 parent 973ec0b commit eff16f992455b1c5a40088f093e1169847c18a54
@@ -72,7 +72,7 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbyclient</artifactId>
<version>10.10.1.1</version>
<version>${derby.version}</version>
</dependency>

<dependency>
@@ -60,19 +60,19 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbyclient</artifactId>
<version>10.10.1.1</version>
<version>${derby.version}</version>
</dependency>

<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<version>10.10.1.1</version>
<version>${derby.version}</version>
</dependency>

<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbytools</artifactId>
<version>10.10.1.1</version>
<version>${derby.version}</version>
</dependency>
</dependencies>

@@ -1,5 +1,8 @@
#!/bin/bash
export INSTALLDIR=/home/test/QUICKSTART
cd $INSTALLDIR
export CLASSPATH=$INSTALLDIR/lib/dk.netarkivet.harvester.jar:$INSTALLDIR/lib/dk.netarkivet.archive.jar:$INSTALLDIR/lib/dk.netarkivet.viewerproxy.jar:$INSTALLDIR/lib/dk.netarkivet.monitor.jar:$INSTALLDIR/lib/dk.netarkivet.wayback.jar
export CLASSPATH=$INSTALLDIR/lib/netarchivesuite-harvester-core.jar:$INSTALLDIR/lib/netarchivesuite-archive-core.jar:$INSTALLDIR/lib/netarchivesuite-dk.netarkivet.monitor.jar:$INSTALLDIR/lib/netarchivesuite-wayback-indexer.jar

java -Ddk.netarkivet.settings.file=$INSTALLDIR/conf/settings_GUIApplication.xml dk.netarkivet.harvester.tools.HarvestdatabaseUpdateApplication


@@ -123,7 +123,7 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbynet</artifactId>
<version>10.10.1.1</version>
<version>10.12.1.1</version>
</dependency>

<dependency>
@@ -110,7 +110,7 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbyclient</artifactId>
<version>10.10.1.1</version>
<version>${derby.version}</version>
</dependency>

<!-- HarvestJobManager -->
@@ -115,19 +115,19 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbyclient</artifactId>
<version>10.10.1.1</version>
<version>${derby.version}</version>
</dependency>

<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<version>10.10.1.1</version>
<version>${derby.version}</version>
</dependency>

<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbytools</artifactId>
<version>10.10.1.1</version>
<version>${derby.version}</version>
</dependency>

</dependencies>
@@ -25,6 +25,7 @@
<wayback.version>1.8.0-20130411</wayback.version>
<openwayback.version>2.0.0</openwayback.version>
<jwat.version>1.0.3</jwat.version>
<derby.version>10.12.1.1</derby.version>
</properties>

<modules>
@@ -102,19 +102,19 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbyclient</artifactId>
<version>10.10.1.1</version>
<version>${derby.version}</version>
</dependency>

<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<version>10.10.1.1</version>
<version>${derby.version}</version>
</dependency>

<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbytools</artifactId>
<version>10.10.1.1</version>
<version>${derby.version}</version>
</dependency>
</dependencies>

0 comments on commit eff16f9

Please sign in to comment.
You can’t perform that action at this time.