Skip to content

Commit

Permalink
Merge dev into main
Browse files Browse the repository at this point in the history 
Signed-off-by: spark-rapids automation <[email protected]>
  • Loading branch information
@nvauto
nvauto committed Sep 3, 2024
2 parents 0a70190 + d9b7a52 commit a8bc74b
Show file tree
Hide file tree
Showing 94 changed files with 1,129 additions and 5,174 deletions.
150 changes: 0 additions & 150 deletions LICENSE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,156 +204,6 @@
MIT License
-----------

Boostrap V4.6.1
bootstrap.bundle.min.js
bootstrap.min.css

The MIT License (MIT)

Copyright (c) 2011-2019 Twitter, Inc.
Copyright (c) 2011-2019 The Bootstrap Authors

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.


DataTables
DataTables-1.12.0/jquery.dataTables.min.js
DataTables-1.12.0/dataTables.bootstrap4.min.css
DataTables-1.12.0/dataTables.bootstrap4.min.js
searchpanes-2.0.1/searchPanes.bootstrap4.min.css
searchpanes-2.0.1/searchPanes.bootstrap4.min.js
searchpanes-2.0.1/dataTables.searchPanes.min.js
select-1.4.0/select.bootstrap4.min.css
select-1.4.0/dataTables.select.min.js
buttons-2.2.3/buttons.bootstrap4.min.css
buttons-2.2.3/buttons.bootstrap4.min.js
buttons-2.2.3/buttons.html5.min.js
buttons-2.2.3/dataTables.buttons.min.js
responsive-2.3.0/dataTables.responsive.min.js
responsive-2.3.0/responsive.bootstrap4.min.css
responsive-2.3.0/responsive.bootstrap4.min.js

The MIT License (MIT)

Copyright (C) 2008-2022, SpryMedia Ltd.

Permission is hereby granted, free of charge, to any person obtaining a copy of this software
and associated documentation files (the "Software"), to deal in the Software without
restriction, including without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or
substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

jQuery V3.6.0
jquery.min.js

Copyright JS Foundation and other contributors, https://js.foundation/

This software consists of voluntary contributions made by many
individuals. For exact contribution history, see the revision history
available at https://github.com/jquery/sizzle

The following license applies to all parts of this software except as
documented below:

====

Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:

The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

====

All files located in the node_modules and external directories are
externally maintained libraries used by this software which have their
own licenses; we recommend you read them, as their terms may differ from
the terms above.

Mustache.js V4.10
mustache.min.js

The MIT License

Copyright (c) 2009 Chris Wanstrath (Ruby)
Copyright (c) 2010-2014 Jan Lehnardt (JavaScript)
Copyright (c) 2010-2015 The mustache.js community

Permission is hereby granted, free of charge, to any person obtaining a copy of this software
and associated documentation files (the "Software"), to deal in the Software without
restriction, including without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or
substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Spur Dashboard V1.1.0
spur.min.css

The MIT License (MIT)

Copyright 2018 Alexander Rechsteiner

Permission is hereby granted, free of charge, to any person obtaining a copy of this software
and associated documentation files (the "Software"), to deal in the Software without
restriction, including without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or
substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

jsoup License

The MIT License
Expand Down
25 changes: 1 addition & 24 deletions NOTICE-binary
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Spark Rapids Tools
Copyright (c) 2023, NVIDIA CORPORATION
Copyright (c) 2023-2024, NVIDIA CORPORATION

// ------------------------------------------------------------------
// NOTICE file corresponding to the section 4d of The Apache License,
Expand All @@ -17,29 +17,6 @@ snakeyaml
---------------------------------------------------------------------
This product bundles various third-party components under other open source licenses.

