You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2022/04/26 10:20:19 UTC
[sling-org-apache-sling-query] 01/01: Merge branch 'master' into feature/SLING-9600
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch feature/SLING-9600
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-query.git
commit c377834272dd4ef4e0f67bfac20bf3746e62c6f0
Merge: 6cf0b13 d13fd08
Author: Stefan Seifert <st...@users.noreply.github.com>
AuthorDate: Tue Apr 26 12:15:54 2022 +0200
Merge branch 'master' into feature/SLING-9600
README.md | 4 ++--
pom.xml | 28 ++++++++++++----------
.../org/apache/sling/query/api/package-info.java | 2 +-
.../java/org/apache/sling/query/package-info.java | 2 +-
4 files changed, 19 insertions(+), 17 deletions(-)
diff --cc pom.xml
index ccd07eb,e4c1483..d9ecd3b
--- a/pom.xml
+++ b/pom.xml
@@@ -43,25 -43,27 +43,27 @@@
<properties>
<sling.java.version>8</sling.java.version>
+ <project.build.outputTimestamp>2022-04-26T00:00:00Z</project.build.outputTimestamp>
</properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.annotation.versioning</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
<!-- commons -->
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.9</version>
<scope>provided</scope>
- <version>2.5</version>
</dependency>
<!-- sling -->