Skip to content

Commit

Permalink
Add AWS SSO JARs to the Standard.AWS library (#9782)
Browse files Browse the repository at this point in the history
As reported by our users, when using the AWS SSO, our code was failing with:
```
Execution finished with an error: To use Sso related properties in the 'xyz' profile, the 'sso' service module must be on the class path.
```

This PR adds the missing JARs to fix that.

Additionally it improves the license review tool UX a bit (parts of #9122):
- sorting the report by amount of problems, so that dependencies with unresolved problems appear at the top,
- semi-automatic helper button to rename package configurations after a version bump,
- button to remove stale entries from config (files or copyrights that disappeared after update),
- button to add custom copyright notice text straight from the report UI,
- button to set a file as the license for the project (creating the `custom-license` file automatically)
- ability to filter processed projects - e.g. `openLegalReviewReport AWS` will only run on the AWS subproject - saving time processing unchanged dependencies,
- updated the license search heuristic, fixing a problem with duplicates:
- if we had dependencies `netty-http` and `netty-http2`, because of a prefix-check logic, the notices for `netty-http` would also appear again for `netty-http2`, which is not valid. I have improved the heuristic to avoid these false positives and removed them from the current report.
- WIP: button to mark a license type as reviewed (not finished in this PR).
  • Loading branch information
radeusgd authored Apr 25, 2024
1 parent 0c989c6 commit df4a7ef
Show file tree
Hide file tree
Showing 264 changed files with 3,206 additions and 1,452 deletions.
19 changes: 12 additions & 7 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,11 @@ val simpleLibraryServerTag = Tags.Tag("simple-library-server")
Global / concurrentRestrictions += Tags.limit(simpleLibraryServerTag, 1)

lazy val gatherLicenses =
taskKey[Unit]("Gathers licensing information for relevant dependencies")
taskKey[Unit](
"Gathers licensing information for relevant dependencies of all distributions"
)
gatherLicenses := {
val _ = GatherLicenses.run.value
val _ = GatherLicenses.run.toTask("").value
}
lazy val verifyLicensePackages =
taskKey[Unit](
Expand Down Expand Up @@ -165,12 +167,12 @@ GatherLicenses.licenseConfigurations := Set("compile")
GatherLicenses.configurationRoot := file("tools/legal-review")

lazy val openLegalReviewReport =
taskKey[Unit](
inputKey[Unit](
"Gathers licensing information for relevant dependencies and opens the " +
"report in review mode in the browser."
"report in review mode in the browser. Specify names of distributions to process, separated by spaces. If no names are provided, all distributions are processed."
)
openLegalReviewReport := {
val _ = gatherLicenses.value
GatherLicenses.run.evaluated
GatherLicenses.runReportServer()
}

Expand Down Expand Up @@ -466,7 +468,7 @@ val scalaCollectionCompatVersion = "2.8.1"

val antlrVersion = "4.13.0"
val awsJavaSdkV1Version = "1.12.480"
val awsJavaSdkV2Version = "2.20.78"
val awsJavaSdkV2Version = "2.25.36"
val icuVersion = "73.1"
val poiOoxmlVersion = "5.2.3"
val redshiftVersion = "2.1.0.15"
Expand Down Expand Up @@ -2983,7 +2985,10 @@ lazy val `std-aws` = project
"com.amazonaws" % "aws-java-sdk-redshift" % awsJavaSdkV1Version,
"com.amazonaws" % "aws-java-sdk-sts" % awsJavaSdkV1Version,
"software.amazon.awssdk" % "auth" % awsJavaSdkV2Version,
"software.amazon.awssdk" % "s3" % awsJavaSdkV2Version
"software.amazon.awssdk" % "bom" % awsJavaSdkV2Version,
"software.amazon.awssdk" % "s3" % awsJavaSdkV2Version,
"software.amazon.awssdk" % "sso" % awsJavaSdkV2Version,
"software.amazon.awssdk" % "ssooidc" % awsJavaSdkV2Version
),
Compile / packageBin := Def.task {
val result = (Compile / packageBin).value
Expand Down
16 changes: 0 additions & 16 deletions distribution/engine/THIRD-PARTY/com.ibm.icu.icu4j-73.1/NOTICES
Original file line number Diff line number Diff line change
@@ -1,31 +1,15 @@
<p>Copyright &copy; IBM Corporation 1999. All rights reserved.

<p>Copyright &copy; IBM Corporation 1999. All rights reserved.

Copyright (C) 1996-2004, International Business Machines Corporation and *

Copyright (C) 1996-2004, International Business Machines Corporation and *

Copyright (C) 1996-2009, Google, International Business Machines Corporation and *

Copyright (C) 1996-2009, Google, International Business Machines Corporation and *

Copyright (C) 1996-2016, International Business Machines

Copyright (C) 1996-2016, International Business Machines

Copyright (C) 2008-2016, Google Inc, International Business Machines Corporation

Copyright (C) 2008-2016, Google Inc, International Business Machines Corporation

Copyright (C) 2009 , Yahoo! Inc. *

Copyright (C) 2009 , Yahoo! Inc. *

Copyright IBM Corporation, 1996-2016. All Rights Reserved. */

Copyright IBM Corporation, 1996-2016. All Rights Reserved. */

Copyright IBM Corporation, 1997, 2000, 2005, 2007. All Rights Reserved. */

Copyright IBM Corporation, 1997, 2000, 2005, 2007. All Rights Reserved. */
1,033 changes: 514 additions & 519 deletions distribution/engine/THIRD-PARTY/org.graalvm.shadowed.icu4j-24.0.0/LICENSE

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,51 +1,25 @@
2000.01.01 copyright update [Y2K has arrived] */

2000.01.01 copyright update [Y2K has arrived] */

2000.01.01 1.06 copyright update */

2000.01.01 1.06 copyright update */

<p>Copyright &copy; IBM Corporation 1999. All rights reserved.

<p>Copyright &copy; IBM Corporation 1999. All rights reserved.

Copyright (C) 1996-2004, International Business Machines Corporation and *

Copyright (C) 1996-2004, International Business Machines Corporation and *

Copyright (C) 1996-2005, International Business Machines Corporation and *

Copyright (C) 1996-2005, International Business Machines Corporation and *

Copyright (C) 1996-2007, International Business Machines Corporation and *

Copyright (C) 1996-2007, International Business Machines Corporation and *

Copyright (C) 1996-2009, Google, International Business Machines Corporation and *

Copyright (C) 1996-2009, Google, International Business Machines Corporation and *

Copyright (C) 1996-2009, International Business Machines Corporation and *

Copyright (C) 1996-2009, International Business Machines Corporation and *

Copyright (C) 1996-2015, Google, Inc., International Business Machines Corporation and

Copyright (C) 1996-2015, Google, Inc., International Business Machines Corporation and

Copyright (C) 1996-2015, International Business Machines

Copyright (C) 1996-2015, International Business Machines

Copyright (C) 2009 , Yahoo! Inc. *

Copyright (C) 2009 , Yahoo! Inc. *

Copyright IBM Corporation, 1996-2016. All Rights Reserved. */

Copyright IBM Corporation, 1996-2016. All Rights Reserved. */

Copyright IBM Corporation, 1997, 2000, 2005, 2007. All Rights Reserved. */

Copyright IBM Corporation, 1997, 2000, 2005, 2007. All Rights Reserved. */
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.

Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
Loading

0 comments on commit df4a7ef

Please sign in to comment.