Skip to content

Commit

Permalink
Updated version numbers to 2.5.4.
Browse files Browse the repository at this point in the history
  • Loading branch information
@robcast
robcast committed Nov 21, 2017
1 parent e3eeb05 commit 0937ccf
Show file tree
Hide file tree
Showing 15 changed files with 27 additions and 31 deletions.
2 changes: 1 addition & 1 deletion common-bioformats/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>digilib</artifactId>
<groupId>digilib</groupId>
<version>2.5.3</version>
<version>2.5.4</version>
<relativePath>..</relativePath>
</parent>
<artifactId>digilib-common-bioformats</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion common-imagej/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>digilib</artifactId>
<groupId>digilib</groupId>
<version>2.5.3</version>
<version>2.5.4</version>
<relativePath>..</relativePath>
</parent>
<artifactId>digilib-common-imagej</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion common-jai/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>digilib</artifactId>
<groupId>digilib</groupId>
<version>2.5.3</version>
<version>2.5.4</version>
<relativePath>..</relativePath>
</parent>
<artifactId>digilib-common-jai</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>digilib</artifactId>
<groupId>digilib</groupId>
<version>2.5.3</version>
<version>2.5.4</version>
</parent>

<artifactId>digilib-common</artifactId>
Expand Down
6 changes: 1 addition & 5 deletions common/src/main/java/digilib/conf/DigilibConfiguration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,7 @@ public class DigilibConfiguration extends ParameterMap {

/** digilib version */
public static String getClassVersion() {
<<<<<<< HEAD
return "2.5.3";
=======
return "2.5.4a";
>>>>>>> refs/heads/master
return "2.5.4";
}

/* non-static getVersion for Java inheritance */
Expand Down
2 changes: 1 addition & 1 deletion doc/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>digilib</groupId>
<artifactId>digilib</artifactId>
<version>2.5.3</version>
<version>2.5.4</version>
</parent>
<artifactId>digilib-doc</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion iiif-presentation/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>digilib</groupId>
<artifactId>digilib</artifactId>
<version>2.5.3</version>
<version>2.5.4</version>
</parent>
<artifactId>digilib-iiif-presentation</artifactId>
<name>digilib-iiif-presentation</name>
Expand Down
2 changes: 1 addition & 1 deletion pdf/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>digilib</artifactId>
<groupId>digilib</groupId>
<version>2.5.3</version>
<version>2.5.4</version>
</parent>
<artifactId>digilib-pdf</artifactId>
<name>digilib-pdf</name>
Expand Down
26 changes: 13 additions & 13 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<groupId>digilib</groupId>
<artifactId>digilib</artifactId>
<version>2.5.3</version>
<version>2.5.4</version>
<packaging>pom</packaging>

<name>digilib</name>
Expand Down Expand Up @@ -201,62 +201,62 @@
<dependency>
<groupId>digilib</groupId>
<artifactId>digilib-common</artifactId>
<version>2.5.3</version>
<version>2.5.4</version>
</dependency>
<dependency>
<groupId>digilib</groupId>
<artifactId>digilib-common-jai</artifactId>
<version>2.5.3</version>
<version>2.5.4</version>
</dependency>
<dependency>
<groupId>digilib</groupId>
<artifactId>digilib-common-imagej</artifactId>
<version>2.5.3</version>
<version>2.5.4</version>
</dependency>
<dependency>
<groupId>digilib</groupId>
<artifactId>digilib-common-bioformats</artifactId>
<version>2.5.3</version>
<version>2.5.4</version>
</dependency>
<dependency>
<groupId>digilib</groupId>
<artifactId>digilib-doc</artifactId>
<version>2.5.3</version>
<version>2.5.4</version>
</dependency>
<dependency>
<groupId>digilib</groupId>
<artifactId>digilib-pdf</artifactId>
<version>2.5.3</version>
<version>2.5.4</version>
</dependency>
<dependency>
<groupId>digilib</groupId>
<artifactId>digilib-text</artifactId>
<version>2.5.3</version>
<version>2.5.4</version>
</dependency>
<dependency>
<groupId>digilib</groupId>
<artifactId>digilib-iiif-presentation</artifactId>
<version>2.5.3</version>
<version>2.5.4</version>
</dependency>
<dependency>
<groupId>digilib</groupId>
<artifactId>digilib-servlet</artifactId>
<version>2.5.3</version>
<version>2.5.4</version>
</dependency>
<dependency>
<groupId>digilib</groupId>
<artifactId>digilib-servlet2</artifactId>
<version>2.5.3</version>
<version>2.5.4</version>
</dependency>
<dependency>
<groupId>digilib</groupId>
<artifactId>digilib-servlet3</artifactId>
<version>2.5.3</version>
<version>2.5.4</version>
</dependency>
<dependency>
<groupId>digilib</groupId>
<artifactId>digilib-webapp</artifactId>
<version>2.5.3</version>
<version>2.5.4</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand Down
2 changes: 1 addition & 1 deletion servlet/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>digilib</groupId>
<artifactId>digilib</artifactId>
<version>2.5.3</version>
<version>2.5.4</version>
</parent>
<artifactId>digilib-servlet</artifactId>
<name>digilib-servlet</name>
Expand Down
2 changes: 1 addition & 1 deletion servlet2/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>digilib</artifactId>
<groupId>digilib</groupId>
<version>2.5.3</version>
<version>2.5.4</version>
</parent>
<artifactId>digilib-servlet2</artifactId>
<name>digilib-servlet2</name>
Expand Down
2 changes: 1 addition & 1 deletion servlet3/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>digilib</artifactId>
<groupId>digilib</groupId>
<version>2.5.3</version>
<version>2.5.4</version>
</parent>
<artifactId>digilib-servlet3</artifactId>
<name>digilib-servlet3</name>
Expand Down
2 changes: 1 addition & 1 deletion text/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>digilib</artifactId>
<groupId>digilib</groupId>
<version>2.5.3</version>
<version>2.5.4</version>
</parent>
<artifactId>digilib-text</artifactId>
<name>digilib-text</name>
Expand Down
2 changes: 1 addition & 1 deletion webapp/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>digilib</artifactId>
<groupId>digilib</groupId>
<version>2.5.3</version>
<version>2.5.4</version>
</parent>
<artifactId>digilib-webapp</artifactId>
<name>digilib-webapp</name>
Expand Down
2 changes: 1 addition & 1 deletion webapp/src/main/webapp/jquery/jquery.digilib.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ function($) {

var defaults = {
// version of this script
'version' : 'jquery.digilib.js 2.5.3',
'version' : 'jquery.digilib.js 2.5.4',
// logo url
'logoUrl' : 'img/digilib-logo-text1.png',
// homepage url (behind logo)
Expand Down

0 comments on commit 0937ccf

Please sign in to comment.