Author: desruisseaux
Date: Thu Apr 12 20:05:54 2018
New Revision: 1829005
URL: http://svn.apache.org/viewvc?rev=1829005&view=rev
Log:
Remove OSGi configuration since it will be replaced by Jigsaw.
Modified:
sis/branches/JDK8/application/sis-console/pom.xml
sis/branches/JDK8/application/sis-javafx/pom.xml
sis/branches/JDK8/application/sis-openoffice/pom.xml
sis/branches/JDK8/core/sis-build-helper/pom.xml
sis/branches/JDK8/core/sis-feature/pom.xml
sis/branches/JDK8/core/sis-metadata/pom.xml
sis/branches/JDK8/core/sis-portrayal/pom.xml
sis/branches/JDK8/core/sis-raster/pom.xml
sis/branches/JDK8/core/sis-referencing-by-identifiers/pom.xml
sis/branches/JDK8/core/sis-referencing/pom.xml
sis/branches/JDK8/core/sis-utility/pom.xml
sis/branches/JDK8/pom.xml
sis/branches/JDK8/profiles/sis-french-profile/pom.xml
sis/branches/JDK8/storage/sis-earth-observation/pom.xml
sis/branches/JDK8/storage/sis-gdal/pom.xml
sis/branches/JDK8/storage/sis-geotiff/pom.xml
sis/branches/JDK8/storage/sis-netcdf/pom.xml
sis/branches/JDK8/storage/sis-shapefile/pom.xml
sis/branches/JDK8/storage/sis-sql/pom.xml
sis/branches/JDK8/storage/sis-storage/pom.xml
sis/branches/JDK8/storage/sis-xmlstore/pom.xml
Modified: sis/branches/JDK8/application/sis-console/pom.xml
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/application/sis-console/pom.xml?rev=1829005&r1=1829004&r2=1829005&view=diff
==============================================================================
--- sis/branches/JDK8/application/sis-console/pom.xml (original)
+++ sis/branches/JDK8/application/sis-console/pom.xml Thu Apr 12 20:05:54 2018
@@ -37,12 +37,9 @@
=========================================================== -->
<groupId>org.apache.sis.application</groupId>
<artifactId>sis-console</artifactId>
- <packaging>bundle</packaging>
<name>Apache SIS console</name>
<description>
- <!-- Left alignment because this description will be copied in
META-INF/MANIFEST.MF
- The leading space after the first line is necessary for proper
formatting. -->
-Console application.
+ Console application.
</description>
@@ -78,25 +75,15 @@ Console application.
<manifest>
<mainClass>org.apache.sis.console.Command</mainClass>
</manifest>
+ <manifestEntries>
+ <Automatic-Module-Name>
+ org.apache.sis.console
+ </Automatic-Module-Name>
+ </manifestEntries>
</archive>
<skipIfEmpty>true</skipIfEmpty>
</configuration>
</plugin>
-
- <!-- Package as OSGi bundle -->
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Export-Package>
- org.apache.sis.console
- </Export-Package>
- <Main-Class>org.apache.sis.console.Command</Main-Class>
- <Bundle-SymbolicName>org.apache.sis.console</Bundle-SymbolicName>
- </instructions>
- </configuration>
- </plugin>
</plugins>
</build>
Modified: sis/branches/JDK8/application/sis-javafx/pom.xml
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/application/sis-javafx/pom.xml?rev=1829005&r1=1829004&r2=1829005&view=diff
==============================================================================
--- sis/branches/JDK8/application/sis-javafx/pom.xml (original)
+++ sis/branches/JDK8/application/sis-javafx/pom.xml Thu Apr 12 20:05:54 2018
@@ -37,12 +37,9 @@
=========================================================== -->
<groupId>org.apache.sis.application</groupId>
<artifactId>sis-javafx</artifactId>
- <packaging>bundle</packaging>
<name>Apache SIS application for JavaFX</name>
<description>
- <!-- Left alignment because this description will be copied in
META-INF/MANIFEST.MF
- The leading space after the first line is necessary for proper
formatting. -->
-Client application for JavaFX.
+ Client application for JavaFX.
</description>
@@ -69,15 +66,18 @@ Client application for JavaFX.
=========================================================== -->
<build>
<plugins>
-
- <!-- Package as OSGi bundle -->
+ <!-- Anticipation for Java 9 -->
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
<configuration>
- <instructions>
- <Bundle-SymbolicName>org.apache.sis.gui</Bundle-SymbolicName>
- </instructions>
+ <archive>
+ <manifestEntries>
+ <Automatic-Module-Name>
+ org.apache.sis.gui
+ </Automatic-Module-Name>
+ </manifestEntries>
+ </archive>
</configuration>
</plugin>
</plugins>
Modified: sis/branches/JDK8/application/sis-openoffice/pom.xml
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/application/sis-openoffice/pom.xml?rev=1829005&r1=1829004&r2=1829005&view=diff
==============================================================================
--- sis/branches/JDK8/application/sis-openoffice/pom.xml (original)
+++ sis/branches/JDK8/application/sis-openoffice/pom.xml Thu Apr 12 20:05:54
2018
@@ -37,7 +37,6 @@
=========================================================== -->
<groupId>org.apache.sis.application</groupId>
<artifactId>sis-openoffice</artifactId>
- <packaging>jar</packaging>
<name>Bridges to Apache OpenOffice or LibreOffice</name>
<description>
Modified: sis/branches/JDK8/core/sis-build-helper/pom.xml
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-build-helper/pom.xml?rev=1829005&r1=1829004&r2=1829005&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-build-helper/pom.xml (original)
+++ sis/branches/JDK8/core/sis-build-helper/pom.xml Thu Apr 12 20:05:54 2018
@@ -45,12 +45,10 @@
<packaging>maven-plugin</packaging>
<name>Apache SIS build helper</name>
<description>
- <!-- Left alignment because this description will be copied in
META-INF/MANIFEST.MF
- The leading space after the first line is necessary for proper
formatting. -->
-Define Maven Mojos and Javadoc taglets for generating resource files
- formatting the Javadoc or creating ".oxt" files for OpenOffice.org.
- While any project could use it, this module is primarily for internal
- use by Apache SIS and may change in any future version.
+ Define Maven Mojos and Javadoc taglets for generating resource files
+ formatting the Javadoc or creating ".oxt" files for OpenOffice.org.
+ While any project could use it, this module is primarily for internal
+ use by Apache SIS and may change in any future version.
</description>
Modified: sis/branches/JDK8/core/sis-feature/pom.xml
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-feature/pom.xml?rev=1829005&r1=1829004&r2=1829005&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-feature/pom.xml (original)
+++ sis/branches/JDK8/core/sis-feature/pom.xml Thu Apr 12 20:05:54 2018
@@ -37,12 +37,9 @@
=========================================================== -->
<groupId>org.apache.sis.core</groupId>
<artifactId>sis-feature</artifactId>
- <packaging>bundle</packaging>
<name>Apache SIS features</name>
<description>
- <!-- Left alignment because this description will be copied in
META-INF/MANIFEST.MF
- The leading space after the first line is necessary for proper
formatting. -->
-Representations of geographic features.
+ Representations of geographic features.
</description>
@@ -85,15 +82,18 @@ Representations of geographic features.
=========================================================== -->
<build>
<plugins>
-
- <!-- Package as OSGi bundle -->
+ <!-- Anticipation for Java 9 -->
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
<configuration>
- <instructions>
- <Bundle-SymbolicName>org.apache.sis.feature</Bundle-SymbolicName>
- </instructions>
+ <archive>
+ <manifestEntries>
+ <Automatic-Module-Name>
+ org.apache.sis.feature
+ </Automatic-Module-Name>
+ </manifestEntries>
+ </archive>
</configuration>
</plugin>
</plugins>
Modified: sis/branches/JDK8/core/sis-metadata/pom.xml
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/pom.xml?rev=1829005&r1=1829004&r2=1829005&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/pom.xml (original)
+++ sis/branches/JDK8/core/sis-metadata/pom.xml Thu Apr 12 20:05:54 2018
@@ -37,14 +37,11 @@
=========================================================== -->
<groupId>org.apache.sis.core</groupId>
<artifactId>sis-metadata</artifactId>
- <packaging>bundle</packaging>
<name>Apache SIS metadata</name>
<description>
- <!-- Left alignment because this description will be copied in
META-INF/MANIFEST.MF
- The leading space after the first line is necessary for proper
formatting. -->
-Implementations of metadata derived from ISO 19115. This module provides both
an implementation
- of the metadata interfaces defined in GeoAPI, and a framework for handling
those metadata through
- Java reflection.
+ Implementations of metadata derived from ISO 19115. This module provides
both an implementation
+ of the metadata interfaces defined in GeoAPI, and a framework for handling
those metadata through
+ Java reflection.
</description>
@@ -117,20 +114,18 @@ Implementations of metadata derived from
=========================================================== -->
<build>
<plugins>
-
- <!-- Package as OSGi bundle -->
+ <!-- Anticipation for Java 9 -->
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
<configuration>
- <instructions>
- <Bundle-SymbolicName>org.apache.sis.metadata</Bundle-SymbolicName>
- <Export-Package>org.apache.sis.internal.jaxb.metadata,
*</Export-Package>
- <Require-Capability>osgi.extender;
-
filter:="(osgi.extender=osgi.serviceloader.registrar)"</Require-Capability>
- <Provide-Capability>osgi.serviceloader;
-
osgi.serviceloader=org.apache.sis.internal.jaxb.TypeRegistration</Provide-Capability>
- </instructions>
+ <archive>
+ <manifestEntries>
+ <Automatic-Module-Name>
+ org.apache.sis.metadata
+ </Automatic-Module-Name>
+ </manifestEntries>
+ </archive>
</configuration>
</plugin>
</plugins>
Modified: sis/branches/JDK8/core/sis-portrayal/pom.xml
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-portrayal/pom.xml?rev=1829005&r1=1829004&r2=1829005&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-portrayal/pom.xml (original)
+++ sis/branches/JDK8/core/sis-portrayal/pom.xml Thu Apr 12 20:05:54 2018
@@ -37,12 +37,9 @@
=========================================================== -->
<groupId>org.apache.sis.core</groupId>
<artifactId>sis-portrayal</artifactId>
- <packaging>bundle</packaging>
<name>Apache SIS portrayal</name>
<description>
- <!-- Left alignment because this description will be copied in
META-INF/MANIFEST.MF
- The leading space after the first line is necessary for proper
formatting. -->
-Symbology and map representations, together with a rendering engine for
display.
+ Symbology and map representations, together with a rendering engine for
display.
</description>
@@ -79,15 +76,18 @@ Symbology and map representations, toget
=========================================================== -->
<build>
<plugins>
-
- <!-- Package as OSGi bundle -->
+ <!-- Anticipation for Java 9 -->
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
<configuration>
- <instructions>
- <Bundle-SymbolicName>org.apache.sis.portrayal</Bundle-SymbolicName>
- </instructions>
+ <archive>
+ <manifestEntries>
+ <Automatic-Module-Name>
+ org.apache.sis.portrayal
+ </Automatic-Module-Name>
+ </manifestEntries>
+ </archive>
</configuration>
</plugin>
</plugins>
Modified: sis/branches/JDK8/core/sis-raster/pom.xml
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-raster/pom.xml?rev=1829005&r1=1829004&r2=1829005&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-raster/pom.xml (original)
+++ sis/branches/JDK8/core/sis-raster/pom.xml Thu Apr 12 20:05:54 2018
@@ -37,12 +37,9 @@
=========================================================== -->
<groupId>org.apache.sis.core</groupId>
<artifactId>sis-raster</artifactId>
- <packaging>bundle</packaging>
<name>Apache SIS rasters</name>
<description>
- <!-- Left alignment because this description will be copied in
META-INF/MANIFEST.MF
- The leading space after the first line is necessary for proper
formatting. -->
-Access to raster data.
+ Access to raster data.
</description>
@@ -80,15 +77,18 @@ Access to raster data.
=========================================================== -->
<build>
<plugins>
-
- <!-- Package as OSGi bundle -->
+ <!-- Anticipation for Java 9 -->
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
<configuration>
- <instructions>
- <Bundle-SymbolicName>org.apache.sis.raster</Bundle-SymbolicName>
- </instructions>
+ <archive>
+ <manifestEntries>
+ <Automatic-Module-Name>
+ org.apache.sis.raster
+ </Automatic-Module-Name>
+ </manifestEntries>
+ </archive>
</configuration>
</plugin>
</plugins>
Modified: sis/branches/JDK8/core/sis-referencing-by-identifiers/pom.xml
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing-by-identifiers/pom.xml?rev=1829005&r1=1829004&r2=1829005&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing-by-identifiers/pom.xml (original)
+++ sis/branches/JDK8/core/sis-referencing-by-identifiers/pom.xml Thu Apr 12
20:05:54 2018
@@ -33,13 +33,10 @@
<groupId>org.apache.sis.core</groupId>
<artifactId>sis-referencing-by-identifiers</artifactId>
- <packaging>bundle</packaging>
<name>Apache SIS referencing by geographic identifiers</name>
<description>
- <!-- Left alignment because this description will be copied in
META-INF/MANIFEST.MF
- The leading space after the first line is necessary for proper
formatting. -->
-Implementations of Spatial Reference Systems using Geographic Identifiers
- gazetteer services derived from ISO 19112.
+ Implementations of Spatial Reference Systems using Geographic Identifiers
+ gazetteer services derived from ISO 19112.
</description>
@@ -78,15 +75,18 @@ Implementations of Spatial Reference Sys
=========================================================== -->
<build>
<plugins>
-
- <!-- Package as OSGi bundle -->
+ <!-- Anticipation for Java 9 -->
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
<configuration>
- <instructions>
-
<Bundle-SymbolicName>org.apache.sis.referencing.gazetteer</Bundle-SymbolicName>
- </instructions>
+ <archive>
+ <manifestEntries>
+ <Automatic-Module-Name>
+ org.apache.sis.gazetter
+ </Automatic-Module-Name>
+ </manifestEntries>
+ </archive>
</configuration>
</plugin>
</plugins>
Modified: sis/branches/JDK8/core/sis-referencing/pom.xml
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/pom.xml?rev=1829005&r1=1829004&r2=1829005&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/pom.xml (original)
+++ sis/branches/JDK8/core/sis-referencing/pom.xml Thu Apr 12 20:05:54 2018
@@ -33,13 +33,10 @@
<groupId>org.apache.sis.core</groupId>
<artifactId>sis-referencing</artifactId>
- <packaging>bundle</packaging>
<name>Apache SIS referencing</name>
<description>
- <!-- Left alignment because this description will be copied in
META-INF/MANIFEST.MF
- The leading space after the first line is necessary for proper
formatting. -->
-Implementations of Coordinate Reference Systems (CRS),
- conversion and transformation services derived from ISO 19111.
+ Implementations of Coordinate Reference Systems (CRS),
+ conversion and transformation services derived from ISO 19111.
</description>
@@ -89,20 +86,18 @@ Implementations of Coordinate Reference
=========================================================== -->
<build>
<plugins>
-
- <!-- Package as OSGi bundle -->
+ <!-- Anticipation for Java 9 -->
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
<configuration>
- <instructions>
-
<Bundle-SymbolicName>org.apache.sis.referencing</Bundle-SymbolicName>
- <Export-Package>org.apache.sis.internal.referencing,
*</Export-Package>
- <Require-Capability>osgi.extender;
-
filter:="(osgi.extender=osgi.serviceloader.registrar)"</Require-Capability>
- <Provide-Capability>osgi.serviceloader;
- osgi.serviceloader=org.apache.sis.internal.jaxb.TypeRegistration;
osgi.serviceloader=org.apache.sis.internal.jaxb.AdapterReplacement,org.opengis.referencing.operation.MathTransformFactory,org.opengis.referencing.operation.OperationMethod,org.opengis.temporal.TemporalFactory</Provide-Capability>
- </instructions>
+ <archive>
+ <manifestEntries>
+ <Automatic-Module-Name>
+ org.apache.sis.referencing
+ </Automatic-Module-Name>
+ </manifestEntries>
+ </archive>
</configuration>
</plugin>
</plugins>
Modified: sis/branches/JDK8/core/sis-utility/pom.xml
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/pom.xml?rev=1829005&r1=1829004&r2=1829005&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/pom.xml (original)
+++ sis/branches/JDK8/core/sis-utility/pom.xml Thu Apr 12 20:05:54 2018
@@ -37,12 +37,9 @@
=========================================================== -->
<groupId>org.apache.sis.core</groupId>
<artifactId>sis-utility</artifactId>
- <packaging>bundle</packaging>
<name>Apache SIS utilities</name>
<description>
- <!-- Left alignment because this description will be copied in
META-INF/MANIFEST.MF
- The leading space after the first line is necessary for proper
formatting. -->
-Miscellaneous utilities.
+ Miscellaneous utilities.
</description>
@@ -122,25 +119,18 @@ Miscellaneous utilities.
=========================================================== -->
<build>
<plugins>
-
- <!-- Package as OSGi bundle -->
+ <!-- Anticipation for Java 9 -->
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
<configuration>
- <instructions>
- <Bundle-SymbolicName>org.apache.sis.util</Bundle-SymbolicName>
-
<Bundle-Activator>org.apache.sis.internal.system.OSGiActivator</Bundle-Activator>
- <Export-Package>*</Export-Package>
- <Require-Capability>
- osgi.extender;
- filter:="(osgi.extender=osgi.serviceloader.registrar)",
- osgi.serviceloader;
- ;cardinality:=multiple,osgi.extender;
- filter:="(osgi.extender=osgi.serviceloader.processor)"
- </Require-Capability>
- <SPI-Producer>*</SPI-Producer>
- </instructions>
+ <archive>
+ <manifestEntries>
+ <Automatic-Module-Name>
+ org.apache.sis.util
+ </Automatic-Module-Name>
+ </manifestEntries>
+ </archive>
</configuration>
</plugin>
</plugins>
Modified: sis/branches/JDK8/pom.xml
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/pom.xml?rev=1829005&r1=1829004&r2=1829005&view=diff
==============================================================================
--- sis/branches/JDK8/pom.xml (original)
+++ sis/branches/JDK8/pom.xml Thu Apr 12 20:05:54 2018
@@ -44,19 +44,17 @@
<name>Apache SIS</name>
<url>http://sis.apache.org</url>
<description>
- <!-- Left alignment because this description will be copied in
META-INF/MANIFEST.MF
- The leading space after the first line is necessary for proper
formatting. -->
-Apache SIS is a free software, Java language library for developing geospatial
applications.
- SIS provides data structures for geographic data and associated metadata
along with methods
- to manipulate those data structures. The SIS metadata module forms the base
of the library
- and enables the creation of metadata objects which comply with the ISO 19115
metadata model
- and which can be read from or written to ISO 19115-3 compliant XML documents.
- The SIS referencing module will enable the construction of geodetic data
structures for
- geospatial referencing based on the ISO 19111 model such as axis, projection
and coordinate
- reference system definitions, along with the associated operations which
enable the mathematical
- conversion of coordinates between different systems of reference.
- The SIS storage modules will provide a common approach to the reading and
writing of grid coverages
- applicable to simple imagery as to many dimensional data structures.
+ Apache SIS is a free software, Java language library for developing
geospatial applications.
+ SIS provides data structures for geographic data and associated metadata
along with methods
+ to manipulate those data structures. The SIS metadata module forms the
base of the library
+ and enables the creation of metadata objects which comply with the ISO
19115 metadata model
+ and which can be read from or written to ISO 19115-3 compliant XML
documents.
+ The SIS referencing module will enable the construction of geodetic data
structures for
+ geospatial referencing based on the ISO 19111 model such as axis,
projection and coordinate
+ reference system definitions, along with the associated operations which
enable the mathematical
+ conversion of coordinates between different systems of reference.
+ The SIS storage modules will provide a common approach to the reading and
writing of grid coverages
+ applicable to simple imagery as to many dimensional data structures.
</description>
<inceptionYear>2010</inceptionYear>
@@ -628,7 +626,7 @@ Apache SIS is a free software, Java lang
INDEX.LIST file is incomplete (which seem to happen in practice).
-->
<plugin>
<artifactId>maven-jar-plugin</artifactId>
- <version>3.0.2</version> <!-- For
https://issues.apache.org/jira/browse/MJAR-223 bug fix. -->
+ <version>3.1.0</version>
<configuration>
<archive>
<addMavenDescriptor>false</addMavenDescriptor>
@@ -643,6 +641,7 @@ Apache SIS is a free software, Java lang
<Specification-Title>GeoAPI</Specification-Title>
<Specification-Version>${geoapi.version}</Specification-Version>
<Specification-Vendor>Open Geospatial
Consortium</Specification-Vendor>
+ <Implementation-URL>http://sis.apache.org/</Implementation-URL>
</manifestEntries>
</archive>
<skipIfEmpty>true</skipIfEmpty>
@@ -669,20 +668,6 @@ Apache SIS is a free software, Java lang
</executions>
</plugin>
- <!-- Package as OSGi bundle -->
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>3.5.0</version>
- <extensions>true</extensions>
- <configuration>
- <excludeDependencies>true</excludeDependencies>
- <instructions>
- <Bundle-DocURL>${project.url}</Bundle-DocURL>
- </instructions>
- </configuration>
- </plugin>
-
<!-- Checkstype configuration
Legal note: Checkstyle is under LGPL license, but it is okay to use
it only for
the build if it is downloaded by Maven (not included in Apache SIS
distribution).
Modified: sis/branches/JDK8/profiles/sis-french-profile/pom.xml
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/profiles/sis-french-profile/pom.xml?rev=1829005&r1=1829004&r2=1829005&view=diff
==============================================================================
--- sis/branches/JDK8/profiles/sis-french-profile/pom.xml (original)
+++ sis/branches/JDK8/profiles/sis-french-profile/pom.xml Thu Apr 12 20:05:54
2018
@@ -37,12 +37,9 @@
=========================================================== -->
<groupId>org.apache.sis.profiles</groupId>
<artifactId>sis-french-profile</artifactId>
- <packaging>bundle</packaging>
<name>Apache SIS French profiles</name>
<description>
- <!-- Left alignment because this description will be copied in
META-INF/MANIFEST.MF
- The leading space after the first line is necessary for proper
formatting. -->
-Extensions to ISO-19115 metadata mandated by the French government.
+ Extensions to ISO-19115 metadata mandated by the French government.
</description>
@@ -92,13 +89,16 @@ Extensions to ISO-19115 metadata mandate
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
<configuration>
- <instructions>
-
<Bundle-SymbolicName>org.apache.sis.metadata.fra</Bundle-SymbolicName>
- <Export-Package>*</Export-Package>
- </instructions>
+ <archive>
+ <manifestEntries>
+ <Automatic-Module-Name>
+ org.apache.sis.metadata.fra
+ </Automatic-Module-Name>
+ </manifestEntries>
+ </archive>
</configuration>
</plugin>
</plugins>
Modified: sis/branches/JDK8/storage/sis-earth-observation/pom.xml
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-earth-observation/pom.xml?rev=1829005&r1=1829004&r2=1829005&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-earth-observation/pom.xml (original)
+++ sis/branches/JDK8/storage/sis-earth-observation/pom.xml Thu Apr 12 20:05:54
2018
@@ -37,12 +37,9 @@
=========================================================== -->
<groupId>org.apache.sis.storage</groupId>
<artifactId>sis-earth-observation</artifactId>
- <packaging>bundle</packaging>
<name>Apache SIS Earth Observation storage</name>
<description>
- <!-- Left alignment because this description will be copied in
META-INF/MANIFEST.MF
- The leading space after the first line is necessary for proper
formatting. -->
-Landsat and MODIS metadata files to ISO 19115 metadata.
+ Landsat and MODIS metadata files to ISO 19115 metadata.
</description>
@@ -103,12 +100,16 @@ Landsat and MODIS metadata files to ISO
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
<configuration>
- <instructions>
-
<Bundle-SymbolicName>org.apache.sis.storage.earthobservation</Bundle-SymbolicName>
- </instructions>
+ <archive>
+ <manifestEntries>
+ <Automatic-Module-Name>
+ org.apache.sis.storage.earthobservation
+ </Automatic-Module-Name>
+ </manifestEntries>
+ </archive>
</configuration>
</plugin>
</plugins>
Modified: sis/branches/JDK8/storage/sis-gdal/pom.xml
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-gdal/pom.xml?rev=1829005&r1=1829004&r2=1829005&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-gdal/pom.xml (original)
+++ sis/branches/JDK8/storage/sis-gdal/pom.xml Thu Apr 12 20:05:54 2018
@@ -37,12 +37,9 @@
=========================================================== -->
<groupId>org.apache.sis.storage</groupId>
<artifactId>sis-gdal</artifactId>
- <packaging>bundle</packaging>
<name>Apache SIS bindings for Proj4</name>
<description>
- <!-- Left alignment because this description will be copied in
META-INF/MANIFEST.MF
- The leading space after the first line is necessary for proper
formatting. -->
-Referencing services from Proj4 through GeoAPI interfaces.
+ Referencing services from Proj4 through GeoAPI interfaces.
</description>
@@ -79,12 +76,16 @@ Referencing services from Proj4 through
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
<configuration>
- <instructions>
-
<Bundle-SymbolicName>org.apache.sis.storage.gdal</Bundle-SymbolicName>
- </instructions>
+ <archive>
+ <manifestEntries>
+ <Automatic-Module-Name>
+ org.apache.sis.storage.gdal
+ </Automatic-Module-Name>
+ </manifestEntries>
+ </archive>
</configuration>
</plugin>
</plugins>
Modified: sis/branches/JDK8/storage/sis-geotiff/pom.xml
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-geotiff/pom.xml?rev=1829005&r1=1829004&r2=1829005&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-geotiff/pom.xml (original)
+++ sis/branches/JDK8/storage/sis-geotiff/pom.xml Thu Apr 12 20:05:54 2018
@@ -37,12 +37,9 @@
=========================================================== -->
<groupId>org.apache.sis.storage</groupId>
<artifactId>sis-geotiff</artifactId>
- <packaging>bundle</packaging>
<name>Apache SIS GeoTIFF storage</name>
<description>
- <!-- Left alignment because this description will be copied in
META-INF/MANIFEST.MF
- The leading space after the first line is necessary for proper
formatting. -->
-Bridge between GeoTIFF convention and ISO 19115 metadata.
+ Bridge between GeoTIFF convention and ISO 19115 metadata.
</description>
@@ -103,12 +100,16 @@ Bridge between GeoTIFF convention and IS
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
<configuration>
- <instructions>
-
<Bundle-SymbolicName>org.apache.sis.storage.geotiff</Bundle-SymbolicName>
- </instructions>
+ <archive>
+ <manifestEntries>
+ <Automatic-Module-Name>
+ org.apache.sis.storage.geotiff
+ </Automatic-Module-Name>
+ </manifestEntries>
+ </archive>
</configuration>
</plugin>
</plugins>
Modified: sis/branches/JDK8/storage/sis-netcdf/pom.xml
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-netcdf/pom.xml?rev=1829005&r1=1829004&r2=1829005&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-netcdf/pom.xml (original)
+++ sis/branches/JDK8/storage/sis-netcdf/pom.xml Thu Apr 12 20:05:54 2018
@@ -37,12 +37,9 @@
=========================================================== -->
<groupId>org.apache.sis.storage</groupId>
<artifactId>sis-netcdf</artifactId>
- <packaging>bundle</packaging>
<name>Apache SIS netCDF storage</name>
<description>
- <!-- Left alignment because this description will be copied in
META-INF/MANIFEST.MF
- The leading space after the first line is necessary for proper
formatting. -->
-Bridge between netCDF Climate and Forecast (CF) convention and ISO 19115
metadata.
+ Bridge between netCDF Climate and Forecast (CF) convention and ISO 19115
metadata.
</description>
@@ -92,13 +89,16 @@ Bridge between netCDF Climate and Foreca
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
<configuration>
- <instructions>
-
<Bundle-SymbolicName>org.apache.sis.storage.netcdf</Bundle-SymbolicName>
- <Import-Package>!ucar.*, *</Import-Package>
- </instructions>
+ <archive>
+ <manifestEntries>
+ <Automatic-Module-Name>
+ org.apache.sis.storage.netcdf
+ </Automatic-Module-Name>
+ </manifestEntries>
+ </archive>
</configuration>
</plugin>
</plugins>
Modified: sis/branches/JDK8/storage/sis-shapefile/pom.xml
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-shapefile/pom.xml?rev=1829005&r1=1829004&r2=1829005&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-shapefile/pom.xml (original)
+++ sis/branches/JDK8/storage/sis-shapefile/pom.xml Thu Apr 12 20:05:54 2018
@@ -37,12 +37,9 @@
=========================================================== -->
<groupId>org.apache.sis.storage</groupId>
<artifactId>sis-shapefile</artifactId>
- <packaging>bundle</packaging>
<name>Apache SIS Shapefile storage</name>
<description>
- <!-- Left alignment because this description will be copied in
META-INF/MANIFEST.MF
- The leading space after the first line is necessary for proper
formatting. -->
-Read and write files in the Shapefile format.
+ Read and write files in the Shapefile format.
</description>
@@ -81,14 +78,18 @@ Read and write files in the Shapefile fo
</executions>
</plugin>
- <!-- Package as OSGi bundle -->
+ <!-- Anticipation for Java 9 -->
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
<configuration>
- <instructions>
-
<Bundle-SymbolicName>org.apache.sis.storage.shapefile</Bundle-SymbolicName>
- </instructions>
+ <archive>
+ <manifestEntries>
+ <Automatic-Module-Name>
+ org.apache.sis.storage.shapefile
+ </Automatic-Module-Name>
+ </manifestEntries>
+ </archive>
</configuration>
</plugin>
Modified: sis/branches/JDK8/storage/sis-sql/pom.xml
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-sql/pom.xml?rev=1829005&r1=1829004&r2=1829005&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-sql/pom.xml (original)
+++ sis/branches/JDK8/storage/sis-sql/pom.xml Thu Apr 12 20:05:54 2018
@@ -37,12 +37,9 @@
=========================================================== -->
<groupId>org.apache.sis.storage</groupId>
<artifactId>sis-sql</artifactId>
- <packaging>bundle</packaging>
<name>Apache SIS SQL storage</name>
<description>
- <!-- Left alignment because this description will be copied in
META-INF/MANIFEST.MF
- The leading space after the first line is necessary for proper
formatting. -->
-Read and write features from SQL databases.
+ Read and write features from SQL databases.
</description>
@@ -81,14 +78,18 @@ Read and write features from SQL databas
</executions>
</plugin>
- <!-- Package as OSGi bundle -->
+ <!-- Anticipation for Java 9 -->
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
<configuration>
- <instructions>
-
<Bundle-SymbolicName>org.apache.sis.storage.sql</Bundle-SymbolicName>
- </instructions>
+ <archive>
+ <manifestEntries>
+ <Automatic-Module-Name>
+ org.apache.sis.storage.sql
+ </Automatic-Module-Name>
+ </manifestEntries>
+ </archive>
</configuration>
</plugin>
</plugins>
Modified: sis/branches/JDK8/storage/sis-storage/pom.xml
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-storage/pom.xml?rev=1829005&r1=1829004&r2=1829005&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-storage/pom.xml (original)
+++ sis/branches/JDK8/storage/sis-storage/pom.xml Thu Apr 12 20:05:54 2018
@@ -37,12 +37,9 @@
=========================================================== -->
<groupId>org.apache.sis.storage</groupId>
<artifactId>sis-storage</artifactId>
- <packaging>bundle</packaging>
<name>Apache SIS common storage</name>
<description>
- <!-- Left alignment because this description will be copied in
META-INF/MANIFEST.MF
- The leading space after the first line is necessary for proper
formatting. -->
-Provides the interfaces and base classes to be implemented by various storage
formats.
+ Provides the interfaces and base classes to be implemented by various
storage formats.
</description>
@@ -104,13 +101,16 @@ Provides the interfaces and base classes
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
<configuration>
- <instructions>
- <Bundle-SymbolicName>org.apache.sis.storage</Bundle-SymbolicName>
- <Export-Package>org.apache.sis.internal.storage;
x-friends=org.apache.sis.storage.netcdf, *</Export-Package>
- </instructions>
+ <archive>
+ <manifestEntries>
+ <Automatic-Module-Name>
+ org.apache.sis.storage
+ </Automatic-Module-Name>
+ </manifestEntries>
+ </archive>
</configuration>
</plugin>
</plugins>
Modified: sis/branches/JDK8/storage/sis-xmlstore/pom.xml
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-xmlstore/pom.xml?rev=1829005&r1=1829004&r2=1829005&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-xmlstore/pom.xml (original)
+++ sis/branches/JDK8/storage/sis-xmlstore/pom.xml Thu Apr 12 20:05:54 2018
@@ -37,12 +37,9 @@
=========================================================== -->
<groupId>org.apache.sis.storage</groupId>
<artifactId>sis-xmlstore</artifactId>
- <packaging>bundle</packaging>
<name>Apache SIS XML storage</name>
<description>
- <!-- Left alignment because this description will be copied in
META-INF/MANIFEST.MF
- The leading space after the first line is necessary for proper
formatting. -->
-Read and write files in the GPX format.
+ Read and write files in the GPX format.
</description>
@@ -84,14 +81,18 @@ Read and write files in the GPX format.
</executions>
</plugin>
- <!-- Package as OSGi bundle -->
+ <!-- Anticipation for Java 9 -->
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
<configuration>
- <instructions>
-
<Bundle-SymbolicName>org.apache.sis.storage.xmlstore</Bundle-SymbolicName>
- </instructions>
+ <archive>
+ <manifestEntries>
+ <Automatic-Module-Name>
+ org.apache.sis.storage.xml
+ </Automatic-Module-Name>
+ </manifestEntries>
+ </archive>
</configuration>
</plugin>
</plugins>
