Skip to content

Commit 6d7f181

Browse files
authored
Fixes the assembly.
Fixes the assembly.
2 parents ec9f477 + 74830e3 commit 6d7f181

File tree

3 files changed

+23
-13
lines changed

3 files changed

+23
-13
lines changed

h2gis-dist/pom.xml

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -89,23 +89,33 @@
8989
<groupId>org.slf4j</groupId>
9090
<artifactId>slf4j-simple</artifactId>
9191
<version>${sl4j-version}</version>
92-
</dependency>
93-
<dependency>
94-
<groupId>org.orbisgis</groupId>
95-
<artifactId>postgis-jts-osgi</artifactId>
96-
<version>5.0.1</version>
92+
</dependency>
93+
<dependency>
94+
<groupId>org.orbisgis</groupId>
95+
<artifactId>h2gis-osgi</artifactId>
96+
<version>${project.version}</version>
97+
</dependency>
98+
<dependency>
99+
<groupId>org.orbisgis</groupId>
100+
<artifactId>h2gis-network</artifactId>
101+
<version>${project.version}</version>
102+
</dependency>
103+
<dependency>
104+
<groupId>org.orbisgis</groupId>
105+
<artifactId>postgis-jts-osgi</artifactId>
106+
<version>5.0.1</version>
97107
<exclusions>
98108
<exclusion>
99-
<groupId>org.postgis</groupId>
100-
<artifactId>postgis-jdbc</artifactId>
109+
<groupId>org.postgis</groupId>
110+
<artifactId>postgis-jdbc</artifactId>
101111
</exclusion>
102112
<exclusion>
103-
<groupId>org.postgis</groupId>
104-
<artifactId>postgis-jdbc-jtsparser</artifactId>
113+
<groupId>org.postgis</groupId>
114+
<artifactId>postgis-jdbc-jtsparser</artifactId>
105115
</exclusion>
106116
<exclusion>
107-
<groupId>postgresql</groupId>
108-
<artifactId>postgresql</artifactId>
117+
<groupId>postgresql</groupId>
118+
<artifactId>postgresql</artifactId>
109119
</exclusion>
110120
</exclusions>
111121
</dependency>

h2gis-dist/src/main/assembly/bin.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</includes>
1515
</fileSet>
1616
<fileSet>
17-
<directory>${project.parent.basedir}/</directory>
17+
<directory>${project.basedir}/../</directory>
1818
<outputDirectory>/</outputDirectory>
1919
<includes>
2020
<include>README.md</include>

h2gis-dist/src/main/assembly/project.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</formats>
88
<fileSets>
99
<fileSet>
10-
<directory>${project.parent.basedir}</directory>
10+
<directory>${project.basedir}/../</directory>
1111
<outputDirectory>/</outputDirectory>
1212
<useDefaultExcludes>true</useDefaultExcludes>
1313
<excludes>

0 commit comments

Comments
 (0)