Fixes the assembly.

orbisgis · Apr 30, 2018 · 6d7f181 · 6d7f181
2 parents ec9f477 + 74830e3
commit 6d7f181
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 13 deletions.
diff --git a/h2gis-dist/pom.xml b/h2gis-dist/pom.xml
@@ -89,23 +89,33 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
             <version>${sl4j-version}</version>
-        </dependency>	
-	<dependency>
-	    <groupId>org.orbisgis</groupId>
-	    <artifactId>postgis-jts-osgi</artifactId>
-	    <version>5.0.1</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>
+            <groupId>org.postgis</groupId>
+            <artifactId>postgis-jdbc</artifactId>
 	      </exclusion>
 	      <exclusion>
-		<groupId>org.postgis</groupId>
-		<artifactId>postgis-jdbc-jtsparser</artifactId>
+            <groupId>org.postgis</groupId>
+            <artifactId>postgis-jdbc-jtsparser</artifactId>
 	      </exclusion>
 	      <exclusion>
-		<groupId>postgresql</groupId>
-		<artifactId>postgresql</artifactId>
+            <groupId>postgresql</groupId>
+            <artifactId>postgresql</artifactId>
 	      </exclusion>
 	    </exclusions> 	    
 	</dependency>

diff --git a/h2gis-dist/src/main/assembly/bin.xml b/h2gis-dist/src/main/assembly/bin.xml
@@ -14,7 +14,7 @@
                         </includes>
                 </fileSet>
                 <fileSet>
-                    <directory>${project.parent.basedir}/</directory>
+                    <directory>${project.basedir}/../</directory>
                     <outputDirectory>/</outputDirectory>
                     <includes>
                         <include>README.md</include>

diff --git a/h2gis-dist/src/main/assembly/project.xml b/h2gis-dist/src/main/assembly/project.xml
@@ -7,7 +7,7 @@
   </formats>
   <fileSets>
     <fileSet>
-      <directory>${project.parent.basedir}</directory>
+      <directory>${project.basedir}/../</directory>
       <outputDirectory>/</outputDirectory>
       <useDefaultExcludes>true</useDefaultExcludes>
       <excludes>