Skip to content
Snippets Groups Projects
Commit 4c0d311f authored by Antoine Rey's avatar Antoine Rey
Browse files

Merge pull request #106 from trepel/dandelionupdate

Update of Dandelion to 1.1.1
parents 5e11b4bb 63d8f121
No related branches found
No related tags found
No related merge requests found
...@@ -39,7 +39,8 @@ ...@@ -39,7 +39,8 @@
<webjars-bootstrap.version>2.3.0</webjars-bootstrap.version> <webjars-bootstrap.version>2.3.0</webjars-bootstrap.version>
<webjars-jquery-ui.version>1.10.3</webjars-jquery-ui.version> <webjars-jquery-ui.version>1.10.3</webjars-jquery-ui.version>
<webjars-jquery.version>2.0.3-1</webjars-jquery.version> <webjars-jquery.version>2.0.3-1</webjars-jquery.version>
<dandelion.version>1.0.1</dandelion.version> <dandelion.version>1.1.1</dandelion.version>
<dandelion.datatables.version>1.1.0</dandelion.datatables.version>
<cobertura.version>2.7</cobertura.version> <cobertura.version>2.7</cobertura.version>
...@@ -260,13 +261,18 @@ ...@@ -260,13 +261,18 @@
<!-- Dandelion --> <!-- Dandelion -->
<dependency> <dependency>
<groupId>com.github.dandelion</groupId> <groupId>com.github.dandelion</groupId>
<artifactId>datatables-jsp</artifactId> <artifactId>dandelion-jsp</artifactId>
<version>${dandelion.version}</version> <version>${dandelion.version}</version>
</dependency> </dependency>
<dependency>
<groupId>com.github.dandelion</groupId>
<artifactId>datatables-jsp</artifactId>
<version>${dandelion.datatables.version}</version>
</dependency>
<dependency> <dependency>
<groupId>com.github.dandelion</groupId> <groupId>com.github.dandelion</groupId>
<artifactId>datatables-export-itext</artifactId> <artifactId>datatables-export-itext</artifactId>
<version>${dandelion.version}</version> <version>${dandelion.datatables.version}</version>
</dependency> </dependency>
<!-- temporary fix: below dependency should not be necessary as it is a transitive dependency. <!-- temporary fix: below dependency should not be necessary as it is a transitive dependency.
For some reason we can't build the app unless it is a first level dependency --> For some reason we can't build the app unless it is a first level dependency -->
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment