Skip to content

Commit 40045bf

Browse files
authored
fix: Handle incompatible license in dependencies (#889)
Co-authored-by: Roshin Rajan Panackal <roshin.rajan.panackal@sap.com>
1 parent f849274 commit 40045bf

2 files changed

Lines changed: 10 additions & 1 deletion

File tree

.github/dependabot.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,15 @@ updates:
3636
- dependency-name: 'com.github.ekryd.sortpom:sortpom-maven-plugin'
3737
# used by deprecated code only, not worth updating for now
3838
- dependency-name: 'org.apache.axis2:*'
39+
# Ignore problematic license versions
40+
- dependency-name: 'com.sap.cloud.security:java-security'
41+
versions: ['3.6.1', '3.6.2']
42+
- dependency-name: 'com.sap.cloud.security.xsuaa:token-client'
43+
versions: ['3.6.1', '3.6.2']
44+
- dependency-name: 'com.sap.cloud.security:java-api'
45+
versions: ['3.6.1', '3.6.2']
46+
- dependency-name: 'com.sap.cloud.security:env'
47+
versions: ['3.6.1', '3.6.2']
3948

4049
# archetype updates
4150
# Dependabot seems to be unable to handle those, so this is disabled for now

dependency-bundles/bom/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<!-- XSUAA -->
5252
<!-- Keep this version consistent with the one from the SAP Java Buildpack (after their 2.0 release) -->
5353
<!-- see https://github.wdf.sap.corp/xs2-java/xs-java-buildpack/blob/master/resources/pom.xml -->
54-
<scp-cf.xsuaa-client.version>3.6.2</scp-cf.xsuaa-client.version>
54+
<scp-cf.xsuaa-client.version>3.6.0</scp-cf.xsuaa-client.version>
5555
<java-jwt.version>4.5.0</java-jwt.version>
5656
<!-- Utility stuff -->
5757
<slf4j.version>2.0.17</slf4j.version>

0 commit comments

Comments
 (0)