diff --git a/.idea/libraries/gant_groovy.xml b/.idea/libraries/gant_groovy.xml new file mode 100644 index 000000000000..6bbdba4df2dd --- /dev/null +++ b/.idea/libraries/gant_groovy.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/build/dependencies/setupBuildScriptsDeps.gradle b/build/dependencies/setupBuildScriptsDeps.gradle index b688134b689f..6c6cbee60e09 100644 --- a/build/dependencies/setupBuildScriptsDeps.gradle +++ b/build/dependencies/setupBuildScriptsDeps.gradle @@ -35,6 +35,7 @@ dependencies { buildScriptsDeps loadLibraryMavenId("Trove4j") buildScriptsDeps loadLibraryMavenId("NanoXML") buildScriptsDeps loadLibraryMavenId("Guava") + buildScriptsDeps(loadLibraryMavenId("gant-groovy"), { transitive = false }) } /** diff --git a/build/gant.xml b/build/gant.xml index c7a81b2ce857..93955df3f5ec 100644 --- a/build/gant.xml +++ b/build/gant.xml @@ -1,7 +1,6 @@ - @@ -24,9 +23,6 @@ - - - diff --git a/build/lib/gant/README_Install.txt b/build/lib/gant/README_Install.txt deleted file mode 100644 index 5f6cc4ae2aa6..000000000000 --- a/build/lib/gant/README_Install.txt +++ /dev/null @@ -1,110 +0,0 @@ -Gant -- A Groovy way of scripting Ant tasks. - - -This is Gant, a Groovy way of working with Ant tasks -- no more XML :-) - -The method of installation depends on whether you have downloaded a tarball or -zipfile distribution, or you have a Git clone -- or even a Bazaar branch -- of -the source. - - -Distribution ------------- - -The Gant distributions contain a ready-made install directory hierarchy. -Untar the tarball or unzip the zipfile to the location where you want the Gant -installation to reside. A directory with the name structured -gant- will be created in the location specified for the -untar or unzip. - -There are a number of distinct distributions: - - 1. Requires a separate Groovy installation. There are builds: - a. compiled against Groovy 1.7.10; and - b. compiled against Groovy 1.8.6; and - c. compiled against Groovy 2.0.0-beta-2 - - 2. Self-contained, includes all dependent jars. - -You might like to set up an environment variable GANT_HOME set to the -directory created by the untar or unzip, though this is not essential, it is -just an efficiency. - -The script $GANT_HOME/bin/gant for systems with a Posix shell, or -$GANT_HOME/bin/gant.bat on Windows is the mechanism for launching a Gant run. - -Distributions 1a, 1b and 1c only include the direct Gant materials. The Maven -target set depends on use of the Maven Ant tasks, and the Ivy tool depends on -the Ivy jar, these will have to be downloaded and installed into -$GANT_HOME/lib unless they are already available on on your CLASSPATH. - - -Using a Git Clone ------------------ - -Gant's mainline is a Git repository on GitHub, see - - https://github.com/Gant/Gant - -you should fork this on GitHub and then clone to give you a local repository. - -The repository on Codehaus at: - - git://git.codehaus.org/gant.git - -is an administrative clone of the GitHub mainline and should not be used in -normal circumstances. - -Gradle is used as the build system for Gant, so you will need to set the -gant_installPath property in ~/.gradle/gradle.properties so you can install -Gant. So for example: - - gant_installPath = ${System.properties.'user.home'}/lib/JavaPackages/gant-trunk - -Then you type: - - ./gradlew :gant:install - -and all the necessary magic happens. The first time you use the Gradle -Wrapper, it will connect to the Internet to download the various jars that -comprise Gradle. This takes a while. However this is only needed the first -time, thereafter it uses the version you downloaded. - -You probably want to set the GROOVY_HOME environment variable to point at the -Groovy installation that the Gant installation is to work with. - - -Using a Bazaar Branch ---------------------- - -For anyone prefering to use Bazaar rather than Git, there is an automated -bridge of the master branch of the Git clone on Launchpad. - -To get a branch: - - bzr branch lp:gant Gant - -or if you want to use bzr-git directly: - - bzr branch git://github.com/Gant/Gant.git Gant - -(If you are going to actively develop Gant, you almost certainly want to have -a shared repository in which this mirror branch is kept so that you can then -make feature branches from it.) - -All the information in the previous section about Gradle and building Gant -apply when using Bazaar. - - -Contact -------- - -If you have any problems using Gant, or have any ideas for improvements, -please make use of the Gant users mailing list: user@gant.codehaus.org - -Russel Winder - - -;;; Local Variables: *** -;;; fill-column: 78 *** -;;; End: *** diff --git a/build/lib/gant/bin/gant b/build/lib/gant/bin/gant deleted file mode 100755 index 327e4542ac51..000000000000 --- a/build/lib/gant/bin/gant +++ /dev/null @@ -1,119 +0,0 @@ -#!/bin/sh - -# Gant -- A Groovy way of scripting Ant tasks. -# -# Copyright © 2006–2010, 2013 Russel Winder -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in -# compliance with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software distributed under the License is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. See the License for the specific language governing permissions and limitations under the -# License. -# -# Author : Russel Winder - -# Gant initiation script for Linux and UNIX -- requires Groovy version. - -# Solaris 10 does not have readlink as standard -- though some people will have the version from -# Sunfreeware which is the same as the version on Ubuntu, Cygwin, MSYS, etc. Mac OS X has a version of -# readlink that is very different to that on Ubuntu, Solaris/Sunfreeware, Cygwin, MSYS, etc. -# -# This function attempts to just do the right thing. - -doReadLink() { - case `uname` in - Darwin) - gantLocation=`dirname $1` - gantPath=`readlink "$1"` - if [ "$gantPath" = "" ] - then - readlinkValue="$1" - else - linkDir=`dirname $gantPath` - currentDirectory=`pwd` - cd $gantLocation - cd $linkDir - gantLocation=`pwd` - gantPath=`basename $gantPath` - readlinkValue="$gantLocation/$gantPath" - cd $currentDirectory - fi - ;; - SunOS) - readlinkPath=`which readlink` - if [ `expr "$readlinkPath" : '\([^ ]*\)'` = "no" ] - then - echo "No readlink command available, please set $2." - exit 1 - else - readlinkValue=`readlink -f $1` - fi - ;; - *) - readlinkValue=`readlink -f $1` - ;; - esac -} - -# If GANT_HOME is not set, deduce a path. Assume the executable is in $GANT_HOME/bin. - -if [ -z "$GANT_HOME" ] -then - if [ -h $0 ] - then - doReadLink $0 GANT_HOME - GANT_HOME=$readlinkValue - GANT_HOME=`dirname $GANT_HOME` - else - GANT_HOME=`dirname $0` - fi - GANT_HOME=`dirname $GANT_HOME` -fi - -# If GROOVY_HOME is not set, deduce a path -- this is needed in order to discover the location of the -# startGroovy script. Assume the executable is in $GROOVY_HOME/bin. - -if [ -z "$GROOVY_HOME" ] -then - GROOVY_HOME=`which groovy` - if [ -h $GROOVY_HOME ] - then - doReadLink $GROOVY_HOME GROOVY_HOME - GROOVY_HOME=$readlinkValue - fi - GROOVY_HOME=`dirname "$GROOVY_HOME"` - GROOVY_HOME=`dirname "$GROOVY_HOME"` -fi - -# If ANT_HOME is not set, deduce a path -- this is needed in order to discover the location of the jars -# associated with the Ant installation. Assume the executable is in $ANT_HOME/bin. - -if [ -z "$ANT_HOME" ] -then - ANT_HOME=`which ant` - if [ -h $ANT_HOME ] - then - doReadLink $ANT_HOME ANT_HOME - ANT_HOME=$readlinkValue - fi - ANT_HOME=`dirname "$ANT_HOME"` - ANT_HOME=`dirname "$ANT_HOME"` -fi - -GROOVY_APP_NAME=Gant -GROOVY_CONF="$GANT_HOME/conf/gant-starter.conf" - -. "$GROOVY_HOME/bin/startGroovy" - -if $cygwin -then - GANT_HOME=`cygpath --mixed "$GANT_HOME"` - ANT_HOME=`cygpath --mixed "$ANT_HOME"` -fi -JAVA_OPTS="$JAVA_OPTS -Dgant.home=$GANT_HOME -Dant.home=$ANT_HOME" - -startGroovy gant.Gant "$@" diff --git a/build/lib/gant/bin/gant.bat b/build/lib/gant/bin/gant.bat deleted file mode 100755 index ccd28602158e..000000000000 --- a/build/lib/gant/bin/gant.bat +++ /dev/null @@ -1,71 +0,0 @@ -@if "%DEBUG%" == "" @echo off - -@rem Gant -- A Groovy way of scripting Ant tasks. -@rem -@rem Copyright © 2008,2010 Russel Winder -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in -@rem compliance with the License. You may obtain a copy of the License at -@rem -@rem http://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software distributed under the License is -@rem distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -@rem implied. See the License for the specific language governing permissions and limitations under the -@rem License. -@rem -@rem Author : Russel Winder - -@rem Gant initiation script for Windows. - -@rem Set local scope for the variables with windows NT shell -if "%OS%" == "Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=.\ - -@rem If GANT_HOME is not set, deduce a path. - -if not "%GANT_HOME%" == "" goto endSetGantHome - set GANT_HOME="%DIRNAME%.." -:endSetGantHome - -@rem If GROOVY_HOME is not set, deduce a path -- this is needed in order to discover the location of the -@rem startGroovy script. - -if not "%GROOVY_HOME%" == "" goto endSetGroovyHome - for %%P in ( %PATH% ) do if exist %%P\groovy.exe set GROOVY_HOME=%%P\.. - if not "%GROOVY_HOME%" == "" goto endSetGroovyHome - for %%P in ( %PATH% ) do if exist %%P\groovy.bat set GROOVY_HOME=%%P\.. - if not "%GROOVY_HOME%" == "" goto endSetGroovyHome - call :environmentVariableError GROOVY_HOME - goto :EOF -:endSetGroovyHome - -@rem If ANT_HOME is not set, deduce a path -- this is needed in order to discover the location of the jars -@rem asscoiated with the Ant installation. - -if not "%ANT_HOME%" == "" goto endSetAntHome - for %%P in ( %PATH% ) do if exist %%P\ant.bat set ANT_HOME=%%P\.. - if not "%ANT_HOME%" == "" goto endSetAntHome - call :environmentVariableError ANT_HOME - goto :EOF -:endSetAntHome - -set PROGNAME=gant.bat -set GROOVY_SCRIPT_NAME=gant.bat -set STARTER_CONF="%GANT_HOME%\conf\gant-starter.conf" -set JAVA_OPTS=%JAVA_OPTS% -Dgant.home="%GANT_HOME%" -Dant.home="%ANT_HOME%" - -"%GANT_HOME%\bin\startGroovy.bat" "%DIRNAME%" gant.Gant %* - -@rem End local scope for the variables with windows NT shell -if "%OS%" == "Windows_NT" endlocal - -%COMSPEC% /C exit /B %ERRORLEVEL% - -:environmentVariableError - echo. - echo ERROR: Environment variable %1 has not been set. - echo Attempting to find %1 from PATH also failed. - goto :EOF diff --git a/build/lib/gant/bin/startGroovy.bat b/build/lib/gant/bin/startGroovy.bat deleted file mode 100755 index 5f4540b22c7e..000000000000 --- a/build/lib/gant/bin/startGroovy.bat +++ /dev/null @@ -1,258 +0,0 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem ## -@rem Groovy JVM Bootstrap for Windowz ## -@rem ## -@rem ########################################################################## - -@rem -@rem $Revision$ $Date$ -@rem - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal enabledelayedexpansion - -set DIRNAME=%~1 -shift - -set CLASS=%~1 -shift - -if exist "%USERPROFILE%/.groovy/preinit.bat" call "%USERPROFILE%/.groovy/preinit.bat" - -@rem Determine the command interpreter to execute the "CD" later -set COMMAND_COM="cmd.exe" -if exist "%SystemRoot%\system32\cmd.exe" set COMMAND_COM="%SystemRoot%\system32\cmd.exe" -if exist "%SystemRoot%\command.com" set COMMAND_COM="%SystemRoot%\command.com" - -@rem Use explicit find.exe to prevent cygwin and others find.exe from being used -set FIND_EXE="find.exe" -if exist "%SystemRoot%\system32\find.exe" set FIND_EXE="%SystemRoot%\system32\find.exe" -if exist "%SystemRoot%\command\find.exe" set FIND_EXE="%SystemRoot%\command\find.exe" - -:check_JAVA_HOME -@rem Make sure we have a valid JAVA_HOME -if not "%JAVA_HOME%" == "" goto have_JAVA_HOME -set PATHTMP=%PATH% -:loop -for /f "delims=; tokens=1*" %%i in ("!PATHTMP!") do ( - if exist "%%i\..\bin\java.exe" ( - set "JAVA_HOME=%%i\.." - goto found_JAVA_HOME - ) - set PATHTMP=%%j - goto loop -) -goto check_default_JAVA_EXE - -:found_JAVA_HOME -@rem Remove trailing \bin\.. from JAVA_HOME -if "%JAVA_HOME:~-7%"=="\bin\.." SET "JAVA_HOME=%JAVA_HOME:~0,-7%" -set JAVA_EXE=%JAVA_HOME%\bin\java.exe - -:check_default_JAVA_EXE -if not "%JAVA_HOME%" == "" goto valid_JAVA_HOME -java -version 2>NUL -if not ERRORLEVEL 1 goto default_JAVA_EXE - -echo. -echo ERROR: Environment variable JAVA_HOME has not been set. -echo Attempting to find JAVA_HOME from PATH also failed. -goto common_error - -:have_JAVA_HOME -@rem Remove trailing slash from JAVA_HOME if found -if "%JAVA_HOME:~-1%"=="\" SET JAVA_HOME=%JAVA_HOME:~0,-1% - -@rem Validate JAVA_HOME -%COMMAND_COM% /C DIR "%JAVA_HOME%" 2>&1 | %FIND_EXE% /I /C "%JAVA_HOME%" >nul -if not errorlevel 1 goto valid_JAVA_HOME_DIR - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% - -:common_error -echo Please set the JAVA_HOME variable in your environment -echo to match the location of your Java installation. -goto end - -:default_JAVA_EXE -set JAVA_EXE=java.exe -goto check_GROOVY_HOME - -:valid_JAVA_HOME_DIR -set JAVA_EXE=%JAVA_HOME%\bin\java.exe -if exist "%JAVA_EXE%" goto valid_JAVA_HOME - -echo. -echo ERROR: No java.exe found at: %JAVA_EXE% -goto common_error - -:valid_JAVA_HOME -if exist "%JAVA_HOME%\lib\tools.jar" set TOOLS_JAR=%JAVA_HOME%\lib\tools.jar - -:check_GROOVY_HOME -@rem Define GROOVY_HOME if not set -if "%GROOVY_HOME%" == "" set GROOVY_HOME=%DIRNAME%.. - -@rem Remove trailing slash from GROOVY_HOME if found -if "%GROOVY_HOME:~-1%"=="\" SET GROOVY_HOME=%GROOVY_HOME:~0,-1% - -@rem classpath handling -set _SKIP=2 -set CP= -if "x%~1" == "x-cp" set CP=%~2 -if "x%~1" == "x-classpath" set CP=%~2 -if "x%~1" == "x--classpath" set CP=%~2 -if "x" == "x%CP%" goto init -set _SKIP=4 -shift -shift - -:init -@rem get name of script to launch with full path -set GROOVY_SCRIPT_NAME=%~f1 -@rem Get command-line arguments, handling Windowz variants -if not "%OS%" == "Windows_NT" goto win9xME_args -if "%eval[2+2]" == "4" goto 4NT_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -rem horrible roll your own arg processing inspired by jruby equivalent - -rem escape minus (-d), quotes (-q), star (-s). -set _ARGS=%* -if not defined _ARGS goto execute -set _ARGS=%_ARGS:-=-d% -set _ARGS=%_ARGS:"=-q% -rem Windowz will try to match * with files so we escape it here -rem but it is also a meta char for env var string substitution -rem so it can't be first char here, hack just for common cases. -rem If in doubt use a space or bracket before * if using -e. -set _ARGS=%_ARGS: *= -s% -set _ARGS=%_ARGS:)*=)-s% -set _ARGS=%_ARGS:0*=0-s% -set _ARGS=%_ARGS:1*=1-s% -set _ARGS=%_ARGS:2*=2-s% -set _ARGS=%_ARGS:3*=3-s% -set _ARGS=%_ARGS:4*=4-s% -set _ARGS=%_ARGS:5*=5-s% -set _ARGS=%_ARGS:6*=6-s% -set _ARGS=%_ARGS:7*=7-s% -set _ARGS=%_ARGS:8*=8-s% -set _ARGS=%_ARGS:9*=9-s% - -rem prequote all args for 'for' statement -set _ARGS="%_ARGS%" - -set _ARG= -:win9xME_args_loop -rem split args by spaces into first and rest -for /f "tokens=1,*" %%i in (%_ARGS%) do call :get_arg "%%i" "%%j" -goto process_arg - -:get_arg -rem remove quotes around first arg -for %%i in (%1) do set _ARG=%_ARG% %%~i -rem set the remaining args -set _ARGS=%2 -rem remove the leading space we'll add the first time -if "x%_ARG:~0,1%" == "x " set _ARG=%_ARG:~1% -rem return -goto :EOF - -:process_arg -if "%_ARG%" == "" goto execute - -rem collect all parts of a quoted argument containing spaces -if not "%_ARG:~0,2%" == "-q" goto :argIsComplete -if "%_ARG:~-2%" == "-q" goto :argIsComplete -rem _ARG starts with a quote but does not end with one: -rem add the next part to _ARG until the matching quote is found -goto :win9xME_args_loop - -:argIsComplete -if "x4" == "x%_SKIP%" goto skip_4 -if "x3" == "x%_SKIP%" goto skip_3 -if "x2" == "x%_SKIP%" goto skip_2 -if "x1" == "x%_SKIP%" goto skip_1 - -rem now unescape -q, -s, -d -set _ARG=%_ARG:-s=*% -set _ARG=%_ARG:-q="% -set _ARG=%_ARG:-d=-% - -set CMD_LINE_ARGS=%CMD_LINE_ARGS% %_ARG% -set _ARG= -goto win9xME_args_loop - -:skip_4 -set _ARG= -set _SKIP=3 -goto win9xME_args_loop - -:skip_3 -set _ARG= -set _SKIP=2 -goto win9xME_args_loop - -:skip_2 -set _ARG= -set _SKIP=1 -goto win9xME_args_loop - -:skip_1 -set _ARG= -set _SKIP=0 -goto win9xME_args_loop - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -set CMD_LINE_ARGS=%$ - -:execute -@rem Setup the command line -set STARTER_CLASSPATH=%GROOVY_HOME%\lib\groovy-all-2.3.0.jar - -if exist "%USERPROFILE%/.groovy/init.bat" call "%USERPROFILE%/.groovy/init.bat" - -@rem Setting a classpath using the -cp or -classpath option means not to use -@rem the global classpath. Groovy behaves then the same as the java -@rem interpreter -if "x" == "x%CP%" goto empty_cp -:non_empty_cp -set CP=%CP%;. -goto after_cp -:empty_cp -set CP=. -if "x" == "x%CLASSPATH%" goto after_cp -set CP=%CLASSPATH%;%CP% -:after_cp - -set STARTER_MAIN_CLASS=org.codehaus.groovy.tools.GroovyStarter -set STARTER_CONF=%GROOVY_HOME%\conf\groovy-starter.conf - -set GROOVY_OPTS="-Xmx128m" -set GROOVY_OPTS=%GROOVY_OPTS% -Dprogram.name="%PROGNAME%" -set GROOVY_OPTS=%GROOVY_OPTS% -Dgroovy.home="%GROOVY_HOME%" -if not "%TOOLS_JAR%" == "" set GROOVY_OPTS=%GROOVY_OPTS% -Dtools.jar="%TOOLS_JAR%" -set GROOVY_OPTS=%GROOVY_OPTS% -Dgroovy.starter.conf="%STARTER_CONF%" -set GROOVY_OPTS=%GROOVY_OPTS% -Dscript.name="%GROOVY_SCRIPT_NAME%" - -if exist "%USERPROFILE%/.groovy/postinit.bat" call "%USERPROFILE%/.groovy/postinit.bat" - -@rem Execute Groovy -"%JAVA_EXE%" %GROOVY_OPTS% %JAVA_OPTS% -classpath "%STARTER_CLASSPATH%" %STARTER_MAIN_CLASS% --main %CLASS% --conf "%STARTER_CONF%" --classpath "%CP%" %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" endlocal - -@rem Optional pause the batch file -if "%GROOVY_BATCH_PAUSE%" == "on" pause -%COMSPEC% /C exit /B %ERRORLEVEL% diff --git a/build/lib/gant/conf/gant-starter.conf b/build/lib/gant/conf/gant-starter.conf deleted file mode 100644 index 75aef0043c9a..000000000000 --- a/build/lib/gant/conf/gant-starter.conf +++ /dev/null @@ -1,44 +0,0 @@ -# Gant -- A Groovy way of scripting Ant tasks. -# -# Copyright © 2008, 2010, 2013 Russel Winder -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in -# compliance with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software distributed under the License is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. See the License for the specific language governing permissions and limitations under the -# License. -# -# Author : Russel Winder - -# Load user specific libraries that are Gant specific. -load !{user.home}/.gant/lib/*.jar - -# Load user specific libraries that are Ant specific. -load !{user.home}/.ant/lib/*.jar - -# Load user specific libraries that are for Groovy. -load !{user.home}/.groovy/lib/*.jar - -# Load required libraries -load !{gant.home}/lib/*.jar - -# Load Ant libraries. If xml-apis.jar and xercesImpl.jar are in this directory then it leads to a: -# -# Caught: java.lang.LinkageError: loader constraint violation: loader (instance of ) previously initiated loading for a different type with name "org/w3c/dom/NodeList" -# -# whenever an XML processing program that (possibly indirectly) uses a DOM is executed. Get round this by -# selecting jars, basically all the known Ant jars, and ignoring everything else. -# -# The directory might contain ant.jar but it would be bad to include this since Groovy is distributed -# with a version of Ant and that should be used. See next rule. -load !{ant.home}/lib/ant-*.jar - -# load required libraries -load !{groovy.home}/lib/*.jar - -# tools.jar for ant tasks -load ${tools.jar} diff --git a/build/lib/gant/lib/gant-1.9.11_groovy-2.3.0.jar b/build/lib/gant/lib/gant-1.9.11_groovy-2.3.0.jar deleted file mode 100644 index f3d98426914a..000000000000 Binary files a/build/lib/gant/lib/gant-1.9.11_groovy-2.3.0.jar and /dev/null differ diff --git a/jps/standalone-builder/jps-standalone-builder.iml b/jps/standalone-builder/jps-standalone-builder.iml index dcfb8b9ed33a..787c9dc404b5 100644 --- a/jps/standalone-builder/jps-standalone-builder.iml +++ b/jps/standalone-builder/jps-standalone-builder.iml @@ -13,15 +13,7 @@ - - - - - - - - - + \ No newline at end of file diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy index 77ac994157a6..6245f14785a8 100644 --- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy +++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy @@ -117,7 +117,7 @@ class CommunityLibraryLicenses { url: "http://freemarker.sourceforge.net/"), new LibraryLicense(name: "fxg-utils", libraryName: "fxg-utils", version: "4.9.1", license: "Apache 2.0", url: "http://flex.apache.org", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0"), - new LibraryLicense(name: "Gant", version: "1.9.8", libraryName: "gant-1.9.11_groovy-2.3.0.jar", license: "Apache 2.0", + new LibraryLicense(name: "Gant", version: "1.9.8", libraryName: "gant-groovy", license: "Apache 2.0", url: "https://github.com/codehaus/gant", licenseUrl: "https://github.com/codehaus/gant/blob/master/LICENCE.txt"), new LibraryLicense(name: "Gherkin", libraryName: "Gherkin", version: "2.12.2", license: "MIT", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0.txt", url: "https://github.com/cucumber/gherkin"), diff --git a/platform/build-scripts/platform-build-scripts.iml b/platform/build-scripts/platform-build-scripts.iml index 27b570b7b563..1606b1ca0e12 100644 --- a/platform/build-scripts/platform-build-scripts.iml +++ b/platform/build-scripts/platform-build-scripts.iml @@ -25,15 +25,7 @@ - - - - - - - - - + \ No newline at end of file