This is an automated email from the ASF dual-hosted git repository. jsorel pushed a commit to branch feat/geojson in repository https://gitbox.apache.org/repos/asf/sis.git
commit 2a54845df7224b06fbc0c5c7d9ae84103c0f5026 Author: jsorel <johann.so...@geomatys.com> AuthorDate: Tue Oct 29 17:07:57 2019 +0100 GeoJson : add maven module --- storage/pom.xml | 1 + storage/{ => sis-geojson}/pom.xml | 100 ++++++--------------- .../org.apache.sis.storage.DataStoreProvider | 1 + 3 files changed, 31 insertions(+), 71 deletions(-) diff --git a/storage/pom.xml b/storage/pom.xml index fe99bdb..081c953 100644 --- a/storage/pom.xml +++ b/storage/pom.xml @@ -169,6 +169,7 @@ <module>sis-sqlstore</module> <module>sis-netcdf</module> <module>sis-geotiff</module> + <module>sis-geojson</module> <module>sis-earth-observation</module> <module>sis-gdal</module> </modules> diff --git a/storage/pom.xml b/storage/sis-geojson/pom.xml similarity index 59% copy from storage/pom.xml copy to storage/sis-geojson/pom.xml index fe99bdb..1a04166 100644 --- a/storage/pom.xml +++ b/storage/sis-geojson/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.apache.sis</groupId> - <artifactId>parent</artifactId> + <artifactId>storage</artifactId> <version>2.0-SNAPSHOT</version> </parent> @@ -35,12 +35,11 @@ <!-- =========================================================== Module Description =========================================================== --> - <artifactId>storage</artifactId> - <packaging>pom</packaging> - <name>Apache SIS storage</name> + <groupId>org.apache.sis.storage</groupId> + <artifactId>sis-geojson</artifactId> + <name>Apache SIS GeoJson storage</name> <description> - Group of modules for reading and writing data from/to various storages. - Storages are typically file formats or a database schemas. + Geojson DataStore implementation. </description> @@ -72,26 +71,6 @@ </developer> </developers> <contributors> - <contributor> - <name>Thi Phuong Hao Nguyen</name> - <email>nguyenthiphuonghao...@gmail.com</email> - <organization>VNSC</organization> - <organizationUrl>http://vnsc.org.vn</organizationUrl> - <timezone>+7</timezone> - <roles> - <role>developer</role> - </roles> - </contributor> - <contributor> - <name>Minh Chinh Vu</name> - <email>chinhvm.uet.1...@gmail.com</email> - <organization>VNSC</organization> - <organizationUrl>http://vnsc.org.vn</organizationUrl> - <timezone>+7</timezone> - <roles> - <role>developer</role> - </roles> - </contributor> </contributors> @@ -100,21 +79,18 @@ =========================================================== --> <build> <plugins> - - <!-- Compile properties files into resources UTF files and - collect JAR files in <root>/target/binaries directory. --> <plugin> - <groupId>org.apache.sis.core</groupId> - <artifactId>sis-build-helper</artifactId> - <version>${sis.plugin.version}</version> - <executions> - <execution> - <goals> - <goal>compile-resources</goal> - <goal>collect-jars</goal> - </goals> - </execution> - </executions> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifestEntries> + <Automatic-Module-Name> + org.apache.sis.storage.geojson + </Automatic-Module-Name> + </manifestEntries> + </archive> + </configuration> </plugin> </plugins> </build> @@ -125,52 +101,34 @@ =========================================================== --> <dependencies> <dependency> - <groupId>org.apache.sis.core</groupId> - <artifactId>sis-metadata</artifactId> + <groupId>org.apache.sis.storage</groupId> + <artifactId>sis-storage</artifactId> <version>${project.version}</version> </dependency> + + <!-- Leverage GeoAPI tests. --> <dependency> <groupId>org.apache.sis.core</groupId> <artifactId>sis-referencing</artifactId> <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.opengis</groupId> - <artifactId>geoapi-pending</artifactId> - </dependency> - - <!-- Test dependencies --> - <dependency> - <groupId>org.opengis</groupId> - <artifactId>geoapi-conformance</artifactId> - </dependency> - <dependency> - <groupId>org.apache.derby</groupId> - <artifactId>derby</artifactId> + <type>test-jar</type> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.sis.core</groupId> - <artifactId>sis-utility</artifactId> + <artifactId>sis-metadata</artifactId> <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-jdk14</artifactId> + <scope>test</scope> + </dependency> </dependencies> - - <!-- =========================================================== - Sub-modules included in the build - =========================================================== --> - <modules> - <module>sis-storage</module> - <module>sis-shapefile</module> - <module>sis-xmlstore</module> - <module>sis-sqlstore</module> - <module>sis-netcdf</module> - <module>sis-geotiff</module> - <module>sis-earth-observation</module> - <module>sis-gdal</module> - </modules> + <repositories> + </repositories> </project> diff --git a/storage/sis-geojson/src/main/resources/META-INF/services/org.apache.sis.storage.DataStoreProvider b/storage/sis-geojson/src/main/resources/META-INF/services/org.apache.sis.storage.DataStoreProvider new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/storage/sis-geojson/src/main/resources/META-INF/services/org.apache.sis.storage.DataStoreProvider @@ -0,0 +1 @@ +