You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cr...@apache.org on 2021/04/05 22:18:23 UTC
[sling-whiteboard] 01/02: updated pom.xml with dependency version
ranges
This is an automated email from the ASF dual-hosted git repository.
cris pushed a commit to branch SLING-10193/test-coverage
in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git
commit 67b48480d0271bbf64df1c15e1846eb58c6e3627
Author: Cris Rockwell, College of LSA University of Michigan <cm...@umich.edu>
AuthorDate: Mon Apr 5 18:17:33 2021 -0400
updated pom.xml with dependency version ranges
---
saml-handler/bnd.bnd | 1 -
saml-handler/pom.xml | 18 ++++++++++++------
2 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/saml-handler/bnd.bnd b/saml-handler/bnd.bnd
index f28134f..39488d7 100644
--- a/saml-handler/bnd.bnd
+++ b/saml-handler/bnd.bnd
@@ -8,7 +8,6 @@ Import-Package:!com.beust*,!antlr*,!org.apache.log.*,!org.apache.oro.text.perl*,
!org.apache.tools.ant.*,!org.jdom*,!com.sun.org.apache.xerces.internal*,!sun.io,!org.bouncycastle.*,!javax.xml.bind.*,\
!com.werken.xpath.*,!org.apache.xml.dtm.*,!org.apache.xml.utils.*,!org.apache.xpath.*,\
!junit.framework*,!org.dom4j.*,!com.sun.msv.*,!sun.misc,javax.annotation;version=0.0.0,!org.relaxng.datatype.*,*
-Export-Package:org.apache.jackrabbit.oak.spi.security.authentication.external.*
-removeheaders: Include-Resource, Private-Package
-includeresource:\
metrics-core-[0-9\.]+.jar;lib:=true,\
diff --git a/saml-handler/pom.xml b/saml-handler/pom.xml
index d165e2e..825f311 100644
--- a/saml-handler/pom.xml
+++ b/saml-handler/pom.xml
@@ -36,6 +36,8 @@
<bnd.baseline.skip>true</bnd.baseline.skip>
<powermock.version>2.0.9</powermock.version>
<exam.version>4.13.3</exam.version>
+ <maven.compiler.source>1.11</maven.compiler.source>
+ <maven.compiler.target>1.11</maven.compiler.target>
<pax.vm.options>
-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5015
</pax.vm.options>
@@ -59,8 +61,8 @@ which is licensed under the Apache-2.0 license.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>9</source>
- <target>9</target>
+ <source>11</source>
+ <target>11</target>
</configuration>
</plugin>
<plugin>
@@ -70,6 +72,7 @@ which is licensed under the Apache-2.0 license.
<excludes combine.children="append">
<exclude>**/dependency-reduced-pom.xml</exclude>
<exclude>**/*.vm</exclude>
+ <exclude>src/test/resources/*</exclude>
</excludes>
</configuration>
</plugin>
@@ -318,7 +321,8 @@ which is licensed under the Apache-2.0 license.
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
- <version>[2.16.2,2.20.0]</version>
+<!-- <version>[2.16.2,2.20.0]</version>-->
+ <version>[2.16.2,2.23.0]</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -329,15 +333,17 @@ which is licensed under the Apache-2.0 license.
</dependency>
<!--
-Export-Package:org.apache.jackrabbit.oak.spi.security.authentication.external.*
+this was removed from bnd.bnd
+because it became difficult manage a version range while using a specific version in IT tests
+Export-Package:org.apache.jackrabbit.oak.spi.security.authentication.external.*
-->
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-auth-external</artifactId>
- <version>[1.32]</version>
+ <version>[1.32.0,1.38.0]</version>
+ <scope>provided</scope>
</dependency>
-
<!-- Apache Commons -->
<dependency>
<groupId>org.apache.commons</groupId>