You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2022/10/19 12:36:18 UTC
[sling-org-apache-sling-commons-content-analyzing] branch master updated (a72e56e -> 859b102)
This is an automated email from the ASF dual-hosted git repository.
olli pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-content-analyzing.git
from a72e56e SLING-11051 - Fixing JavaDoc badge
new b840c97 disable dependabot
new 2e1e933 build with Java 11 and 17
new e16c789 update build plugins
new bb8be99 SLING-11348 Support rereading of content
new 868d92b SLING-11625 Make report thread safe
new 859b102 SLING-11350 Update to Sling Bundle Parent 49
The 6 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:
.asf.yaml | 3 +++
.sling-module.json | 2 +-
pom.xml | 14 +++++++-------
.../sling/commons/content/analyzing/ContentAnalyzer.java | 6 ++++--
.../sling/commons/content/analyzing/package-info.java | 2 +-
5 files changed, 16 insertions(+), 11 deletions(-)
create mode 100644 .asf.yaml
[sling-org-apache-sling-commons-content-analyzing] 05/06: SLING-11625 Make report thread safe
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-content-analyzing.git
commit 868d92b3eff653f77551a54707c26f29520c8d5f
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Wed Oct 19 14:34:40 2022 +0200
SLING-11625 Make report thread safe
---
.../org/apache/sling/commons/content/analyzing/ContentAnalyzer.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/sling/commons/content/analyzing/ContentAnalyzer.java b/src/main/java/org/apache/sling/commons/content/analyzing/ContentAnalyzer.java
index bec9ce8..7c1e5a5 100644
--- a/src/main/java/org/apache/sling/commons/content/analyzing/ContentAnalyzer.java
+++ b/src/main/java/org/apache/sling/commons/content/analyzing/ContentAnalyzer.java
@@ -21,6 +21,7 @@ package org.apache.sling.commons.content.analyzing;
import java.io.InputStream;
import java.util.Map;
import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ConcurrentMap;
import java.util.function.Supplier;
import org.jetbrains.annotations.NotNull;
@@ -41,6 +42,6 @@ public interface ContentAnalyzer {
* @param report the report to which the findings of the analyzing operation are added
* @return {@link java.util.concurrent.CompletableFuture} for signaling completion
*/
- public abstract @NotNull CompletableFuture<Void> analyze(@NotNull final Supplier<InputStream> input, @Nullable final Map<String, Object> parameters, @NotNull final Map<String, Object> report);
+ public abstract @NotNull CompletableFuture<Void> analyze(@NotNull final Supplier<InputStream> input, @Nullable final Map<String, Object> parameters, @NotNull final ConcurrentMap<String, Object> report);
}
[sling-org-apache-sling-commons-content-analyzing] 03/06: update build plugins
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-content-analyzing.git
commit e16c7890da0e7469a90249e09977dea8fb87bd5a
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Wed Oct 19 14:20:25 2022 +0200
update build plugins
---
pom.xml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index fa0547e..4ac9607 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,12 +58,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>3.1.2</version>
+ <version>3.2.0</version>
<dependencies>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
- <version>9.0.1</version>
+ <version>10.3.4</version>
</dependency>
<dependency>
<groupId>de.bildschirmarbeiter</groupId>
@@ -86,7 +86,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <version>3.14.0</version>
+ <version>3.19.0</version>
<configuration>
<targetJdk>${sling.java.version}</targetJdk>
<excludeFromFailureFile>pmd-exclude.properties</excludeFromFailureFile>
@@ -103,13 +103,13 @@
<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
- <version>4.3.0</version>
+ <version>4.7.2.0</version>
<configuration>
<plugins>
<plugin>
<groupId>com.h3xstream.findsecbugs</groupId>
<artifactId>findsecbugs-plugin</artifactId>
- <version>1.11.0</version>
+ <version>1.12.0</version>
</plugin>
</plugins>
</configuration>
[sling-org-apache-sling-commons-content-analyzing] 02/06: build with Java 11 and 17
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-content-analyzing.git
commit 2e1e9339443d5191c42a8f1fd60c8f2eb7654fbe
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Wed Oct 19 13:57:23 2022 +0200
build with Java 11 and 17
---
.sling-module.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.sling-module.json b/.sling-module.json
index 0e603c0..3f2b4e4 100644
--- a/.sling-module.json
+++ b/.sling-module.json
@@ -1,7 +1,7 @@
{
"jenkins": {
"jdks": [
- 14,
+ 17,
11
]
}
[sling-org-apache-sling-commons-content-analyzing] 04/06: SLING-11348 Support rereading of content
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-content-analyzing.git
commit bb8be996cf001dd6c6eef701f3284c13d849f494
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Wed Oct 19 14:32:32 2022 +0200
SLING-11348 Support rereading of content
---
pom.xml | 2 +-
.../org/apache/sling/commons/content/analyzing/ContentAnalyzer.java | 5 +++--
.../org/apache/sling/commons/content/analyzing/package-info.java | 2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 4ac9607..3494923 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
</parent>
<artifactId>org.apache.sling.commons.content.analyzing</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<name>Apache Sling Commons Content Analyzing</name>
<description>Apache Sling Commons Content Analyzing</description>
diff --git a/src/main/java/org/apache/sling/commons/content/analyzing/ContentAnalyzer.java b/src/main/java/org/apache/sling/commons/content/analyzing/ContentAnalyzer.java
index c169c8d..bec9ce8 100644
--- a/src/main/java/org/apache/sling/commons/content/analyzing/ContentAnalyzer.java
+++ b/src/main/java/org/apache/sling/commons/content/analyzing/ContentAnalyzer.java
@@ -21,6 +21,7 @@ package org.apache.sling.commons.content.analyzing;
import java.io.InputStream;
import java.util.Map;
import java.util.concurrent.CompletableFuture;
+import java.util.function.Supplier;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -35,11 +36,11 @@ public interface ContentAnalyzer {
/**
* Analyzes the given content.
*
- * @param input the stream from which the content is read for analyzing
+ * @param input the supplier of the stream from which the content is read for analyzing
* @param parameters the parameters for the analyzing operation
* @param report the report to which the findings of the analyzing operation are added
* @return {@link java.util.concurrent.CompletableFuture} for signaling completion
*/
- public abstract @NotNull CompletableFuture<Void> analyze(@NotNull final InputStream input, @Nullable final Map<String, Object> parameters, @NotNull final Map<String, Object> report);
+ public abstract @NotNull CompletableFuture<Void> analyze(@NotNull final Supplier<InputStream> input, @Nullable final Map<String, Object> parameters, @NotNull final Map<String, Object> report);
}
diff --git a/src/main/java/org/apache/sling/commons/content/analyzing/package-info.java b/src/main/java/org/apache/sling/commons/content/analyzing/package-info.java
index 5af87b0..0330a26 100644
--- a/src/main/java/org/apache/sling/commons/content/analyzing/package-info.java
+++ b/src/main/java/org/apache/sling/commons/content/analyzing/package-info.java
@@ -20,7 +20,7 @@
/**
* Provides the Apache Sling Commons Content Analyzing API.
*/
-@Version("1.0.0")
+@Version("2.0.0")
package org.apache.sling.commons.content.analyzing;
import org.osgi.annotation.versioning.Version;
[sling-org-apache-sling-commons-content-analyzing] 01/06: disable dependabot
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-content-analyzing.git
commit b840c97b2077759be6a93fec894fe89fcb3559dc
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Wed Oct 19 13:57:01 2022 +0200
disable dependabot
---
.asf.yaml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/.asf.yaml b/.asf.yaml
new file mode 100644
index 0000000..d4d0dd5
--- /dev/null
+++ b/.asf.yaml
@@ -0,0 +1,3 @@
+github:
+ dependabot_alerts: false
+ dependabot_updates: false
[sling-org-apache-sling-commons-content-analyzing] 06/06: SLING-11350 Update to Sling Bundle Parent 49
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-content-analyzing.git
commit 859b102b1ec07690b3ba6464297de3575e5cae99
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Wed Oct 19 14:35:05 2022 +0200
SLING-11350 Update to Sling Bundle Parent 49
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 3494923..0218b85 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling-bundle-parent</artifactId>
- <version>46</version>
+ <version>49</version>
<relativePath />
</parent>