You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by kw...@apache.org on 2023/07/14 14:44:57 UTC
[sling-org-apache-sling-servlets-annotations] branch feature/update-parent created (now 570d521)
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a change to branch feature/update-parent
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-annotations.git
at 570d521 Update parent to 51 to build with Java 17
This branch includes the following new commits:
new 570d521 Update parent to 51 to build with Java 17
The 1 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.
[sling-org-apache-sling-servlets-annotations] 01/01: Update parent to 51 to build with Java 17
Posted by kw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch feature/update-parent
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-annotations.git
commit 570d52154f8b604b20769a431cc281eaac70baa0
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Fri Jul 14 16:44:15 2023 +0200
Update parent to 51 to build with Java 17
Cleanup of ITs pom.xml
---
pom.xml | 10 +---------
src/it/annotations-it/pom.xml | 32 ++++----------------------------
src/it/annotations-it/verify.groovy | 2 +-
3 files changed, 6 insertions(+), 38 deletions(-)
diff --git a/pom.xml b/pom.xml
index df4b62d..cac2536 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>43</version>
+ <version>51</version>
<relativePath />
</parent>
@@ -44,7 +44,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
- <version>3.2.1</version>
<configuration>
<debug>false</debug>
<projectsDirectory>src/it</projectsDirectory>
@@ -58,13 +57,6 @@
<!-- this causes verbose output, probably good to have for CI builds? -->
<streamLogs>true</streamLogs>
</configuration>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy</artifactId>
- <version>3.0.6</version>
- </dependency>
- </dependencies>
<executions>
<execution>
<id>integration-test</id>
diff --git a/src/it/annotations-it/pom.xml b/src/it/annotations-it/pom.xml
index 427fedc..0f430a3 100644
--- a/src/it/annotations-it/pom.xml
+++ b/src/it/annotations-it/pom.xml
@@ -15,8 +15,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.sling</groupId>
- <artifactId>sling</artifactId>
- <version>33</version>
+ <artifactId>sling-bundle-parent</artifactId>
+ <version>51</version>
<relativePath/>
</parent>
@@ -41,35 +41,11 @@
<plugins>
<plugin>
<groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-maven-plugin</artifactId>
- <version>5.0.0</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <version>3.0.0-M5</version>
- <executions>
- <execution>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
+ <artifactId>bnd-baseline-maven-plugin</artifactId>
<configuration>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- <!-- pax exam bug, often times out at exit -->
- <forkedProcessExitTimeoutInSeconds>1</forkedProcessExitTimeoutInSeconds>
- <systemPropertyVariables>
- <bundle.filename>${bundle.filename}</bundle.filename>
- <pax.vm.options>${pax.vm.options}</pax.vm.options>
- </systemPropertyVariables>
+ <skip>true</skip>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.servicemix.tooling</groupId>
- <artifactId>depends-maven-plugin</artifactId>
- </plugin>
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
diff --git a/src/it/annotations-it/verify.groovy b/src/it/annotations-it/verify.groovy
index 637b595..6f0dfa8 100644
--- a/src/it/annotations-it/verify.groovy
+++ b/src/it/annotations-it/verify.groovy
@@ -17,7 +17,7 @@
// Verify the OSGI-INF xml files generated by the bnd plugin based
// on our annotations
-
+import groovy.xml.XmlSlurper
def INVALID_CONFIG = 'Configuration is invalid'
// Utility functions