You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2019/06/16 16:07:07 UTC
[directory-studio] branch master updated: Fix path to repository on
Windows (DIRSTUDIO-1227)
This is an automated email from the ASF dual-hosted git repository.
seelmann pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-studio.git
The following commit(s) were added to refs/heads/master by this push:
new 1022432 Fix path to repository on Windows (DIRSTUDIO-1227)
1022432 is described below
commit 10224328feea46f6000e8611a0df2f1ab25fbba1
Author: Stefan Seelmann <ma...@stefan-seelmann.de>
AuthorDate: Sun Jun 16 18:06:49 2019 +0200
Fix path to repository on Windows (DIRSTUDIO-1227)
---
README.md | 1 -
eclipse-trgt-platform/pom-first.xml | 19 +++++++++++++++++++
...he.directory.studio.eclipse-trgt-platform.template | 2 +-
3 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 625348c..bb37658 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,6 @@ Apache Directory Studio is a complete directory tooling platform intended to be
* JDK 8 or newer
* Maven 3 or newer
* Sufficient heap space for Maven: `export MAVEN_OPTS="-Xmx512m"`
-* FIXME: Windows users have to replace the repository location `file://${basedir}/target/repository` in `eclipse-trgt-platform/template/org.apache.directory.studio.eclipse-trgt-platform.template` with the actual path, e.g. `file:///C:/Development/studio/eclipse-trgt-platform/target/repository`
### Build
diff --git a/eclipse-trgt-platform/pom-first.xml b/eclipse-trgt-platform/pom-first.xml
index bf9a7a7..208ade8 100644
--- a/eclipse-trgt-platform/pom-first.xml
+++ b/eclipse-trgt-platform/pom-first.xml
@@ -528,6 +528,25 @@
</plugin>
<plugin>
+ <groupId>org.codehaus.gmaven</groupId>
+ <artifactId>gmaven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>set-basedir-uri</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ <configuration>
+ <source>
+pom.properties['basedirUri']=project.basedir.toURI().toString();
+ </source>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
diff --git a/eclipse-trgt-platform/template/org.apache.directory.studio.eclipse-trgt-platform.template b/eclipse-trgt-platform/template/org.apache.directory.studio.eclipse-trgt-platform.template
index 626adb0..1a277a4 100644
--- a/eclipse-trgt-platform/template/org.apache.directory.studio.eclipse-trgt-platform.template
+++ b/eclipse-trgt-platform/template/org.apache.directory.studio.eclipse-trgt-platform.template
@@ -102,7 +102,7 @@
<!-- MINA module -->
<unit id="org.apache.mina.core" version="${org.apache.mina.bundleversion}"/>
- <repository location="file://${basedir}/target/repository"/>
+ <repository location="${basedirUri}/target/repository"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">