Skip to content

Commit

Permalink
fixed javadoc
Browse files Browse the repository at this point in the history
  • Loading branch information
@datazuul
datazuul committed Jul 19, 2016
1 parent 9f29efc commit 32dcd62
Show file tree
Hide file tree
Showing 3 changed files with 166 additions and 18 deletions.
178 changes: 163 additions & 15 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,33 +3,67 @@
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>

<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.2.6.RELEASE</version>
</parent>

<groupId>de.digitalcollections</groupId>
<artifactId>iiif-server-demo</artifactId>
<version>0-SNAPSHOT</version>
<packaging>jar</packaging>

<name>IIIF: IIIF Server Demo</name>
<description>A standalone IIIF server demonstrating the use of IIIF Image API Java Libraries (https://github.com/dbmdz/iiif-image-api) and IIIF Presentation API Java Libraries (https://github.com/dbmdz/iiif-presentation-api) (Java implementations of the IIIF specifications: http://iiif.io/technical-details/).</description>
<url>https://github.com/dbmdz/iiif-server-demo</url>
<licenses>
<license>
<name>MIT License</name>
<url>https://github.com/dbmdz/iiif-image-api/blob/master/LICENSE</url>
<distribution>repo</distribution>
</license>
</licenses>
<developers>
<developer>
<name>Ralf Eichinger</name>
<email>ralf.eichinger@gmail.com</email>
<id>datazuul</id>
</developer>
</developers>
<ciManagement>
<url>https://travis-ci.org/dbmdz/iiif-server-demo</url>
<system>Travis CI</system>
</ciManagement>
<issueManagement>
<url>https://github.com/dbmdz/iiif-server-demo/issues</url>
<system>GitHub Issues</system>
</issueManagement>
<scm>
<connection>https://github.com/dbmdz/iiif-server-demo.git</connection>
<developerConnection>git@github.com:dbmdz/iiif-server-demo.git</developerConnection>
<url>https://github.com/dbmdz/iiif-server-demo</url>
</scm>

<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.2.6.RELEASE</version>
</parent>

<properties>
<java.version>1.8</java.version>
<version.iiif-image>2.0.0</version.iiif-image>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<version.iiif-image>2.0.1</version.iiif-image>
<version.iiif-presentation>2.0.0</version.iiif-presentation>
<version.jacoco-maven-plugin>0.7.4.201502262128</version.jacoco-maven-plugin>
<version.maven-compiler-plugin>3.3</version.maven-compiler-plugin>
<version.maven-gpg-plugin>1.6</version.maven-gpg-plugin>
<version.maven-javadoc-plugin>2.10.4</version.maven-javadoc-plugin>
<version.maven-source-plugin>3.0.1</version.maven-source-plugin>
<version.maven-surefire-plugin>2.19.1</version.maven-surefire-plugin>
<version.nexus-staging-maven-plugin>1.6.7</version.nexus-staging-maven-plugin>
<version.slf4j>1.7.13</version.slf4j>
<version.versions-maven-plugin>2.2</version.versions-maven-plugin>
</properties>

<dependencies>
<dependency>
<groupId>com.twelvemonkeys.servlet</groupId>
<artifactId>servlet</artifactId>
<version>3.1.2</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>de.digitalcollections</groupId>
<artifactId>iiif-image-backend-impl</artifactId>
Expand All @@ -46,7 +80,7 @@
<groupId>de.digitalcollections</groupId>
<artifactId>iiif-image-frontend-impl-springmvc</artifactId>
<version>${version.iiif-image}</version>
<scope>runtime</scope>
<scope>compile</scope> <!-- not runtime, because of twelvemonkeys IIOProviderContextListener in WebappInitializer... -->
</dependency>
<dependency>
<groupId>de.digitalcollections</groupId>
Expand Down Expand Up @@ -113,6 +147,120 @@ The Spring Boot Maven plugin provides many convenient features:
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${version.maven-compiler-plugin}</version>
<configuration>
<showDeprecation>true</showDeprecation>
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>${version.maven-source-plugin}</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${version.maven-javadoc-plugin}</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${version.maven-surefire-plugin}</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>${version.versions-maven-plugin}</version>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>${version.jacoco-maven-plugin}</version>
<executions>
<execution>
<id>pre-unit-test</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<phase>test</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
</executions>
<configuration>
<excludes>
<exclude>**/SpringConfig*</exclude>
</excludes>
</configuration>
</plugin>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>${version.nexus-staging-maven-plugin}</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
<autoReleaseAfterClose>true</autoReleaseAfterClose>
</configuration>
</plugin>
</plugins>
</build>

<reporting>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>${version.jacoco-maven-plugin}</version>
</plugin>
</plugins>
</reporting>

<profiles>
<profile>
<id>deploy</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>${version.maven-gpg-plugin}</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
4 changes: 2 additions & 2 deletions src/main/java/de/digitalcollections/iiif/serverdemo/Application.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
import org.springframework.context.ApplicationContext;

/**
* Demo IIIF Server (see https://spring.io/guides/gs/spring-boot/)<br/>
* Run: mvn package && java -jar target/iiif-server-demo.jar
* Demo IIIF Server (see https://spring.io/guides/gs/spring-boot/)<br>
* Run: mvn package &amp;&amp; java -jar target/iiif-server-demo.jar
*/
@SpringBootApplication
/*
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/de/digitalcollections/iiif/serverdemo/config/SpringConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public void setEnvironment(Environment environment) {
}

/**
* Create a resource bundle for your messages ("messages.properties").<br/>
* Create a resource bundle for your messages ("messages.properties").<br>
* This file goes in src/main/resources because you want it to appear at the root of the classpath on deployment.
*
* @return message source
Expand Down

0 comments on commit 32dcd62

Please sign in to comment.