Commit 1079e457 authored by Christian Reuschling's avatar Christian Reuschling
Browse files

now lucene stuff is managed by DynaQ and not by leechcrawler. We are

independent from leechcrawler regarding the lucene version now. | some
new migrations to several dependency versions
parent 5ca3df8e
target target
dynaq.keys dynaq.keys
.idea
dynaq.iml
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>dfki.km.dynaq</groupId> <groupId>dfki.sds.dynaq</groupId>
<artifactId>dynaq</artifactId> <artifactId>dynaq</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>2.4-SNAPSHOT</version> <version>2.5-SNAPSHOT</version>
<name>dynaq</name> <name>dynaq</name>
<url>http://dynaq.opendfki.de</url> <url>http://dynaq.opendfki.de</url>
...@@ -15,15 +15,15 @@ ...@@ -15,15 +15,15 @@
<developer> <developer>
<name>Christian Reuschling</name> <name>Christian Reuschling</name>
<email>reuschling@dfki.uni-kl.de</email> <email>reuschling@dfki.uni-kl.de</email>
<organization>DFKI, KnowledgeManagement</organization> <organization>DFKI, SDS department</organization>
<organizationUrl>http://www.dfki.de/web/forschung/km</organizationUrl> <organizationUrl>https://www.dfki.de/en/web/research/research-departments/smart-data-knowledge-services/</organizationUrl>
</developer> </developer>
</developers> </developers>
<properties> <properties>
<maven.compiler.source>1.7</maven.compiler.source> <maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target> <maven.compiler.target>1.7</maven.compiler.target>
<j2seVersion>1.7</j2seVersion> <!-- <j2seVersion>1.7</j2seVersion> -->
<maven.compiler.encoding>UTF-8</maven.compiler.encoding> <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
...@@ -42,7 +42,6 @@ ...@@ -42,7 +42,6 @@
<snapshotRepository> <snapshotRepository>
<id>artifactory-libs-snapshots-local</id> <id>artifactory-libs-snapshots-local</id>
<url>http://www.dfki.uni-kl.de/artifactory/libs-snapshots-local</url> <url>http://www.dfki.uni-kl.de/artifactory/libs-snapshots-local</url>
<uniqueVersion>false</uniqueVersion>
</snapshotRepository> </snapshotRepository>
</distributionManagement> </distributionManagement>
...@@ -83,11 +82,25 @@ ...@@ -83,11 +82,25 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<!-- <dependency>-->
<!-- <groupId>org.junit.jupiter</groupId>-->
<!-- <artifactId>junit-jupiter</artifactId>-->
<!-- <version>5.7.1</version>-->
<!-- <scope>test</scope>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.junit.vintage</groupId>-->
<!-- <artifactId>junit-vintage-engine</artifactId>-->
<!-- <version>5.7.1</version>-->
<!-- <scope>test</scope>-->
<!-- </dependency>-->
<!-- leechcrawler-->
<dependency> <dependency>
<groupId>de.dfki.km</groupId> <groupId>de.dfki.sds</groupId>
<artifactId>leechcrawler</artifactId> <artifactId>leechcrawler</artifactId>
<version>1.8</version> <version>1.25.1</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<artifactId>asm-debug-all</artifactId> <artifactId>asm-debug-all</artifactId>
...@@ -95,34 +108,38 @@ ...@@ -95,34 +108,38 @@
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.8.0</version>
</dependency>
<!-- leechcrawler-->
<dependency> <dependency>
<groupId>com.jgoodies</groupId> <groupId>com.jgoodies</groupId>
<artifactId>jgoodies-binding</artifactId> <artifactId>jgoodies-binding</artifactId>
<version>2.6.1</version> <version>2.6.1</version>
<!-- <version>2.13.0</version>-->
</dependency> </dependency>
<!-- <dependency> -->
<!-- <groupId>org.apache.lucene</groupId> -->
<!-- <artifactId>lucene-core</artifactId> -->
<!-- <version>3.5.0-dynaq-patched</version> -->
<!-- <version>3.5.0</version> -->
<!-- </dependency> -->
<!-- <dependency> -->
<!-- <groupId>org.apache.lucene</groupId> -->
<!-- <artifactId>lucene-analyzers</artifactId> -->
<!-- <version>3.5.0</version> -->
<!-- </dependency> -->
<!-- <dependency> --> <!-- <dependency>-->
<!-- <groupId>com.tangentum.phonetix</groupId> --> <!-- <groupId>com.google.code.gson</groupId>-->
<!-- <artifactId>phonetix</artifactId> --> <!-- <artifactId>gson</artifactId>-->
<!-- <version>0.2</version> --> <!-- <version>2.8.6</version>-->
<!-- </dependency> --> <!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>com.esotericsoftware</groupId>-->
<!-- <artifactId>kryo</artifactId>-->
<!-- <version>4.0.0</version>-->
<!-- </dependency>-->
<dependency> <dependency>
...@@ -180,23 +197,23 @@ ...@@ -180,23 +197,23 @@
<!-- <version>4.9.0</version> --> <!-- <version>4.9.0</version> -->
<!-- </dependency> --> <!-- </dependency> -->
<dependency> <!-- <dependency>-->
<groupId>de.dfki.km</groupId> <!-- <groupId>de.dfki.km</groupId>-->
<artifactId>inquisition</artifactId> <!-- <artifactId>inquisition</artifactId>-->
<version>23-SNAPSHOT</version> <!-- <version>23-SNAPSHOT</version>-->
</dependency> <!-- </dependency>-->
<dependency> <dependency>
<groupId>de.dfki.km</groupId> <groupId>de.dfki.sds</groupId>
<artifactId>kafka</artifactId> <artifactId>kafka</artifactId>
<version>23-SNAPSHOT</version> <version>1.3</version>
</dependency> </dependency>
<dependency> <!-- <dependency>-->
<groupId>de.dfki.km</groupId> <!-- <groupId>de.dfki.km</groupId>-->
<artifactId>thumbnailer</artifactId> <!-- <artifactId>thumbnailer</artifactId>-->
<version>23-SNAPSHOT</version> <!-- <version>23-SNAPSHOT</version>-->
</dependency> <!-- </dependency>-->
<!-- <dependency> --> <!-- <dependency> -->
<!-- <groupId>dfki.km.delight</groupId> --> <!-- <groupId>dfki.km.delight</groupId> -->
...@@ -312,30 +329,6 @@ ...@@ -312,30 +329,6 @@
<!-- <dependency> -->
<!-- <groupId>org.apache.mahout</groupId> -->
<!-- <artifactId>mahout-integration</artifactId> -->
<!-- <version>0.9</version> -->
<!-- </dependency> -->
<!-- <dependency> -->
<!-- <groupId>org.apache.mahout</groupId> -->
<!-- <artifactId>mahout-examples</artifactId> -->
<!-- <version>0.9</version> -->
<!-- </dependency> -->
<!-- <dependency> -->
<!-- <groupId>org.apache.lucene</groupId> -->
<!-- <artifactId>lucene-facet</artifactId> -->
<!-- <version>4.9.0</version> -->
<!-- </dependency> -->
</dependencies> </dependencies>
...@@ -344,17 +337,6 @@ ...@@ -344,17 +337,6 @@
<!-- dummy for buildnumber plugin -->
<scm>
<connection>scm:svn:http://127.0.0.1/dummy</connection>
<developerConnection>scm:svn:https://127.0.0.1/dummy</developerConnection>
<tag>HEAD</tag>
<url>http://127.0.0.1/dummy</url>
</scm>
<build> <build>
...@@ -364,14 +346,14 @@ ...@@ -364,14 +346,14 @@
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>appassembler-maven-plugin</artifactId> <artifactId>appassembler-maven-plugin</artifactId>
<version>1.10</version> <version>2.1.0</version>
<configuration> <configuration>
<assembleDirectory>${project.build.directory}/assembleDir</assembleDirectory> <assembleDirectory>${project.build.directory}/assembleDir</assembleDirectory>
<extraJvmArguments>-Xmx2G</extraJvmArguments> <extraJvmArguments>-Xmx2G --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.desktop/sun.awt.dnd=ALL-UNNAMED</extraJvmArguments>
<binFolder>bin</binFolder> <binFolder>/bin</binFolder>
<repositoryName>lib</repositoryName> <repositoryName>lib</repositoryName>
<repositoryLayout>flat</repositoryLayout> <repositoryLayout>flat</repositoryLayout>
<useAsterikClassPath>true</useAsterikClassPath> <useWildcardClassPath>true</useWildcardClassPath>
<projectArtifactFirstInClassPath>true</projectArtifactFirstInClassPath> <projectArtifactFirstInClassPath>true</projectArtifactFirstInClassPath>
...@@ -409,13 +391,13 @@ ...@@ -409,13 +391,13 @@
<plugin> <!-- <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>webstart-maven-plugin</artifactId> <artifactId>webstart-maven-plugin</artifactId>
<executions> <executions>
<execution> <execution>
<goals> <goals>
<goal>jnlp-inline</goal> <!-- use jnlp, jnlp-inline or jnlp-single as appropriate --> <goal>jnlp-inline</goal>
</goals> </goals>
</execution> </execution>
</executions> </executions>
...@@ -432,58 +414,38 @@ ...@@ -432,58 +414,38 @@
<jnlp> <jnlp>
<inputTemplateResourcePath>${project.basedir}</inputTemplateResourcePath> <inputTemplateResourcePath>${project.basedir}</inputTemplateResourcePath>
<inputTemplate>src/main/jnlp/template.vm</inputTemplate> <!--relative to inputTemplateResourcePath --> <inputTemplate>src/main/jnlp/template.vm</inputTemplate>
<outputFile>launch.jnlp</outputFile> <outputFile>launch.jnlp</outputFile>
<mainClass>org.dynaq.DynaQ</mainClass> <mainClass>org.dynaq.DynaQ</mainClass>
</jnlp> </jnlp>
<sign> <sign>
<keystore>keystore</keystore> <keystore>keystore</keystore>
<keypass>keypass</keypass> <!-- we need to override passwords easily from the command line. ${keypass} --> <keypass>keypass</keypass>
<storepass>storepass</storepass> <!-- ${storepass} --> <storepass>storepass</storepass>
<alias>dynaq_sign</alias> <alias>dynaq_sign</alias>
<validity>3650</validity> <validity>3650</validity>
<dnameCn>dynaq.opendfki.de</dnameCn> <dnameCn>dynaq.opendfki.de</dnameCn>
<dnameOu>Knowledge Managment</dnameOu> <dnameOu>SDS/dnameOu>
<dnameO>DFKI GmbH</dnameO> <dnameO>DFKI GmbH</dnameO>
<dnameL>Rhineland Palatinate</dnameL> <dnameL>Rhineland Palatinate</dnameL>
<dnameSt>Kaiserslautern</dnameSt> <dnameSt>Kaiserslautern</dnameSt>
<dnameC>Germany</dnameC> <dnameC>Germany</dnameC>
<verify>true</verify> <!-- verify that the signing operation succeeded --> <verify>true</verify>
<keystoreConfig> <keystoreConfig>
<delete>false</delete> <!-- delete the keystore --> <delete>false</delete>
<gen>true</gen> <!-- optional shortcut to generate the store. --> <gen>true</gen>
</keystoreConfig> </keystoreConfig>
</sign> </sign>
</configuration> </configuration>
</plugin> </plugin> -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
<version>1.1</version>
<executions>
<execution>
<phase>validate</phase>
<goals>
<goal>create</goal>
</goals>
</execution>
</executions>
<configuration>
<doCheck>false</doCheck>
<doUpdate>false</doUpdate>
<revisionOnScmFailure>unknownbuild</revisionOnScmFailure>
</configuration>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
...@@ -491,13 +453,26 @@ ...@@ -491,13 +453,26 @@
<configuration> <configuration>
<archive> <archive>
<manifestEntries> <manifestEntries>
<SCM-Revision>${buildNumber}</SCM-Revision>
<Buildtime>${maven.build.timestamp}</Buildtime> <Buildtime>${maven.build.timestamp}</Buildtime>
</manifestEntries> </manifestEntries>
</archive> </archive>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins> </plugins>
...@@ -505,56 +480,20 @@ ...@@ -505,56 +480,20 @@
<pluginManagement> <pluginManagement>
<!-- NOTE: plugins are not automatically added to lifecycle unless stated
in an <plugin> element. -->
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version> <version>3.8.1</version>
<configuration> <configuration>
<source>${maven.compiler.source}</source> <source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target> <target>${maven.compiler.target}</target>
<encoding>${maven.compiler.encoding}</encoding> <encoding>${maven.compiler.encoding}</encoding>
<compilerArgs>
<arg>-parameters</arg>
</compilerArgs>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.5</version>
<configuration>
<encoding>${maven.compiler.encoding}</encoding>
<quiet>true</quiet>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>2.5</version>
<configuration>
<encoding>${maven.compiler.encoding}</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.1.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.5</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>2.3.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.2</version>
</plugin>
<plugin> <plugin>
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
...@@ -572,95 +511,14 @@ ...@@ -572,95 +511,14 @@
<profiles> <profiles>
<profile>
<!-- Profile enables generation of additional javadoc files. Activate
profile with -Pjavadoc. -->
<id>javadoc</id>
<activation>
<activeByDefault>true</activeByDefault>
<property>
<name>javadoc</name>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
<id>javadoc-jar</id>
<phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.5</version>
<reportSets>
<reportSet>
<id>javadoc</id>
<configuration>
<goal>aggregate-jar</goal>
</configuration>
</reportSet>
</reportSets>
</plugin>
</plugins>
</reporting>
</profile>
<profile> <profile>
<!-- Creates a additional source jar. Active by default. Must be activated <id>disable-java8-doclint</id>
if package-binsrc is activated. -->
<id>package-source</id>
<activation> <activation>
<activeByDefault>true</activeByDefault> <jdk>[1.8,)</jdk>
<property>
<name>package-source</name>
</property>
</activation> </activation>
<properties>
<build> <additionalparam>-Xdoclint:none</additionalparam>
<plugins> </properties>
<plugin>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<id>package-source-jar</id>
<phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>package-project</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.3</version>
</plugin>
</plugins>
</build>
</profile> </profile>
......
...@@ -19,9 +19,9 @@ import org.apache.lucene.store.NativeFSLockFactory; ...@@ -19,9 +19,9 @@ import org.apache.lucene.store.NativeFSLockFactory;
import org.kafkaRCP.core.KafkaRCPConstants; import org.kafkaRCP.core.KafkaRCPConstants;
import org.kafkaRCP.ui.KafkaRCP; import org.kafkaRCP.ui.KafkaRCP;
import de.dfki.inquisition.exceptions.ExceptionUtils; import de.dfki.inquisitor.exceptions.ExceptionUtils;
import de.dfki.inquisition.file.FileUtils; import de.dfki.inquisitor.file.FileUtilz;
import de.dfki.inquisition.resources.ResourceUtilz; import de.dfki.inquisitor.resources.ResourceUtilz;
...@@ -121,7 +121,7 @@ public class DynaQ ...@@ -121,7 +121,7 @@ public class DynaQ
if(bLogConfig) if(bLogConfig)
{ {
File fLogProps = new File(KafkaRCPConstants.addKafkaBaseDir2RelativePath("config/logging.properties")); File fLogProps = new File(KafkaRCPConstants.addKafkaBaseDir2RelativePath("config/logging.properties"));
if(!fLogProps.exists()) FileUtils.copyFile(new File(fLogProps.getAbsolutePath() + ".reference"), fLogProps); if(!fLogProps.exists()) FileUtilz.copyFile(new File(fLogProps.getAbsolutePath() + ".reference"), fLogProps);
LogManager.getLogManager().readConfiguration(new FileInputStream(fLogProps)); LogManager.getLogManager().readConfiguration(new FileInputStream(fLogProps));
System.setProperty("java.util.logging.config.file", fLogProps.getAbsolutePath()); System.setProperty("java.util.logging.config.file", fLogProps.getAbsolutePath());
}