Mercurial > hg > digilib

comparison servlet/pom.xml @ 1669:078bf3d13f5c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge branch 'master' into release-2.5 Conflicts: common/src/main/java/digilib/conf/DigilibConfiguration.java webapp/src/main/webapp/jquery/jquery.digilib.js
author Robert Casties <r0bcas7@gmail.com>
date Thu, 23 Nov 2017 18:41:50 +0100
parents cf9dcddf4ec6 254167aef851
children 0268cfc402fa
comparison
equal deleted inserted replaced
1661:cf9dcddf4ec6 1669:078bf3d13f5c
25 <version>2.4</version> 25 <version>2.4</version>
26 <type>jar</type> 26 <type>jar</type>
27 <scope>provided</scope> 27 <scope>provided</scope>
28 </dependency> 28 </dependency>
29 <dependency> 29 <dependency>
30 <!-- implementation of JWT JOSE specification -->
30 <groupId>org.bitbucket.b_c</groupId> 31 <groupId>org.bitbucket.b_c</groupId>
31 <artifactId>jose4j</artifactId> 32 <artifactId>jose4j</artifactId>
32 <version>0.5.0</version> 33 <version>0.5.0</version>
33 </dependency> 34 </dependency>
35 <dependency>
36 <groupId>javax.json</groupId>
37 <artifactId>javax.json-api</artifactId>
38 <version>1.0</version>
39 </dependency>
40 <dependency>
41 <groupId>org.glassfish</groupId>
42 <artifactId>javax.json</artifactId>
43 <version>1.0.4</version>
44 </dependency>
34 </dependencies> 45 </dependencies>
35 </project> 46 </project>