diff --git a/gemeinsamforschen/pom.xml b/gemeinsamforschen/pom.xml index 118c01043f448c8d8065fa6d17d43e9ff49f987a..bc7d93fbaa0895c499ca3c799f8701edd407905f 100644 --- a/gemeinsamforschen/pom.xml +++ b/gemeinsamforschen/pom.xml @@ -30,9 +30,9 @@ <dependencies> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.16</version> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + <version>2.11.0</version> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> @@ -105,6 +105,12 @@ <version>2.4.5</version> </dependency> + <dependency> + <groupId>com.fasterxml.jackson.jaxrs</groupId> + <artifactId>jackson-jaxrs-json-provider</artifactId> + <version>2.4.5</version> + </dependency> + <dependency> <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-xjc</artifactId> @@ -124,16 +130,7 @@ <version>3.0.1</version> <scope>provided</scope> </dependency> - <dependency> - <groupId>org.glassfish.jersey.containers</groupId> - <artifactId>jersey-container-grizzly2-servlet</artifactId> - <version>${jersey.version}</version> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.jaxrs</groupId> - <artifactId>jackson-jaxrs-json-provider</artifactId> - <version>2.9.5</version> - </dependency> + </dependencies> </project> \ No newline at end of file diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/communication/model/SampleAnswer.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/communication/model/SampleAnswer.java similarity index 88% rename from gemeinsamforschen/src/main/java/unipotsdam/gf/communication/model/SampleAnswer.java rename to gemeinsamforschen/src/main/java/unipotsdam/gf/modules/communication/model/SampleAnswer.java index 06243fbdd5f169de45d6f13e9b9d41f3a94c1b5c..6a34b213584abfc5fd149c488184250dfacf0303 100644 --- a/gemeinsamforschen/src/main/java/unipotsdam/gf/communication/model/SampleAnswer.java +++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/communication/model/SampleAnswer.java @@ -1,4 +1,4 @@ -package unipotsdam.gf.communication.model; +package unipotsdam.gf.modules.communication.model; public class SampleAnswer { diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/communication/service/SampleService.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/communication/service/SampleService.java similarity index 66% rename from gemeinsamforschen/src/main/java/unipotsdam/gf/communication/service/SampleService.java rename to gemeinsamforschen/src/main/java/unipotsdam/gf/modules/communication/service/SampleService.java index ee150d867ae69c2b06e9aed1614b5b12919fabc0..870b49db98d0a0b8434fc627ea23a9022c13d52b 100644 --- a/gemeinsamforschen/src/main/java/unipotsdam/gf/communication/service/SampleService.java +++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/communication/service/SampleService.java @@ -1,6 +1,6 @@ -package unipotsdam.gf.communication.service; +package unipotsdam.gf.modules.communication.service; -import unipotsdam.gf.communication.model.SampleAnswer; +import unipotsdam.gf.modules.communication.model.SampleAnswer; public class SampleService { diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/communication/view/SampleView.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/communication/view/SampleView.java similarity index 79% rename from gemeinsamforschen/src/main/java/unipotsdam/gf/communication/view/SampleView.java rename to gemeinsamforschen/src/main/java/unipotsdam/gf/modules/communication/view/SampleView.java index 6c89444315f388a03029b0d08c2e27bc3c6b44fc..e54f664db4177cdd62bb3aa58c6853c1a933ed13 100644 --- a/gemeinsamforschen/src/main/java/unipotsdam/gf/communication/view/SampleView.java +++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/communication/view/SampleView.java @@ -1,9 +1,9 @@ -package unipotsdam.gf.communication.view; +package unipotsdam.gf.modules.communication.view; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import unipotsdam.gf.communication.model.SampleAnswer; -import unipotsdam.gf.communication.service.SampleService; +import unipotsdam.gf.modules.communication.model.SampleAnswer; +import unipotsdam.gf.modules.communication.service.SampleService; import javax.ws.rs.GET; import javax.ws.rs.Path; diff --git a/gemeinsamforschen/src/test/java/unipotsdam/gf/communication/service/SampleServiceTest.java b/gemeinsamforschen/src/test/java/unipotsdam/gf/modules/communication/service/SampleServiceTest.java similarity index 75% rename from gemeinsamforschen/src/test/java/unipotsdam/gf/communication/service/SampleServiceTest.java rename to gemeinsamforschen/src/test/java/unipotsdam/gf/modules/communication/service/SampleServiceTest.java index d19745c81aebbb1b411c530cffcca45359e5a71d..e510a60cc1682b78b89721be660fe320cd093f51 100644 --- a/gemeinsamforschen/src/test/java/unipotsdam/gf/communication/service/SampleServiceTest.java +++ b/gemeinsamforschen/src/test/java/unipotsdam/gf/modules/communication/service/SampleServiceTest.java @@ -1,8 +1,8 @@ -package unipotsdam.gf.communication.service; +package unipotsdam.gf.modules.communication.service; import org.junit.Test; -import unipotsdam.gf.communication.model.SampleAnswer; +import unipotsdam.gf.modules.communication.model.SampleAnswer; import static org.junit.Assert.assertEquals;