You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2019/12/09 12:05:07 UTC
[sling-slingfeature-maven-plugin] branch master updated (4f7e2a9 ->
606dbe1)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-slingfeature-maven-plugin.git.
from 4f7e2a9 SLING-8870 - The number of errors per jar should be reported
new 636ba91 Removed unused imports
new 606dbe1 SLING-8900 - Rename sourceId attribute to source-ids
The 2 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.
Summary of changes:
src/it/apis-jar-invalid-javadoc/src/main/features/main.json | 2 +-
src/main/java/org/apache/sling/feature/maven/mojos/ApisJarMojo.java | 5 +----
2 files changed, 2 insertions(+), 5 deletions(-)
[sling-slingfeature-maven-plugin] 02/02: SLING-8900 - Rename
sourceId attribute to source-ids
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-slingfeature-maven-plugin.git
commit 606dbe1e9a292f4cd9e703a50bd4375b04a6ce9c
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Mon Dec 9 12:01:16 2019 +0100
SLING-8900 - Rename sourceId attribute to source-ids
---
src/it/apis-jar-invalid-javadoc/src/main/features/main.json | 2 +-
src/main/java/org/apache/sling/feature/maven/mojos/ApisJarMojo.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/it/apis-jar-invalid-javadoc/src/main/features/main.json b/src/it/apis-jar-invalid-javadoc/src/main/features/main.json
index ec0ba98..5725780 100644
--- a/src/it/apis-jar-invalid-javadoc/src/main/features/main.json
+++ b/src/it/apis-jar-invalid-javadoc/src/main/features/main.json
@@ -3,7 +3,7 @@
"bundles":[
{
"id":"org.apache.servicemix.bundles:org.apache.servicemix.bundles.xmlbeans:3.1.0_1",
- "sourceId": "org.apache.xmlbeans:xmlbeans:jar:sources:3.1.0"
+ "source-ids": "org.apache.xmlbeans:xmlbeans:jar:sources:3.1.0"
}
],
"api-regions:JSON|false": [
diff --git a/src/main/java/org/apache/sling/feature/maven/mojos/ApisJarMojo.java b/src/main/java/org/apache/sling/feature/maven/mojos/ApisJarMojo.java
index a4788c4..5f00f7e 100644
--- a/src/main/java/org/apache/sling/feature/maven/mojos/ApisJarMojo.java
+++ b/src/main/java/org/apache/sling/feature/maven/mojos/ApisJarMojo.java
@@ -116,7 +116,7 @@ import org.osgi.framework.Constants;
public class ApisJarMojo extends AbstractIncludingFeatureMojo implements ArtifactFilter {
/** Alternative ID to a source artifact. */
- private static final String SCM_ID = "sourceId";
+ private static final String SCM_ID = "source-ids";
private static final String SCM_TAG = "scm-tag";
[sling-slingfeature-maven-plugin] 01/02: Removed unused imports
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-slingfeature-maven-plugin.git
commit 636ba91d37b60ff9854c20aa4dab25567a696a28
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Mon Dec 9 11:58:06 2019 +0100
Removed unused imports
---
src/main/java/org/apache/sling/feature/maven/mojos/ApisJarMojo.java | 3 ---
1 file changed, 3 deletions(-)
diff --git a/src/main/java/org/apache/sling/feature/maven/mojos/ApisJarMojo.java b/src/main/java/org/apache/sling/feature/maven/mojos/ApisJarMojo.java
index 061a223..a4788c4 100644
--- a/src/main/java/org/apache/sling/feature/maven/mojos/ApisJarMojo.java
+++ b/src/main/java/org/apache/sling/feature/maven/mojos/ApisJarMojo.java
@@ -22,12 +22,9 @@ import java.io.FileInputStream;
import java.io.IOException;
import java.net.URL;
import java.nio.charset.StandardCharsets;
-import java.nio.file.FileVisitResult;
-import java.nio.file.FileVisitor;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
-import java.nio.file.SimpleFileVisitor;
import java.nio.file.attribute.BasicFileAttributes;
import java.util.ArrayList;
import java.util.Arrays;