Skip to content
Snippets Groups Projects
Unverified Commit 8c64a4fa authored by Timm Fitschen's avatar Timm Fitschen
Browse files

MAINT: pom.xml, changed execution of exec plugin

parent cd428240
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
makefile
+ 5
− 5
View file @ 8c64a4fa
...@@ -24,19 +24,19 @@ ...@@ -24,19 +24,19 @@
SHELL:=/bin/bash SHELL:=/bin/bash
runserver: runserver:
mvn exec:exec mvn exec:java
run: compile run: compile
mvn exec:exec mvn exec:java
run-debug: compile run-debug: compile
mvn exec:exec -Dexec.args="-classpath %classpath -Djava.util.logging.config.file=./conf/core/logging.conf caosdb.server.CaosDBServer silent debug" mvn exec:java -Dexec.args="silent debug"
compile: easy-units compile: easy-units
mvn compile mvn compile
run-nobackend: run-nobackend: compile
mvn exec:exec -Dexec.args="-classpath %classpath -Djava.util.logging.config.file=./conf/core/logging.conf caosdb.server.CaosDBServer silent debug nobackend insecure" mvn exec:java -Dexec.args="silent debug nobackend insecure"
start-portforwarding: start-portforwarding:
sudo iptables -t nat -N CAOSDB sudo iptables -t nat -N CAOSDB
......
pom.xml
+ 64
− 63
View file @ 8c64a4fa
<?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
* ** header v3.0 * ** header v3.0
* This file is a part of the CaosDB Project. * This file is a part of the CaosDB Project.
...@@ -20,22 +21,17 @@ ...@@ -20,22 +21,17 @@
* *
* ** end header * ** end header
--> -->
<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/xsd/maven-4.0.0.xsd">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>bmp.ds.mpg.de</groupId> <groupId>bmp.ds.mpg.de</groupId>
<artifactId>caosdb-server</artifactId> <artifactId>caosdb-server</artifactId>
<version>0.1-SNAPSHOT</version> <version>0.1-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>CaosDB Server</name> <name>CaosDB Server</name>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.testSourceDirectory>src/test/java</project.build.testSourceDirectory> <project.build.testSourceDirectory>src/test/java</project.build.testSourceDirectory>
</properties> </properties>
<repositories> <repositories>
<repository> <repository>
<id>maven-central</id> <id>maven-central</id>
...@@ -48,31 +44,30 @@ ...@@ -48,31 +44,30 @@
<url>http://maven.restlet.com</url> <url>http://maven.restlet.com</url>
</repository> </repository>
<repository> <repository>
<id>local-maven-repo</id> <id>local-maven-repo</id>
<url>file:///${project.basedir}/.m2-local</url> <url>file:///${project.basedir}/.m2-local</url>
</repository> </repository>
</repositories> </repositories>
<dependencies> <dependencies>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.8.0-beta2</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.8.0-beta2</version>
</dependency>
<dependency> <dependency>
<groupId>de.timmfitschen</groupId> <groupId>org.slf4j</groupId>
<artifactId>easy-units</artifactId> <artifactId>slf4j-api</artifactId>
<version>0.0.1-SNAPSHOT</version> <version>1.8.0-beta2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.shiro</groupId> <groupId>org.slf4j</groupId>
<artifactId>shiro-core</artifactId> <artifactId>slf4j-simple</artifactId>
<version>1.3.2</version> <version>1.8.0-beta2</version>
</dependency>
<dependency>
<groupId>de.timmfitschen</groupId>
<artifactId>easy-units</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-core</artifactId>
<version>1.3.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
...@@ -126,45 +121,42 @@ ...@@ -126,45 +121,42 @@
<version>4.7.2</version> <version>4.7.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.restlet.jse</groupId> <groupId>org.restlet.jse</groupId>
<artifactId>org.restlet.ext.jetty</artifactId> <artifactId>org.restlet.ext.jetty</artifactId>
<version>2.3.12</version> <version>2.3.12</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-math</artifactId> <artifactId>commons-math</artifactId>
<version>2.2</version> <version>2.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.sun.mail</groupId> <groupId>com.sun.mail</groupId>
<artifactId>javax.mail</artifactId> <artifactId>javax.mail</artifactId>
<version>1.6.0-rc1</version> <version>1.6.0-rc1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-jcs-core</artifactId> <artifactId>commons-jcs-core</artifactId>
<version>2.1</version> <version>2.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.kohsuke</groupId> <groupId>org.kohsuke</groupId>
<artifactId>libpam4j</artifactId> <artifactId>libpam4j</artifactId>
<version>1.8</version> <version>1.8</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util-ajax</artifactId> <artifactId>jetty-util-ajax</artifactId>
<version>9.2.14.v20151106</version> <version>9.2.14.v20151106</version>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<sourceDirectory>${basedir}/src/main/java</sourceDirectory> <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
<scriptSourceDirectory>${basedir}/src/main/scripts</scriptSourceDirectory> <scriptSourceDirectory>${basedir}/src/main/scripts</scriptSourceDirectory>
<testSourceDirectory>${basedir}/src/test/java</testSourceDirectory> <testSourceDirectory>${basedir}/src/test/java</testSourceDirectory>
<outputDirectory>${basedir}/target/classes</outputDirectory> <outputDirectory>${basedir}/target/classes</outputDirectory>
<testOutputDirectory>${basedir}/target/test-classes</testOutputDirectory> <testOutputDirectory>${basedir}/target/test-classes</testOutputDirectory>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.antlr</groupId> <groupId>org.antlr</groupId>
...@@ -195,6 +187,7 @@ ...@@ -195,6 +187,7 @@
<configuration> <configuration>
<descriptorRefs> <descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef> <descriptorRef>jar-with-dependencies</descriptorRef>
<!-- <descriptorRef>project</descriptorRef> --> <!-- <descriptorRef>project</descriptorRef> -->
<!-- <descriptorRef>src</descriptorRef> --> <!-- <descriptorRef>src</descriptorRef> -->
</descriptorRefs> </descriptorRefs>
...@@ -210,24 +203,33 @@ ...@@ -210,24 +203,33 @@
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>2.22.0</version> <version>2.22.0</version>
<configuration> <configuration>
<includes> <includes>
<include>**/*.java</include> <include>**/*.java</include>
</includes> </includes>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId> <artifactId>exec-maven-plugin</artifactId>
<version>1.6.0</version> <version>1.6.0</version>
<executions>
<execution>
<goals>
<goal>java</goal>
</goals>
</execution>
</executions>
<configuration> <configuration>
<executable>java</executable> <mainClass>caosdb.server.CaosDBServer</mainClass>
<arguments> <arguments>
<argument>-classpath</argument> <argument>silent</argument>
<classpath/> </arguments>
<argument>-Djava.util.logging.config.file=./conf/core/logging.conf</argument> <systemProperties>
<argument>caosdb.server.CaosDBServer</argument> <systemProperty>
<argument>silent</argument> <key>java.util.loggin.config.file</key>
</arguments> <value>./conf/core/logging.conf</value>
</systemProperty>
</systemProperties>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
...@@ -235,15 +237,14 @@ ...@@ -235,15 +237,14 @@
<artifactId>fmt-maven-plugin</artifactId> <artifactId>fmt-maven-plugin</artifactId>
<version>2.5.1</version> <version>2.5.1</version>
<executions> <executions>
<execution> <execution>
<goals> <goals>
<goal>format</goal> <goal>format</goal>
</goals> </goals>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
<url>bmp.ds.mpg.de</url> <url>bmp.ds.mpg.de</url>
</project> </project>
src/main/java/caosdb/server/utils/FileUtils.java
+ 0
− 1
View file @ 8c64a4fa
...@@ -40,7 +40,6 @@ import java.io.IOException; ...@@ -40,7 +40,6 @@ import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.io.Reader; import java.io.Reader;
import java.nio.file.CopyOption;
import java.nio.file.StandardCopyOption; import java.nio.file.StandardCopyOption;
import java.security.MessageDigest; import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment