Skip to content

Commit

Permalink
Improve the poms structure.
Browse files Browse the repository at this point in the history
  • Loading branch information
@SPalominos
SPalominos committed May 11, 2018
1 parent cbef552 commit f7d452b
Show file tree
Hide file tree
Showing 8 changed files with 747 additions and 507 deletions.
36 changes: 23 additions & 13 deletions h2gis-api/pom.xml
View file
@@ -1,16 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<!-- Maven Coordinates -->
<parent>
<artifactId>h2gis-parent</artifactId>
<groupId>org.orbisgis</groupId>
<version>1.5.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>

<artifactId>h2gis-api</artifactId>
<name>h2gis-api</name>
<packaging>bundle</packaging>

<!-- Project Information -->
<name>h2gis-api</name>
<description>H2GIS API define extension point of H2GIS</description>

<organization>
<name>CNRS</name>
<url>http://www.h2gis.org</url>
Expand All @@ -22,31 +30,33 @@
<url>http://www.gnu.org/licenses/lgpl-3.0.html</url>
</license>
</licenses>

<!-- Properties -->
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<!-- Build Settings -->
<build>
<plugins>
<!-- Plugin for the bundle packaging -->
<plugin>
<groupId>org.apache.felix</groupId>
<groupId>${maven-bundle-plugin-groupId}</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>${maven-bundle-plugin-version}</version>
<extensions>true</extensions>
<configuration>
<instructions>
<Public-Package>org.h2gis.api.*</Public-Package>
<Bundle-Vendor>CNRS</Bundle-Vendor>
<Bundle-Category>JDBC</Bundle-Category>
</instructions>
</configuration>
</plugin>
<!-- Plugin for the compilation -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<groupId>${maven-compiler-plugin-groupId}</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
</plugins>
</build>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
</project>
111 changes: 64 additions & 47 deletions h2gis-dist/pom.xml
View file
@@ -1,14 +1,24 @@
<?xml version="1.0"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

<modelVersion>4.0.0</modelVersion>

<!-- Maven Coordinates -->
<parent>
<groupId>org.orbisgis</groupId>
<artifactId>h2gis-parent</artifactId>
<version>1.5.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>

<artifactId>h2gis-dist</artifactId>

<!-- Project Information -->
<name>h2gis-dist</name>
<description>Generate a jar file containing the whole H2GIS project.</description>

<organization>
<name>CNRS</name>
<url>http://www.h2gis.org</url>
Expand All @@ -20,20 +30,65 @@
<url>http://www.gnu.org/licenses/lgpl-3.0.html</url>
</license>
</licenses>

<!-- Properties -->
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<!-- Dependencies -->
<dependencies>
<!-- Simple Logging Facade for Java -->
<dependency>
<groupId>${slf4j-groupId}</groupId>
<artifactId>slf4j-simple</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>h2gis-osgi</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>h2gis-network</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.orbisgis</groupId>
<artifactId>postgis-jts-osgi</artifactId>
<version>5.0.1</version>
<exclusions>
<exclusion>
<groupId>org.postgis</groupId>
<artifactId>postgis-jdbc</artifactId>
</exclusion>
<exclusion>
<groupId>org.postgis</groupId>
<artifactId>postgis-jdbc-jtsparser</artifactId>
</exclusion>
<exclusion>
<groupId>postgresql</groupId>
<artifactId>postgresql</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>

