You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by kw...@apache.org on 2020/06/03 09:59:59 UTC
[jackrabbit-filevault-package-maven-plugin] branch
bugfix/cleanup-trunk created (now c5a97af)
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a change to branch bugfix/cleanup-trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault-package-maven-plugin.git.
at c5a97af Merge branch 'trunk' of git@github.com:apache/jackrabbit-filevault-package-maven-plugin.git into trunk
This branch includes the following new commits:
new fac7463 [maven-release-plugin] prepare for next development iteration
new f79c36c releng: use latest FileVault snapshot version
new da6708e JCRVLT-425 fix m2e error marker file location
new c5a97af Merge branch 'trunk' of git@github.com:apache/jackrabbit-filevault-package-maven-plugin.git into trunk
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[jackrabbit-filevault-package-maven-plugin] 04/04: Merge branch
'trunk' of
git@github.com:apache/jackrabbit-filevault-package-maven-plugin.git into
trunk
Posted by kw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch bugfix/cleanup-trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault-package-maven-plugin.git
commit c5a97af6565763d3389a6d425ce81b9563d7ae98
Merge: da6708e 551c7f7
Author: Konrad Windszus <ko...@netcentric.biz>
AuthorDate: Thu Mar 26 19:41:25 2020 +0100
Merge branch 'trunk' of git@github.com:apache/jackrabbit-filevault-package-maven-plugin.git into trunk
[jackrabbit-filevault-package-maven-plugin] 01/04:
[maven-release-plugin] prepare for next development iteration
Posted by kw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch bugfix/cleanup-trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault-package-maven-plugin.git
commit fac74637f072b0e5629a65a60becb56873159869
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Mon Mar 16 14:03:36 2020 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/commons/filevault-package-maven-plugin/trunk@1875257 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index b54061d..7b1e20e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
<!-- ====================================================================== -->
<groupId>org.apache.jackrabbit</groupId>
<artifactId>filevault-package-maven-plugin</artifactId>
- <version>1.1.2</version>
+ <version>1.1.3-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>Apache Jackrabbit FileVault - Package Maven Plugin</name>
@@ -53,9 +53,9 @@
</prerequisites>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/jackrabbit/commons/filevault-package-maven-plugin/tags/filevault-package-maven-plugin-1.1.2</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/jackrabbit/commons/filevault-package-maven-plugin/tags/filevault-package-maven-plugin-1.1.2</developerConnection>
- <url>http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/tags/filevault-package-maven-plugin-1.1.2</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/jackrabbit/commons/filevault-package-maven-plugin/trunk</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/jackrabbit/commons/filevault-package-maven-plugin/trunk</developerConnection>
+ <url>http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk</url>
</scm>
<!-- ====================================================================== -->
[jackrabbit-filevault-package-maven-plugin] 03/04: JCRVLT-425 fix
m2e error marker file location
Posted by kw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch bugfix/cleanup-trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault-package-maven-plugin.git
commit da6708e24b45408155f31f48c94d7ec6602cfaca
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Thu Mar 26 18:05:05 2020 +0100
JCRVLT-425 fix m2e error marker file location
---
.../apache/jackrabbit/filevault/maven/packaging/ValidationHelper.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/ValidationHelper.java b/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/ValidationHelper.java
index 6f317ad..7c6f7c9 100644
--- a/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/ValidationHelper.java
+++ b/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/ValidationHelper.java
@@ -86,8 +86,8 @@ public class ValidationHelper {
// only emit via build context inside eclipse, otherwise log from above is better!
if (buildContextSeverity > 0 && !(buildContext instanceof DefaultBuildContext)) {
File file;
- if (violation.getFilePath() != null) {
- file = violation.getFilePath().toFile();
+ if (violation.getAbsoluteFilePath() != null) {
+ file = violation.getAbsoluteFilePath().toFile();
} else {
// take the base path
file = baseDirectory.toFile();
[jackrabbit-filevault-package-maven-plugin] 02/04: releng: use
latest FileVault snapshot version
Posted by kw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch bugfix/cleanup-trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault-package-maven-plugin.git
commit f79c36cc0556e4f2a45a3983a23c72ba538ed242
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Thu Mar 26 16:30:33 2020 +0100
releng: use latest FileVault snapshot version
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 7b1e20e..9eff1e7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@
<slf4j.version>1.7.5</slf4j.version>
<jackrabbit.version>2.20.0</jackrabbit.version>
<oak.version>1.20.0</oak.version>
- <filevault.version>3.4.4</filevault.version>
+ <filevault.version>3.4.5-SNAPSHOT</filevault.version>
</properties>
<prerequisites>