Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix build issues: 1 clean non-exists target dirs; 2 remove duplicated plugin #4456

Merged
merged 1 commit into from
Jan 6, 2022
Merged

Fix build issues: 1 clean non-exists target dirs; 2 remove duplicated plugin #4456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2020-2021, NVIDIA CORPORATION.
Copyright (c) 2020-2022, NVIDIA CORPORATION.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -1323,18 +1323,12 @@
<target>
<dirset dir="${project.basedir}" includes="**/target" id="target.dirs.for.clean"/>
<pathconvert property="target.dirs.str" pathsep=" ">
<sort>
<dirset refid="target.dirs.for.clean"/>
<!-- remove subdirs first if we have something like target/somedir/target -->
<reverse xmlns="antlib:org.apache.tools.ant.types.resources.comparators">
<name/>
</reverse>
</sort>
<dirset refid="target.dirs.for.clean"/>
</pathconvert>
<echo>Cleaning build directories of all modules ${target.dirs.str}</echo>
<!-- workaround ant delete does not work with dirset -->
<exec dir="${project.basedir}" executable="rm">
<arg value="-r"/>
<arg value="-rf"/>
<arg line="${target.dirs.str}"/>
</exec>
</target>
Expand Down
6 changes: 1 addition & 5 deletions sql-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2020-2021, NVIDIA CORPORATION.
Copyright (c) 2020-2022, NVIDIA CORPORATION.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -367,10 +367,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
Expand Down