Skip to content

Commit

Permalink
Merge pull request #34 from pjreed/2.3-release
Browse files Browse the repository at this point in the history
Releasing version 2.3.
  • Loading branch information
pjreed authored Jun 20, 2016
2 parents 66392de + f2fee0b commit e88faa6
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 18 deletions.
16 changes: 8 additions & 8 deletions ATTRIBUTIONS.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ AspectJ 1.8.9
- License: EPL 1.0
- https://eclipse.org/aspectj/

Spring Framework 4.2.5
Spring Framework 4.3.0
- License: Apache 2.0
- http://projects.spring.io/spring-framework/

Expand Down Expand Up @@ -42,9 +42,13 @@ Logback 1.1.5
- License: LGPL 2.1
- http://logback.qos.ch/

HyperSQL 2.3.3
- License: BSD
- http://hsqldb.org/
H2 Database Engine 1.4.192
- License: EPL 1.0
- http://www.h2database.com/html/main.html

H2GIS 1.3.0
- License: LGPL 3.0
- http://www.h2gis.org/docs/home/

SLF4J 1.7.16
- License: MIT
Expand Down Expand Up @@ -78,10 +82,6 @@ Objenesis 2.1
- License: MIT
- http://objenesis.org/

MySQL Connector 6.0.2
- License: GPLv2
- https://dev.mysql.com/downloads/connector/j/

Apache Commons Codec 1.10
- License: Apache 2.0
- https://commons.apache.org/proper/commons-codec/
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Bag Database changelog

2.3-SNAPSHOT
2.3

- Updating the bag reader library to 1.5 to handle errors better
- Using Liquibase to handle database versioning and migration
Expand Down
8 changes: 2 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ variables to see what's been changed or added.

The bag database can run standalone in order to demonstrate its functionality, but
if you do so it will have to rebuild the database every time it restarts. Instead
you should link it to an external database. MySQL and PostgreSQL are supported;
PostgreSQL is preferred.
you should link it to an external database. PostgreSQL with PostGIS extensions is
the only supported database.

To start a PostgreSQL container with PostGIS support:
```
Expand Down Expand Up @@ -111,10 +111,6 @@ Several volumes within the Docker container may be useful to mount externally:

The location which will be monitored for bag files.

##### `/root/.ros-bag-database/indexes`

The location in which the bag database stores its Lucene database indexes.

##### `/usr/local/tomcat/logs`

The location where Tomcat places its log files.
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<groupId>com.github.swri-robotics</groupId>
<artifactId>bag-database</artifactId>
<packaging>war</packaging>
<version>2.3-SNAPSHOT</version>
<version>2.3</version>
<name>Bag Database</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/application.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
app.version=2.3-SNAPSHOT
app.version=2.3
2 changes: 1 addition & 1 deletion src/main/webapp/resources/js/views/AboutWindow.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Ext.define('BagDatabase.views.AboutWindow', {
layout: 'fit',
bodyPadding: 5,
constrainHeader: true,
html: "<h2>Bag Database 2.3-SNAPSHOT</h2>" +
html: "<h2>Bag Database 2.3</h2>" +
"<p><a href='https://github.com/swri-robotics/bag-database'>https://github.com/swri-robotics/bag-database</a></p>" +
"<p>Copyright 2015-2016 Southwest Research Institute</p>" +
"<br>" +
Expand Down

0 comments on commit e88faa6

Please sign in to comment.