Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
bosborn committed Apr 18, 2022
2 parents c21ab6d + 33fd74b commit 42a2f4d
Show file tree
Hide file tree
Showing 29 changed files with 2,575 additions and 58 deletions.
7 changes: 5 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,12 @@ Adheres to [Semantic Versioning](http://semver.org/).

---

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

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

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

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -163,13 +163,13 @@ geoPackage.close();

### Installation ###

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

```xml
<dependency>
<groupId>mil.nga.geopackage</groupId>
<artifactId>geopackage</artifactId>
<version>6.2.1</version>
<version>6.3.0</version>
</dependency>
```

Expand Down
2 changes: 1 addition & 1 deletion docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ <h2 class="project-tagline">by the National Geospatial-Intelligence Agency</h2>
<a href="http://ngageoint.github.io/geopackage-java/docs/api/" class="btn">API</a>
<a href="https://github.com/ngageoint/geopackage-java/zipball/master" class="btn">.zip</a>
<a href="https://github.com/ngageoint/geopackage-java/tarball/master" class="btn">.tar.gz</a>
<a href="http://search.maven.org/#artifactdetails|mil.nga.geopackage|geopackage|6.2.1|jar" class="btn">The Central Repository</a>
<a href="http://search.maven.org/#artifactdetails|mil.nga.geopackage|geopackage|6.3.0|jar" class="btn">The Central Repository</a>
</section>

<section class="main-content">
Expand Down
13 changes: 7 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>mil.nga.geopackage</groupId>
<artifactId>geopackage</artifactId>
<version>6.2.2</version>
<version>6.3.0</version>
<packaging>jar</packaging>
<name>GeoPackage</name>
<url>https://github.com/ngageoint/geopackage-java</url>
Expand Down Expand Up @@ -46,7 +46,7 @@
<dependency>
<groupId>mil.nga.geopackage</groupId>
<artifactId>geopackage-core</artifactId>
<version>6.2.1</version>
<version>6.3.0</version>
<exclusions>
<exclusion>
<groupId>com.j256.ormlite</groupId>
Expand Down Expand Up @@ -89,8 +89,9 @@
<finalName>${project.artifactId}-${project.version}-standalone</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<version>3.10.1</version>
<configuration>
<source>11</source>
<target>11</target>
Expand All @@ -99,7 +100,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.2.4</version>
<version>3.3.0</version>
<executions>
<execution>
<phase>package</phase>
Expand Down Expand Up @@ -155,7 +156,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.3.1</version>
<version>3.3.2</version>
<configuration>
<links>
<link>https://ngageoint.github.io/geopackage-core-java/docs/api/</link>
Expand Down Expand Up @@ -201,7 +202,7 @@
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.8</version>
<version>1.6.12</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public AttributesDao(String database, GeoPackageConnection db,

/**
* {@inheritDoc}
*
* <p>
* Not supported for Attributes
*/
@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,9 @@

/**
* Tiled Gridded Coverage Data, abstract Common Encoding, Extension
*
* http://docs.opengeospatial.org/is/17-066r1/17-066r1.html
* <p>
* <a href=
* "http://docs.opengeospatial.org/is/17-066r1/17-066r1.html">http://docs.opengeospatial.org/is/17-066r1/17-066r1.html</a>
*
* @param <TImage>
* image type
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,9 @@
* bounding box queries. This extension is required to provide an index
* implementation when a SQLite version is used before SpatialLite support
* (Android).
*
* http://ngageoint.github.io/GeoPackage/docs/extensions/geometry-index.html
* <p>
* <a href=
* "http://ngageoint.github.io/GeoPackage/docs/extensions/geometry-index.html">http://ngageoint.github.io/GeoPackage/docs/extensions/geometry-index.html</a>
*
* @author osbornb
* @since 1.1.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@
/**
* Feature Tile Table linker, used to link feature and tile tables together when
* the tiles represent the feature data
*
* http://ngageoint.github.io/GeoPackage/docs/extensions/feature-tile-link.html
* <p>
* <a href=
* "http://ngageoint.github.io/GeoPackage/docs/extensions/feature-tile-link.html">http://ngageoint.github.io/GeoPackage/docs/extensions/feature-tile-link.html</a>
*
* @author osbornb
* @since 1.1.7
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
/**
* GeoPackage properties extension for defining GeoPackage specific properties,
* attributes, and metadata
*
* http://ngageoint.github.io/GeoPackage/docs/extensions/properties.html
* <p>
* <a href=
* "http://ngageoint.github.io/GeoPackage/docs/extensions/properties.html">http://ngageoint.github.io/GeoPackage/docs/extensions/properties.html</a>
*
* @author osbornb
* @since 3.0.2
*/
public class PropertiesExtension
extends
public class PropertiesExtension extends
PropertiesCoreExtension<GeoPackage, AttributesRow, AttributesResultSet, AttributesDao> {

/**
Expand Down
Loading

0 comments on commit 42a2f4d

Please sign in to comment.