This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
The following commit(s) were added to refs/heads/master by this push:
new f140a2a JSPWIKI-1094: mvn eclipse:eclipse fails, patch provided by
Christian Fröhler
f140a2a is described below
commit f140a2a4371735ad24d04a1d78c6e1d9ceaed76f
Author: juanpablo <[email protected]>
AuthorDate: Tue Mar 19 21:18:55 2019 +0100
JSPWIKI-1094: mvn eclipse:eclipse fails, patch provided by Christian Fröhler
---
.gitignore | 4 +++-
ChangeLog | 6 +++++-
pom.xml | 4 ++--
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/.gitignore b/.gitignore
index 5e5e631..001b31b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,6 @@ target
.project
nb-configuration.xml
**/*.iml
-.idea
\ No newline at end of file
+.idea
+.metadata
+.checkstyle
\ No newline at end of file
diff --git a/ChangeLog b/ChangeLog
index f0d003d..f71aff6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2019-03-19 Juan Pablo Santos (juanpablo AT apache DOT org)
+
+ * JSPWIKI-1094: mvn eclipse:eclipse fails, patch provided by Christian
Fröhler, thanks! (no version bump)
+
2019-03-17 Dirk Frederickx (brushed AT apache DOT org)
* 2.11.0-M3-git-03
@@ -9,7 +13,7 @@
* 2.11.0-M3-git-02
* Adding Drag & Drop capabilities to the standard JSPWiki editor:
- links automatically are converted to [descriptiol|url] format
+ links automatically are converted to [description|url] format
other content (text, tables, etc...) will be converted to wiki-markup.
diff --git a/pom.xml b/pom.xml
index 47464a5..089b6a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -403,11 +403,11 @@
<additionalConfig>
<file>
<name>.checkstyle</name>
-
<location>./jspwiki-war/src/main/config/dev/jspwiki-checkstyle.xml</location>
+
<location>${maven.multiModuleProjectDirectory}/jspwiki-war/src/main/config/dev/jspwiki-checkstyle.xml</location>
</file>
<file>
<name>.settings/org.eclipse.jdt.core.prefs</name>
-
<location>./jspwiki-war/src/main/config/dev/jspwiki-eclipse-codestyle.xml</location>
+
<location>${maven.multiModuleProjectDirectory}/jspwiki-war/src/main/config/dev/jspwiki-eclipse-codestyle.xml</location>
</file>
</additionalConfig>
<additionalProjectnatures>
