Commit 805bedd2 authored by Franz Reischl's avatar Franz Reischl
Browse files

Merge branch 'master' into serverdev2

# Conflicts:
#	src/main/java/university/at/jku/ce/resource/StudentResource.java
parents abd1f7fe daf03281
......@@ -6,7 +6,7 @@
<groupId>university</groupId>
<artifactId>at.jku.ce</artifactId>
<packaging>war</packaging>
<version>1.1.0</version>
<version>1.2.0</version>
<name>at.jku.ce</name>
<build>
......@@ -27,6 +27,30 @@
<target>1.8</target>
</configuration>
</plugin>
<!-- Updating Git Submodule before package -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<inherited>false</inherited> <!-- only execute these in the parent -->
<executions>
<execution>
<id>git submodule update</id>
<phase>initialize</phase>
<configuration>
<executable>git</executable>
<arguments>
<argument>submodule</argument>
<argument>update</argument>
<argument>--recursive</argument>
<argument>--remote</argument>
</arguments>
</configuration>
<goals>
<goal>exec</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
......
......@@ -6,6 +6,7 @@ public class ExceptionParam {
protected static final String SERVER_ERROR="HTTP 500 Internal Server Error";
protected static final String DOKU="https://en.wikipedia.org/wiki/List_of_HTTP_status_codes";
protected static MediaType mediaType;
public static MediaType getMediaType() {
return mediaType;
}
......
Subproject commit 3aa4125b377b8de8a9330f8139ded46155e234c5
Subproject commit cf2367505bfaee364d10e55339610a9ed84bb16d
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment