Mercurial > hg > digilib
annotate servlet/pom.xml @ 1660:75a74f7045b4
Merge branch 'master' into release-2.5
Conflicts:
common/src/main/java/digilib/conf/DigilibConfiguration.java
author | Robert Casties <r0bcas7@gmail.com> |
---|---|
date | Tue, 21 Nov 2017 15:18:31 +0100 |
parents | 392a149ed4d6 22dd14eccdc0 |
children | cf9dcddf4ec6 |
rev | line source |
---|---|
1169
888cdaf022fe
shuffling classes around: moved last servlet dependencies from common to new servlet module.
robcast
parents:
diff
changeset
|
1 <?xml version="1.0"?> |
888cdaf022fe
shuffling classes around: moved last servlet dependencies from common to new servlet module.
robcast
parents:
diff
changeset
|
2 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" |
888cdaf022fe
shuffling classes around: moved last servlet dependencies from common to new servlet module.
robcast
parents:
diff
changeset
|
3 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> |
888cdaf022fe
shuffling classes around: moved last servlet dependencies from common to new servlet module.
robcast
parents:
diff
changeset
|
4 <modelVersion>4.0.0</modelVersion> |
888cdaf022fe
shuffling classes around: moved last servlet dependencies from common to new servlet module.
robcast
parents:
diff
changeset
|
5 <parent> |
888cdaf022fe
shuffling classes around: moved last servlet dependencies from common to new servlet module.
robcast
parents:
diff
changeset
|
6 <groupId>digilib</groupId> |
888cdaf022fe
shuffling classes around: moved last servlet dependencies from common to new servlet module.
robcast
parents:
diff
changeset
|
7 <artifactId>digilib</artifactId> |
1629 | 8 <version>2.5.3</version> |
1169
888cdaf022fe
shuffling classes around: moved last servlet dependencies from common to new servlet module.
robcast
parents:
diff
changeset
|
9 </parent> |
888cdaf022fe
shuffling classes around: moved last servlet dependencies from common to new servlet module.
robcast
parents:
diff
changeset
|
10 <artifactId>digilib-servlet</artifactId> |
888cdaf022fe
shuffling classes around: moved last servlet dependencies from common to new servlet module.
robcast
parents:
diff
changeset
|
11 <name>digilib-servlet</name> |
1654
22dd14eccdc0
Change digilib project links to GitHub.
Robert Casties <r0bcas7@gmail.com>
parents:
1591
diff
changeset
|
12 <url>https://github.com/robcast/digilib</url> |
1169
888cdaf022fe
shuffling classes around: moved last servlet dependencies from common to new servlet module.
robcast
parents:
diff
changeset
|
13 <properties> |
888cdaf022fe
shuffling classes around: moved last servlet dependencies from common to new servlet module.
robcast
parents:
diff
changeset
|
14 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> |
888cdaf022fe
shuffling classes around: moved last servlet dependencies from common to new servlet module.
robcast
parents:
diff
changeset
|
15 </properties> |
888cdaf022fe
shuffling classes around: moved last servlet dependencies from common to new servlet module.
robcast
parents:
diff
changeset
|
16 <description>The Digital Image Library - common Servlet code</description> |
888cdaf022fe
shuffling classes around: moved last servlet dependencies from common to new servlet module.
robcast
parents:
diff
changeset
|
17 <dependencies> |
888cdaf022fe
shuffling classes around: moved last servlet dependencies from common to new servlet module.
robcast
parents:
diff
changeset
|
18 <dependency> |
888cdaf022fe
shuffling classes around: moved last servlet dependencies from common to new servlet module.
robcast
parents:
diff
changeset
|
19 <groupId>digilib</groupId> |
888cdaf022fe
shuffling classes around: moved last servlet dependencies from common to new servlet module.
robcast
parents:
diff
changeset
|
20 <artifactId>digilib-common</artifactId> |
888cdaf022fe
shuffling classes around: moved last servlet dependencies from common to new servlet module.
robcast
parents:
diff
changeset
|
21 </dependency> |
888cdaf022fe
shuffling classes around: moved last servlet dependencies from common to new servlet module.
robcast
parents:
diff
changeset
|
22 <dependency> |
888cdaf022fe
shuffling classes around: moved last servlet dependencies from common to new servlet module.
robcast
parents:
diff
changeset
|
23 <groupId>javax.servlet</groupId> |
888cdaf022fe
shuffling classes around: moved last servlet dependencies from common to new servlet module.
robcast
parents:
diff
changeset
|
24 <artifactId>servlet-api</artifactId> |
1422 | 25 <version>2.4</version> |
1169
888cdaf022fe
shuffling classes around: moved last servlet dependencies from common to new servlet module.
robcast
parents:
diff
changeset
|
26 <type>jar</type> |
888cdaf022fe
shuffling classes around: moved last servlet dependencies from common to new servlet module.
robcast
parents:
diff
changeset
|
27 <scope>provided</scope> |
888cdaf022fe
shuffling classes around: moved last servlet dependencies from common to new servlet module.
robcast
parents:
diff
changeset
|
28 </dependency> |
1499
31566778c251
new OpenID Connect authentication OpenIdAuthnOps works now!
robcast
parents:
1492
diff
changeset
|
29 <dependency> |
31566778c251
new OpenID Connect authentication OpenIdAuthnOps works now!
robcast
parents:
1492
diff
changeset
|
30 <groupId>org.bitbucket.b_c</groupId> |
31566778c251
new OpenID Connect authentication OpenIdAuthnOps works now!
robcast
parents:
1492
diff
changeset
|
31 <artifactId>jose4j</artifactId> |
31566778c251
new OpenID Connect authentication OpenIdAuthnOps works now!
robcast
parents:
1492
diff
changeset
|
32 <version>0.5.0</version> |
31566778c251
new OpenID Connect authentication OpenIdAuthnOps works now!
robcast
parents:
1492
diff
changeset
|
33 </dependency> |
1169
888cdaf022fe
shuffling classes around: moved last servlet dependencies from common to new servlet module.
robcast
parents:
diff
changeset
|
34 </dependencies> |
888cdaf022fe
shuffling classes around: moved last servlet dependencies from common to new servlet module.
robcast
parents:
diff
changeset
|
35 </project> |