Boostrap V4.6.1 - The MIT License (MIT)
License Text ( https://github.com/twbs/bootstrap/blob/v4.6.1/LICENSE )
Copyright (c) 2011-2021 Twitter, Inc.
Copyright (c) 2011-2021 The Bootstrap Authors

DataTablesSrc V1.12 - The MIT License (MIT)
License Text ( https://datatables.net/license/ )
Copyright (C) 2008-present, SpryMedia Ltd.

jQuery V3.6.0 - The MIT License (MIT)
License Text ( https://jquery.org/license/ )
Copyright OpenJS Foundation and other contributors, https://openjsf.org/

Mustache.js V4.10 - The MIT License (MIT)
License Text ( https://github.com/janl/mustache.js/blob/master/LICENSE )
Copyright (c) 2009 Chris Wanstrath (Ruby)
Copyright (c) 2010-2014 Jan Lehnardt (JavaScript)
Copyright (c) 2010-2015 The mustache.js community

Spur Dashboard V1.1.0 - The MIT License (MIT)
License Text ( https://github.com/HackerThemes/spur-template/blob/master/LICENSE )
Copyright 2016 - 2019 Alexander Rechsteiner

jsoup - The MIT License (MIT)
License Text ( https://jsoup.org/license )
Copyright (c) 2009 - 2023 Jonathan Hedley (https://jsoup.org/)
Expand Down
4 changes: 0 additions & 4 deletions core/.gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,5 @@
*.iml
target
event_log_profiling.log
## ignore qual-ui static files
**/ui/assets/
**/ui-dependencies-cache/
**/ui/js/data-output.js
## ignore output folders of the test scripts
**/dev/qualification-output/
65 changes: 1 addition & 64 deletions core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<artifactId>rapids-4-spark-tools_2.12</artifactId>
<name>RAPIDS Accelerator for Apache Spark tools</name>
<description>RAPIDS Accelerator for Apache Spark tools</description>
<version>24.08.0</version>
<version>24.08.1-SNAPSHOT</version>
<packaging>jar</packaging>
<url>http://github.com/NVIDIA/spark-rapids-tools</url>

Expand Down Expand Up @@ -472,10 +472,6 @@
<scalatest.version>3.0.5</scalatest.version>
<spark.version.classifier>spark${buildver}</spark.version.classifier>
<target.classifier>${spark.version.classifier}</target.classifier>
<ui.cache.dir>${project.build.directory}/ui-dependencies-cache</ui.cache.dir>
<ui.resources.relative>src/main/resources/ui</ui.resources.relative>
<ui.resources.dir>${project.basedir}/${ui.resources.relative}</ui.resources.dir>
<ui.resources.external.folder>assets</ui.resources.external.folder>
<maven.jar.plugin.version>3.2.0</maven.jar.plugin.version>
<maven.source.plugin.version>3.0.0</maven.source.plugin.version>
<maven.artifact.version>3.9.0</maven.artifact.version>
Expand Down Expand Up @@ -786,40 +782,6 @@
<!-- parent-pom only executions -->
<inherited>false</inherited>
<executions>
<execution>
<id>download-ui-dependencies</id>
<phase>generate-sources</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<property name="project.basedir" value="${project.basedir}"/>
<property name="project.build.directory"
value="${project.build.directory}"/>
<property name="project.cache.dir" value="${ui.cache.dir}"/>
<property name="project.ui.root" value="${ui.resources.dir}"/>
<property name="project.ui.output"
value="${ui.resources.dir}/${ui.resources.external.folder}"/>
<property name="lib.bootstrap.url"
value="https://github.com/twbs/bootstrap/releases/download/v4.6.1/bootstrap-4.6.1-dist.zip"/>
<property name="lib.bootstrap.dir" value="bootstrap"/>
<property name="lib.jquery.dir" value="jquery"/>
<property name="lib.jquery.url"
value="https://github.com/jquery/jquery/archive/refs/tags/3.6.0.zip"/>
<property name="lib.mustache.dir" value="mustache-js"/>
<property name="lib.mustache.url"
value="https://github.com/janl/mustache.js/archive/refs/tags/v4.1.0.zip"/>
<property name="lib.spur.dir" value="spur"/>
<property name="lib.spur.url"
value="https://github.com/HackerThemes/spur-template/archive/refs/heads/master.zip"/>
<property name="lib.datatables.url.domain"
value="https://cdn.datatables.net"/>
<property name="lib.datatables.dir" value="datatables"/>
<ant antfile="${project.basedir}/prepare-ui-libraries.xml"></ant>
</target>
</configuration>
</execution>
<execution>
<id>copy-notice</id>
<goals>
Expand Down Expand Up @@ -887,31 +849,6 @@
</dependency>
</dependencies>
</plugin>
<plugin>
<!-- clean up the qual-ui dependencies from the resources -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>${maven.clean.plugin.version}</version>
<executions>
<execution>
<id>clean-qual-ui-dependencies</id>
<phase>clean</phase>
<goals>
<goal>clean</goal>
</goals>
<configuration>
<filesets>
<fileset>
<directory>${ui.resources.relative}</directory>
<includes>
<include>${ui.resources.external.folder}/</include>
</includes>
</fileset>
</filesets>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
Expand Down
Loading

0 comments on commit a8bc74b

Please sign in to comment.