diff --git a/libbuild/java-templates/net/yacy/peers/operation/yacyBuildProperties.java b/libbuild/java-templates/net/yacy/peers/operation/yacyBuildProperties.java deleted file mode 100644 index ad8477102..000000000 --- a/libbuild/java-templates/net/yacy/peers/operation/yacyBuildProperties.java +++ /dev/null @@ -1,78 +0,0 @@ -package net.yacy.peers.operation; - -import java.util.Locale; -import java.util.regex.Pattern; -/** - * Attention: this is a template file (a 1:1 copy of net/yacy/peers/operation/yacyBuildProperties.java - * to produce a genrated source filtered by the Maven build to replace the placeholder variables (like "@REPL_REVISION_NR@") - * with current build values. - * - */ - - -/** - * Properties set when compiling this release/version - */ -public final class yacyBuildProperties { - private yacyBuildProperties() { - } - - /** - * returns the SVN-Revision Number as a String - */ - public static String getSVNRevision() { - final String revision = "@REPL_REVISION_NR@"; - if (revision.contains("@") || revision.contains("$")) { - return "0"; - } - return revision; - } - - /** - * returns the version String (e. g. 0.9) - */ - public static String getVersion() { - if ("@REPL_VERSION@".contains("@") ) { - return "0.1"; - } - return "@REPL_VERSION@"; - } - - public static final Pattern versionMatcher = Pattern.compile("\\A(\\d+\\.\\d{1,3})(\\d{0,5})\\z"); - - /** - * returns the long version String (e. g. 0.9106712) - */ - public static String getLongVersion() { - return String.format(Locale.US, "%.3f%05d", Float.valueOf(getVersion()), Integer.valueOf(getSVNRevision())); - } - - /** - * returns the date, when this release was build - */ - public static String getBuildDate() { - if ("@REPL_DATE@".contains("@")) { - return "19700101"; - } - return "@REPL_DATE@"; - } - - /** - * determines, if this release was compiled and installed - * by a package manager - */ - public static boolean isPkgManager() { - return "@REPL_PKGMANAGER@".equals("true"); - } - - /** - * returns command to use to restart the YaCy daemon, - * when YaCy was installed with a packagemanger - */ - public static String getRestartCmd() { - if ("@REPL_RESTARTCMD@".contains("@")) { - return "echo 'error'"; - } - return "@REPL_RESTARTCMD@"; - } -} diff --git a/pom.xml b/pom.xml index c62286bb5..bbed79076 100644 --- a/pom.xml +++ b/pom.xml @@ -69,15 +69,15 @@ - **/net/yacy/peers/operation/yacyBuildProperties.java - + net/yacy/peers/operation/*.java + ${maven.compiler.source} ${maven.compiler.target} @@ -196,28 +196,21 @@ filter-sources - - - ${basedir}/libbuild/java-templates - ${project.build.directory}/generated-sources + + + ${basedir}/source/net/yacy/peers/operation + ${project.build.directory}/generated-sources/java/net/yacy/peers/operation - - org.apache.maven.plugins - maven-dependency-plugin - 2.6 - - - generate-resources - - build-classpath - - - - @@ -321,12 +316,14 @@ org.apache.commons commons-compress 1.5 + commons-fileupload @@ -398,11 +395,6 @@ iri 0.8 - - ant - ant-jakarta-oro - 1.6.1 - org jaudiotagger @@ -426,7 +418,7 @@ com.hp.hpl.jena jena - 2.6.4 + 2.6.4 slf4j-log4j12 @@ -442,7 +434,7 @@ com.googlecode.json-simple json-simple - 1.1 + 1.1.1 org.jsoup @@ -519,6 +511,11 @@ mysql-connector-java 5.1.12 + + oro + oro + 2.0.8 + org.apache.pdfbox pdfbox @@ -544,7 +541,6 @@ javax.servlet 3.0.0.v201112011016 compile - jar org.slf4j