Skip to content

Commit 42a2f4d

Browse files
committed
Merge branch 'develop'
2 parents c21ab6d + 33fd74b commit 42a2f4d

29 files changed

Lines changed: 2575 additions & 58 deletions

CHANGELOG.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,12 @@ Adheres to [Semantic Versioning](http://semver.org/).
44

55
---
66

7-
## 6.2.2 (TBD)
7+
## [6.3.0](https://github.com/ngageoint/geopackage-java/releases/tag/6.3.0) (04-18-2022)
88

9-
* TBD
9+
* geopackage-core version 6.3.0
10+
* OGC Related Tables Extension additional mappings methods
11+
* NGA Feature Style Extension additional style and icon row methods
12+
* Feature Style expanded pixel bounds
1013

1114
## [6.2.1](https://github.com/ngageoint/geopackage-java/releases/tag/6.2.1) (03-11-2022)
1215

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,13 +163,13 @@ geoPackage.close();
163163

164164
### Installation ###
165165

166-
Pull from the [Maven Central Repository](http://search.maven.org/#artifactdetails|mil.nga.geopackage|geopackage|6.2.1|jar) (JAR, POM, Source, Javadoc)
166+
Pull from the [Maven Central Repository](http://search.maven.org/#artifactdetails|mil.nga.geopackage|geopackage|6.3.0|jar) (JAR, POM, Source, Javadoc)
167167

168168
```xml
169169
<dependency>
170170
<groupId>mil.nga.geopackage</groupId>
171171
<artifactId>geopackage</artifactId>
172-
<version>6.2.1</version>
172+
<version>6.3.0</version>
173173
</dependency>
174174
```
175175

docs/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ <h2 class="project-tagline">by the National Geospatial-Intelligence Agency</h2>
1818
<a href="http://ngageoint.github.io/geopackage-java/docs/api/" class="btn">API</a>
1919
<a href="https://github.com/ngageoint/geopackage-java/zipball/master" class="btn">.zip</a>
2020
<a href="https://github.com/ngageoint/geopackage-java/tarball/master" class="btn">.tar.gz</a>
21-
<a href="http://search.maven.org/#artifactdetails|mil.nga.geopackage|geopackage|6.2.1|jar" class="btn">The Central Repository</a>
21+
<a href="http://search.maven.org/#artifactdetails|mil.nga.geopackage|geopackage|6.3.0|jar" class="btn">The Central Repository</a>
2222
</section>
2323

2424
<section class="main-content">

pom.xml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>mil.nga.geopackage</groupId>
55
<artifactId>geopackage</artifactId>
6-
<version>6.2.2</version>
6+
<version>6.3.0</version>
77
<packaging>jar</packaging>
88
<name>GeoPackage</name>
99
<url>https://github.com/ngageoint/geopackage-java</url>
@@ -46,7 +46,7 @@
4646
<dependency>
4747
<groupId>mil.nga.geopackage</groupId>
4848
<artifactId>geopackage-core</artifactId>
49-
<version>6.2.1</version>
49+
<version>6.3.0</version>
5050
<exclusions>
5151
<exclusion>
5252
<groupId>com.j256.ormlite</groupId>
@@ -89,8 +89,9 @@
8989
<finalName>${project.artifactId}-${project.version}-standalone</finalName>
9090
<plugins>
9191
<plugin>
92+
<groupId>org.apache.maven.plugins</groupId>
9293
<artifactId>maven-compiler-plugin</artifactId>
93-
<version>3.8.1</version>
94+
<version>3.10.1</version>
9495
<configuration>
9596
<source>11</source>
9697
<target>11</target>
@@ -99,7 +100,7 @@
99100
<plugin>
100101
<groupId>org.apache.maven.plugins</groupId>
101102
<artifactId>maven-shade-plugin</artifactId>
102-
<version>3.2.4</version>
103+
<version>3.3.0</version>
103104
<executions>
104105
<execution>
105106
<phase>package</phase>
@@ -155,7 +156,7 @@
155156
<plugin>
156157
<groupId>org.apache.maven.plugins</groupId>
157158
<artifactId>maven-javadoc-plugin</artifactId>
158-
<version>3.3.1</version>
159+
<version>3.3.2</version>
159160
<configuration>
160161
<links>
161162
<link>https://ngageoint.github.io/geopackage-core-java/docs/api/</link>
@@ -201,7 +202,7 @@
201202
<plugin>
202203
<groupId>org.sonatype.plugins</groupId>
203204
<artifactId>nexus-staging-maven-plugin</artifactId>
204-
<version>1.6.8</version>
205+
<version>1.6.12</version>
205206
<extensions>true</extensions>
206207
<configuration>
207208
<serverId>ossrh</serverId>

src/main/java/mil/nga/geopackage/attributes/AttributesDao.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public AttributesDao(String database, GeoPackageConnection db,
4545

4646
/**
4747
* {@inheritDoc}
48-
*
48+
* <p>
4949
* Not supported for Attributes
5050
*/
5151
@Override

src/main/java/mil/nga/geopackage/extension/coverage/CoverageData.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,9 @@
2525

2626
/**
2727
* Tiled Gridded Coverage Data, abstract Common Encoding, Extension
28-
*
29-
* http://docs.opengeospatial.org/is/17-066r1/17-066r1.html
28+
* <p>
29+
* <a href=
30+
* "http://docs.opengeospatial.org/is/17-066r1/17-066r1.html">http://docs.opengeospatial.org/is/17-066r1/17-066r1.html</a>
3031
*
3132
* @param <TImage>
3233
* image type

src/main/java/mil/nga/geopackage/extension/nga/index/FeatureTableIndex.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,9 @@
2525
* bounding box queries. This extension is required to provide an index
2626
* implementation when a SQLite version is used before SpatialLite support
2727
* (Android).
28-
*
29-
* http://ngageoint.github.io/GeoPackage/docs/extensions/geometry-index.html
28+
* <p>
29+
* <a href=
30+
* "http://ngageoint.github.io/GeoPackage/docs/extensions/geometry-index.html">http://ngageoint.github.io/GeoPackage/docs/extensions/geometry-index.html</a>
3031
*
3132
* @author osbornb
3233
* @since 1.1.0

src/main/java/mil/nga/geopackage/extension/nga/link/FeatureTileTableLinker.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@
1010
/**
1111
* Feature Tile Table linker, used to link feature and tile tables together when
1212
* the tiles represent the feature data
13-
*
14-
* http://ngageoint.github.io/GeoPackage/docs/extensions/feature-tile-link.html
13+
* <p>
14+
* <a href=
15+
* "http://ngageoint.github.io/GeoPackage/docs/extensions/feature-tile-link.html">http://ngageoint.github.io/GeoPackage/docs/extensions/feature-tile-link.html</a>
1516
*
1617
* @author osbornb
1718
* @since 1.1.7

src/main/java/mil/nga/geopackage/extension/nga/properties/PropertiesExtension.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
/**
99
* GeoPackage properties extension for defining GeoPackage specific properties,
1010
* attributes, and metadata
11-
*
12-
* http://ngageoint.github.io/GeoPackage/docs/extensions/properties.html
11+
* <p>
12+
* <a href=
13+
* "http://ngageoint.github.io/GeoPackage/docs/extensions/properties.html">http://ngageoint.github.io/GeoPackage/docs/extensions/properties.html</a>
1314
*
1415
* @author osbornb
1516
* @since 3.0.2
1617
*/
17-
public class PropertiesExtension
18-
extends
18+
public class PropertiesExtension extends
1919
PropertiesCoreExtension<GeoPackage, AttributesRow, AttributesResultSet, AttributesDao> {
2020

2121
/**

0 commit comments

Comments
 (0)