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 2021/10/27 13:48:27 UTC
[sling-org-apache-sling-clam] branch master updated (a2ad6f1 ->
429833b)
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-clam.git.
from a2ad6f1 SLING-10676 - remove SECURITY.md which is not needed
new 4d51a32 SLING-9710 Provide a Mail Sending Scan Result Handler
new 496b176 fix javadoc.io doc link
new db15156 update test dependencies
new c16b4f9 SLING-10879 Support all JCR property types
new 1c2a198 use working Docker image
new 429833b SLING-10886 Update to Sling Bundle Parent 46
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:
README.md | 2 +-
pom.xml | 20 ++++++++++----------
.../job/internal/JcrPropertyScanJobConsumer.java | 11 ++++-------
.../sling/clam/it/support/ClamContainerFactory.java | 2 +-
4 files changed, 16 insertions(+), 19 deletions(-)
[sling-org-apache-sling-clam] 03/06: update test dependencies
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-clam.git
commit db1515627e67d65a60c99b92d515077aa8ffba8a
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Wed Oct 27 15:33:34 2021 +0200
update test dependencies
---
pom.xml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index 4b65d34..19deadb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -182,7 +182,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
- <version>6.0.3</version>
+ <version>7.0.1</version>
<scope>test</scope>
</dependency>
<!-- Apache Jackrabbit -->
@@ -305,19 +305,19 @@
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
- <version>4.1.0</version>
+ <version>4.1.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
- <version>1.15.3</version>
+ <version>1.16.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.icegreen</groupId>
<artifactId>greenmail</artifactId>
- <version>1.5.11</version>
+ <version>1.6.5</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -353,7 +353,7 @@
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-wrap</artifactId>
- <version>2.6.2</version>
+ <version>2.6.7</version>
<scope>test</scope>
</dependency>
<!-- testing – truth and dependencies -->
@@ -366,7 +366,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>30.1.1-jre</version>
+ <version>31.0.1-jre</version>
<scope>test</scope>
</dependency>
<dependency>
[sling-org-apache-sling-clam] 01/06: SLING-9710 Provide a Mail
Sending Scan Result Handler
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-clam.git
commit 4d51a3215fbe9b064d127fd7c607dd2132547424
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Wed Oct 27 15:03:29 2021 +0200
SLING-9710 Provide a Mail Sending Scan Result Handler
update Thymeleaf
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index ef57ef8..4b65d34 100644
--- a/pom.xml
+++ b/pom.xml
@@ -275,7 +275,7 @@
<dependency>
<groupId>org.thymeleaf</groupId>
<artifactId>thymeleaf</artifactId>
- <version>3.0.11.RELEASE</version>
+ <version>3.0.12.RELEASE</version>
<scope>provided</scope>
</dependency>
<!-- nullability -->
[sling-org-apache-sling-clam] 04/06: SLING-10879 Support all JCR
property types
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-clam.git
commit c16b4f9f1b5010420d675eb285ce8a82eeb2ffc6
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Wed Oct 27 15:44:16 2021 +0200
SLING-10879 Support all JCR property types
---
.../sling/clam/job/internal/JcrPropertyScanJobConsumer.java | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/apache/sling/clam/job/internal/JcrPropertyScanJobConsumer.java b/src/main/java/org/apache/sling/clam/job/internal/JcrPropertyScanJobConsumer.java
index a0bbcfa..9a9c1ad 100644
--- a/src/main/java/org/apache/sling/clam/job/internal/JcrPropertyScanJobConsumer.java
+++ b/src/main/java/org/apache/sling/clam/job/internal/JcrPropertyScanJobConsumer.java
@@ -121,13 +121,10 @@ public class JcrPropertyScanJobConsumer implements JobConsumer {
private InputStream getInputStream(final Value value) throws Exception {
final int propertyType = value.getType();
- switch (propertyType) {
- case PropertyType.BINARY:
- return value.getBinary().getStream();
- case PropertyType.STRING:
- return IOUtils.toInputStream(value.getString(), StandardCharsets.UTF_8);
- default:
- throw new Exception("Unsupported property type: " + PropertyType.nameFromValue(propertyType));
+ if (propertyType == PropertyType.BINARY) {
+ return value.getBinary().getStream();
+ } else {
+ return IOUtils.toInputStream(value.getString(), StandardCharsets.UTF_8);
}
}
[sling-org-apache-sling-clam] 05/06: use working Docker image
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-clam.git
commit 1c2a1984def34d328d1fc95ae6bdb2518f209948
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Wed Oct 27 15:44:52 2021 +0200
use working Docker image
---
.../java/org/apache/sling/clam/it/support/ClamContainerFactory.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/test/java/org/apache/sling/clam/it/support/ClamContainerFactory.java b/src/test/java/org/apache/sling/clam/it/support/ClamContainerFactory.java
index 42c1e9a..1dd797d 100644
--- a/src/test/java/org/apache/sling/clam/it/support/ClamContainerFactory.java
+++ b/src/test/java/org/apache/sling/clam/it/support/ClamContainerFactory.java
@@ -24,7 +24,7 @@ import org.testcontainers.containers.GenericContainer;
public class ClamContainerFactory {
- private static final String CLAM_CONTAINER_IMAGE_NAME = "mk0x/docker-clamav:alpine";
+ private static final String CLAM_CONTAINER_IMAGE_NAME = "mk0x/docker-clamav";
public static GenericContainer container = new GenericContainer<>(CLAM_CONTAINER_IMAGE_NAME)
.withExposedPorts(3310)
[sling-org-apache-sling-clam] 02/06: fix javadoc.io doc link
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-clam.git
commit 496b176208f361d82c617123b839565587c677f5
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Wed Oct 27 15:17:56 2021 +0200
fix javadoc.io doc link
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index d7373ec..178d243 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
[](https://sling.apache.org)
- [](https://ci-builds.apache.org/job/Sling/job/modules/job/sling-org-apache-sling-clam/job/master/) [](https://ci-builds.apache.org/job/Sling/job/modules/job/sling-org-apache-sling-clam/job/master/test/?wi [...]
+ [](https://ci-builds.apache.org/job/Sling/job/modules/job/sling-org-apache-sling-clam/job/master/) [](https://ci-builds.apache.org/job/Sling/job/modules/job/sling-org-apache-sling-clam/job/master/test/?wi [...]
# Apache Sling Clam
[sling-org-apache-sling-clam] 06/06: SLING-10886 Update to Sling
Bundle Parent 46
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-clam.git
commit 429833b6654dab77f8fa628b50025edb708fd78a
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Wed Oct 27 15:46:03 2021 +0200
SLING-10886 Update to Sling Bundle Parent 46
---
pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 19deadb..97f8430 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling-bundle-parent</artifactId>
- <version>43</version>
+ <version>46</version>
<relativePath />
</parent>
@@ -35,9 +35,9 @@
<description>Support for scanning Sling's repository data with Clam service</description>
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<sling.java.version>8</sling.java.version>
+ <javadoc.excludePackageNames/>
+ <project.build.outputTimestamp>1970-01-01T00:00:00Z</project.build.outputTimestamp>
<org.ops4j.pax.exam.version>4.13.3</org.ops4j.pax.exam.version>
</properties>