summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorreger <reger18@arcor.de>2014-12-19 01:58:37 +0100
committerreger <reger18@arcor.de>2014-12-19 01:58:37 +0100
commit13cca2b1144efe34f94cb1e3a038c882875c81e1 (patch)
tree028a792b01e6b5fc3031baf5bd9aa08c6201ee98
parentd7e2f08a897d77d225d56df2c023595b63aca368 (diff)
fix missing AppPath
upd Maven plugin versionid
-rw-r--r--pom.xml15
-rw-r--r--source/net/yacy/search/Switchboard.java2
2 files changed, 9 insertions, 8 deletions
diff --git a/pom.xml b/pom.xml
index fe06fac64..bdfffdc78 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,7 +56,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>2.4</version>
+ <version>2.5</version>
<configuration>
<warSourceDirectory>htroot</warSourceDirectory>
</configuration>
@@ -65,7 +65,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
+ <version>3.2</version>
<configuration>
<excludes>
<!-- special exclude for compatibility with ant build script
@@ -84,7 +84,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.4</version>
+ <version>2.5</version>
<configuration>
<archive>
<manifest>
@@ -101,7 +101,7 @@
<plugin>
<artifactId>maven-clean-plugin</artifactId>
- <version>2.5</version>
+ <version>2.6.1</version>
<configuration>
<filesets>
<fileset>
@@ -113,7 +113,7 @@
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.4</version>
+ <version>2.5.2</version>
<configuration>
<descriptors>
<descriptor>assembly.xml</descriptor>
@@ -135,6 +135,7 @@
<!-- compile htroot -->
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>1.7</version>
<executions>
<execution>
<id>compile-htroot</id>
@@ -159,7 +160,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9</version>
+ <version>2.10.1</version>
<configuration>
<reportOutputDirectory>javadoc</reportOutputDirectory>
<author>true</author>
@@ -247,7 +248,7 @@
<!-- install jars not found in maven repository to local repository -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
- <version>2.4</version>
+ <version>2.5.2</version>
<executions>
<execution>
diff --git a/source/net/yacy/search/Switchboard.java b/source/net/yacy/search/Switchboard.java
index b4a63e1ad..2ea224840 100644
--- a/source/net/yacy/search/Switchboard.java
+++ b/source/net/yacy/search/Switchboard.java
@@ -717,7 +717,7 @@ public final class Switchboard extends serverSwitch {
// copy opensearch heuristic config (if not exist)
final File osdConfig = new File(getDataPath(), "DATA/SETTINGS/heuristicopensearch.conf");
if (!osdConfig.exists()) {
- final File osdDefaultConfig = new File("defaults/heuristicopensearch.conf");
+ final File osdDefaultConfig = new File(getAppPath(), "defaults/heuristicopensearch.conf");
this.log.info("heuristic.opensearch list Path = " + osdDefaultConfig.getAbsolutePath());
try {
Files.copy(osdDefaultConfig, osdConfig);