<!-- Build Settings -->
<build>
<plugins>
<!-- Plugin for test running -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<groupId>${maven-surfire-plugin-groupId}</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.14</version>
<configuration>
<workingDirectory>target/</workingDirectory>
</configuration>
</plugin>
<!-- Plugin for the execution of a Java program -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<groupId>${exec-maven-plugin-groupId}</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.2.1</version>
<configuration>
<executable>java</executable>
<classpathScope>runtime</classpathScope>
Expand All @@ -45,10 +100,10 @@
</arguments>
</configuration>
</plugin>
<!-- Create a JAR from the project -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<groupId>${maven-jar-plugin-groupId}</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
<configuration>
<archive>
<manifest>
Expand All @@ -59,9 +114,10 @@
</archive>
</configuration>
</plugin>
<!-- Plugin for aggregate the project output with dependencies, modules, documentation and other files -->
<plugin>
<groupId>${maven-assembly-plugin-groupId}</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.3</version>
<executions>
<execution>
<id>make-assembly</id> <!-- this is used for inheritance merges -->
Expand All @@ -81,43 +137,4 @@
</plugin>
</plugins>
</build>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>${sl4j-version}</version>
</dependency>
<dependency>
<groupId>org.orbisgis</groupId>
<artifactId>h2gis-osgi</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.orbisgis</groupId>
<artifactId>h2gis-network</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.orbisgis</groupId>
<artifactId>postgis-jts-osgi</artifactId>
<version>5.0.1</version>
<exclusions>
<exclusion>
<groupId>org.postgis</groupId>
<artifactId>postgis-jdbc</artifactId>
</exclusion>
<exclusion>
<groupId>org.postgis</groupId>
<artifactId>postgis-jdbc-jtsparser</artifactId>
</exclusion>
<exclusion>
<groupId>postgresql</groupId>
<artifactId>postgresql</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</project>
101 changes: 51 additions & 50 deletions h2gis-functions-osgi/pom.xml
View file
@@ -1,58 +1,69 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.orbisgis</groupId>
<artifactId>h2gis-parent</artifactId>
<version>1.5.0-SNAPSHOT</version>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<!-- Maven Coordinates -->
<parent>
<groupId>org.orbisgis</groupId>
<artifactId>h2gis-parent</artifactId>
<version>1.5.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<artifactId>h2gis-osgi</artifactId>
<name>h2gis-functions-osgi</name>
<description>Register H2GIS functions when a DataSource is declared as OSGi services</description>
<packaging>bundle</packaging>
<organization>
<name>CNRS</name>
<url>http://www.h2gis.org</url>
</organization>
<url>http://github.com/orbisgis/H2GIS</url>
<licenses>
<license>
<name>GNU Lesser General Public License (LGPLV3+)</name>
<url>http://www.gnu.org/licenses/lgpl-3.0.html</url>
</license>
</licenses>
<dependencies>
</parent>

<artifactId>h2gis-osgi</artifactId>
<packaging>bundle</packaging>

<!-- Project Information -->
<name>h2gis-functions-osgi</name>
<description>Register H2GIS functions when a DataSource is declared as OSGi services</description>

<organization>
<name>CNRS</name>
<url>http://www.h2gis.org</url>
</organization>
<url>http://github.com/orbisgis/H2GIS</url>
<licenses>
<license>
<name>GNU Lesser General Public License (LGPLV3+)</name>
<url>http://www.gnu.org/licenses/lgpl-3.0.html</url>
</license>
</licenses>

<!-- Dependencies -->
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>h2gis</artifactId>
<version>${project.version}</version>
</dependency>

<!-- Provided dependencies -->
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.enterprise</artifactId>
<version>5.0.0</version>
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>${osgi-core-version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<version>${org.osgi.compendium-version}</version>
<artifactId>org.osgi.enterprise</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
<plugins>
</dependencies>

<!-- Build Settings -->
<build>
<plugins>
<!-- Plugin for the bundle packaging -->
<plugin>
<groupId>org.apache.felix</groupId>
<groupId>${maven-bundle-plugin-groupId}</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>2.3.7</version>
<extensions>true</extensions>
<configuration>
<instructions>
Expand All @@ -63,21 +74,11 @@
</instructions>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
</plugins>
<extensions>
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh</artifactId>
<version>2.2</version>
</extension>
</extensions>
</build>
<!-- Plugin for the compilation -->
<plugin>
<groupId>${maven-compiler-plugin-groupId}</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>

0 comments on commit f7d452b

Please sign in to comment.