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 2022/06/07 08:36:02 UTC
[sling-org-apache-sling-resource-inventory] branch master updated: SLING-11370: Sling update to 47 (#1)
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-org-apache-sling-resource-inventory.git
The following commit(s) were added to refs/heads/master by this push:
new 148897c SLING-11370: Sling update to 47 (#1)
148897c is described below
commit 148897c7bcea370bf7ddcbbd59e6eed3348fd0e4
Author: Ashok Pelluru <37...@users.noreply.github.com>
AuthorDate: Tue Jun 7 10:35:58 2022 +0200
SLING-11370: Sling update to 47 (#1)
---
pom.xml | 44 ++++++++++------------
.../impl/ResourceInventoryPrinterFactory.java | 1 -
2 files changed, 20 insertions(+), 25 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9ca364d..11f948f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,15 +22,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.sling</groupId>
- <artifactId>sling</artifactId>
- <version>30</version>
+ <artifactId>sling-bundle-parent</artifactId>
+ <version>47</version>
<relativePath />
</parent>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.resource.inventory</artifactId>
<version>1.0.9-SNAPSHOT</version>
- <packaging>bundle</packaging>
<name>Apache Sling Inventory Printer Based on Resources</name>
@@ -38,35 +37,24 @@
<connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resource-inventory.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resource-inventory.git</developerConnection>
<url>https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-resource-inventory.git</url>
+ <tag>HEAD</tag>
</scm>
+ <properties>
+ <sling.java.version>8</sling.java.version>
+ <project.build.outputTimestamp>1</project.build.outputTimestamp>
+ </properties>
+
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Private-Package>
- org.apache.sling.resource.inventory.impl
- </Private-Package>
- </instructions>
- </configuration>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
<dependencies>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr.annotations</artifactId>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
@@ -99,6 +87,14 @@
<version>3.0</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.metatype.annotations</artifactId>
+ </dependency>
<!-- TESTING -->
<dependency>
@@ -109,8 +105,8 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>1.9.5</version>
+ <artifactId>mockito-core</artifactId>
+ <version>4.6.0</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/src/main/java/org/apache/sling/resource/inventory/impl/ResourceInventoryPrinterFactory.java b/src/main/java/org/apache/sling/resource/inventory/impl/ResourceInventoryPrinterFactory.java
index 347619e..444e15c 100644
--- a/src/main/java/org/apache/sling/resource/inventory/impl/ResourceInventoryPrinterFactory.java
+++ b/src/main/java/org/apache/sling/resource/inventory/impl/ResourceInventoryPrinterFactory.java
@@ -23,7 +23,6 @@ import java.io.StringWriter;
import javax.json.Json;
import javax.json.JsonException;
-import javax.json.stream.JsonGenerator;
import org.apache.felix.inventory.Format;
import org.apache.felix.inventory.InventoryPrinter;