diff --git a/pom.xml b/pom.xml index 42f94663d..7eaaceba4 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ net.yacy yacycore - 1.3 + 1.64 jar YaCy - a Peer to Peer Web Search Engine YaCy @@ -29,9 +29,12 @@ - UTF-8 + 1.6 + 1.6 + + 4.5.0 @@ -40,35 +43,23 @@ yacycore - - + - org.codehaus.mojo - build-helper-maven-plugin - 1.7 - - - add-source-htroot - generate-sources - - add-source - - - - htroot - - - - + org.apache.maven.plugins + maven-war-plugin + 2.4 + + htroot + org.apache.maven.plugins maven-compiler-plugin - 2.5.1 + 3.1 - 1.6 - 1.6 + ${maven.compiler.source} + ${maven.compiler.target} @@ -77,14 +68,11 @@ maven-jar-plugin 2.4 - - - htroot - net.yacy.yacy true + true ${project.version}-${buildNumber} @@ -114,7 +102,7 @@ - + maven-antrun-plugin @@ -201,7 +189,6 @@ - @@ -283,26 +270,9 @@ - - install-domaingraph-jar - clean - - install-file - - - ${basedir}/htroot/processing/domaingraph/applet/domaingraph.jar - net.yacy.extlib - domaingraph - 0135 - jar - true - - - - @@ -338,12 +308,11 @@ commons-codec commons-codec 1.7 - jar org.apache.commons commons-compress - 1.4.1 + 1.5 xz @@ -356,11 +325,6 @@ commons-fileupload 1.2.2 - - commons-httpclient - commons-httpclient - 3.1 - commons-io commons-io @@ -379,12 +343,12 @@ commons-logging commons-logging - 1.1.1 + 1.1.3 org.apache.pdfbox fontbox - 1.7.1 + 1.8.2 org.apache.geronimo.specs @@ -394,7 +358,7 @@ com.google.guava guava - r05 + 13.0.1 org.htmlparser @@ -404,20 +368,17 @@ org.apache.httpcomponents httpclient - 4.2.2 - jar + 4.3.1 org.apache.httpcomponents httpcore - 4.2.3 - jar + 4.3 org.apache.httpcomponents httpmime - 4.2.2 - jar + 4.3.1 com.ibm.icu @@ -452,7 +413,7 @@ org.apache.pdfbox jempbox - 1.7.1 + 1.8.2 com.hp.hpl.jena @@ -465,21 +426,10 @@ - - org.mortbay.jetty - jetty - 6.1.26-patched-JETTY-1340 - - - org.mortbay.jetty - jetty-util - 6.1.26-patched-JETTY-1340 - com.jcraft jsch 0.1.42 - jar com.googlecode.json-simple @@ -489,13 +439,12 @@ org.jsoup jsoup - 1.6.3 + 1.7.2 log4j log4j - 1.2.16 - jar + 1.2.17 org.slf4j @@ -505,58 +454,57 @@ org.apache.lucene lucene-analyzers-common - 4.0.0 + ${solr.version} org.apache.lucene lucene-analyzers-phonetic - 4.0.0 + ${solr.version} org.apache.lucene lucene-core - 4.0.0 - jar + ${solr.version} org.apache.lucene lucene-grouping - 4.0.0 + ${solr.version} org.apache.lucene lucene-highlighter - 4.0.0 + ${solr.version} org.apache.lucene lucene-memory - 4.0.0 + ${solr.version} org.apache.lucene lucene-misc - 4.0.0 + ${solr.version} org.apache.lucene lucene-queries - 4.0.0 + ${solr.version} org.apache.lucene lucene-spatial - 4.0.0 + ${solr.version} org.apache.lucene lucene-suggest - 4.0.0 + ${solr.version} com.drewnoakes metadata-extractor - 2.4.0-beta-1 + 2.6.2 mysql @@ -566,8 +514,7 @@ org.apache.pdfbox pdfbox - 1.7.1 - jar + 1.8.2 org.apache.poi @@ -585,10 +532,12 @@ 2.0.1 - javax.servlet - servlet-api - 2.5 - + org.eclipse.jetty.orbit + javax.servlet + 3.0.0.v201112011016 + compile + jar + org.slf4j slf4j-api @@ -602,19 +551,67 @@ org.apache.solr solr-solrj - 4.0.0 - jar + ${solr.version} org.apache.solr solr-core - 4.0.0 - jar + ${solr.version} + + + org.eclipse.jetty + jetty-client + 8.1.13.v20130916 + + + org.eclipse.jetty + jetty-util + 8.1.13.v20130916 + + + org.eclipse.jetty + jetty-server + 8.1.13.v20130916 + + + org.eclipse.jetty + jetty-servlet + 8.1.13.v20130916 + + org.eclipse.jetty + jetty-servlets + 8.1.13.v20130916 + + + org.eclipse.jetty + jetty-io + 8.1.13.v20130916 + + + org.eclipse.jetty + jetty-continuation + 8.1.13.v20130916 + + + org.eclipse.jetty + jetty-security + 8.1.13.v20130916 + + + org.eclipse.jetty + jetty-http + 8.1.13.v20130916 + + + org.eclipse.jetty + jetty-xml + 8.1.13.v20130916 + org.codehaus.woodstox wstx-asl - 3.2.7 + 3.2.9 xerces @@ -634,20 +631,6 @@ webcat 0.1 - - net.yacy.extlib - domaingraph - 0135 - - - - org.osgi - org.osgi.core - 4.1.0 - jar - +