[sling-org-apache-sling-launchpad-integration-tests] branch master updated: SLING-9327 - adapt pom so that test work in jdk11, with minimal changes

[bd...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

bdelacretaz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-integration-tests.git


The following commit(s) were added to refs/heads/master by this push:
     new 49e5c94  SLING-9327 - adapt pom so that test work in jdk11, with minimal changes
49e5c94 is described below

commit 49e5c948a0115566f778a5696e7f3df45e5dd3f5
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Thu Apr 2 11:05:16 2020 +0200

    SLING-9327 - adapt pom so that test work in jdk11, with minimal changes
---
 pom.xml | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9d781e3..507c0e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.sling</groupId>
     <artifactId>sling</artifactId>
-    <version>26</version>
+    <version>29</version>
     <relativePath />
   </parent>
 
@@ -77,7 +77,20 @@
                     </excludes>
                 </configuration>
             </plugin>        
-      </plugins>
+            <plugin>
+              <artifactId>maven-antrun-plugin</artifactId>
+              <configuration>
+                <skip>true</skip>
+              </configuration>
+            </plugin>
+            <plugin>
+              <groupId>org.codehaus.mojo</groupId>
+              <artifactId>animal-sniffer-maven-plugin</artifactId>
+              <configuration>
+                <skip>true</skip>
+              </configuration>
+            </plugin>
+    </plugins>
   </build>
   
   <profiles>
@@ -164,6 +177,8 @@
     <dependency>
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.scr.annotations</artifactId>
+        <version>1.9.12</version>
+        <scope>compile</scope>
     </dependency>
 
 
@@ -233,6 +248,8 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
+      <version>2.4</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
         <groupId>org.osgi</groupId>