Merge branch 'develop' into feature/theming

This commit is contained in:
Graham Triggs 2017-03-30 12:45:53 +01:00
commit 3a5b445571
3 changed files with 24 additions and 1 deletions

View file

@ -114,7 +114,7 @@
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.2.1</version>
<version>3.2.2</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>

View file

@ -64,4 +64,17 @@
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.vivoweb</groupId>
<artifactId>jena2tools</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>org.vivoweb</groupId>
<artifactId>jena3tools</artifactId>
<version>1.0</version>
</dependency>
</dependencies>
</project>

View file

@ -30,4 +30,14 @@
</includes>
</fileSet -->
</fileSets>
<dependencySets>
<dependencySet>
<includes>
<include>org.vivoweb:jena2tools:jar:*</include>
<include>org.vivoweb:jena3tools:jar:*</include>
</includes>
<outputDirectory>bin</outputDirectory>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
</dependencySet>
</dependencySets>
</assembly>