--- a/cnd.modelimpl/build.xml +++ a/cnd.modelimpl/build.xml @@ -76,7 +76,7 @@ - + @@ -172,12 +172,12 @@ @@ -195,8 +195,8 @@ @@ -215,8 +215,8 @@ --- a/libs.antlr3.devel/build.xml +++ a/libs.antlr3.devel/build.xml @@ -47,6 +47,6 @@ - Builds, tests, and runs the project antlr33. + Builds, tests, and runs the project antlr34. --- a/libs.antlr3.devel/external/antlr-3.3-license.txt +++ a/libs.antlr3.devel/external/antlr-3.3-license.txt @@ -1,39 +0,0 @@ -Name: Antlr -Version: 3.3 -Description: ANother Tool for Language Recognition, -is a language tool that provides a framework for constructing recognizers, -interpreters, compilers, and translators from grammatical descriptions. -License: BSD License -OSR: 13311 -Origin: http://www.antlr.org - - - [The "BSD license"] - Copyright (c) 2010 Terence Parr - Maven Plugin - Copyright (c) 2009 Jim Idle - - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - 3. The name of the author may not be used to endorse or promote products - derived from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - --- a/libs.antlr3.devel/external/antlr-3.4-license.txt +++ a/libs.antlr3.devel/external/antlr-3.4-license.txt @@ -0,0 +1,39 @@ +Name: Antlr +Version: 3.4 +Description: ANother Tool for Language Recognition, +is a language tool that provides a framework for constructing recognizers, +interpreters, compilers, and translators from grammatical descriptions. +License: BSD License +OSR: 13311 +Origin: http://www.antlr.org + + + [The "BSD license"] + Copyright (c) 2010 Terence Parr + Maven Plugin - Copyright (c) 2009 Jim Idle + + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. The name of the author may not be used to endorse or promote products + derived from this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + --- a/libs.antlr3.devel/external/binaries-list +++ a/libs.antlr3.devel/external/binaries-list @@ -1,1 +1,1 @@ -11B1CFD9AB9B7BB572F272CD1972693D1E9721E9 antlr-3.3.jar +5CAB59D859CAA6598E28131D30DD2E89806DB57F antlr-3.4.jar --- a/libs.antlr3.devel/nbproject/project.properties +++ a/libs.antlr3.devel/nbproject/project.properties @@ -43,9 +43,9 @@ is.autoload=true javac.source=1.6 -release.external/antlr-3.3.jar=modules/ext/antlr-3.3.jar +release.external/antlr-3.4.jar=modules/ext/antlr-3.4.jar -license.file=../external/antlr-3.3-license.txt +license.file=../external/antlr-3.4-license.txt nbm.homepage=http://www.antlr.org/ sigtest.gen.fail.on.error=false -spec.version.base=1.2 +spec.version.base=1.3 --- a/libs.antlr3.devel/nbproject/project.xml +++ a/libs.antlr3.devel/nbproject/project.xml @@ -75,8 +75,8 @@ org.antlr.tool - ext/antlr-3.3.jar - external/antlr-3.3.jar + ext/antlr-3.4.jar + external/antlr-3.4.jar --- a/libs.antlr3.runtime/build.xml +++ a/libs.antlr3.runtime/build.xml @@ -47,6 +47,6 @@ - Builds, tests, and runs the lib antlr33 runtime. + Builds, tests, and runs the lib antlr34 runtime. --- a/libs.antlr3.runtime/external/antlr-3.3-license.txt +++ a/libs.antlr3.runtime/external/antlr-3.3-license.txt @@ -1,39 +0,0 @@ -Name: Antlr -Version: 3.3 -Description: ANother Tool for Language Recognition, is a language tool that provides a framework for constructing recognizers, interpreters, compilers, and translators from grammatical descriptions. -License: BSD License -OSR: 13311 -Origin: http://www.antlr.org -Files: antlr-runtime-3.3.jar - - [The "BSD license"] - Copyright (c) 2010 Terence Parr - Maven Plugin - Copyright (c) 2009 Jim Idle - - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - 3. The name of the author may not be used to endorse or promote products - derived from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - - - --- a/libs.antlr3.runtime/external/antlr-3.4-license.txt +++ a/libs.antlr3.runtime/external/antlr-3.4-license.txt @@ -0,0 +1,39 @@ +Name: Antlr +Version: 3.4 +Description: ANother Tool for Language Recognition, is a language tool that provides a framework for constructing recognizers, interpreters, compilers, and translators from grammatical descriptions. +License: BSD License +OSR: 13311 +Origin: http://www.antlr.org +Files: antlr-runtime-3.4.jar + + [The "BSD license"] + Copyright (c) 2010 Terence Parr + Maven Plugin - Copyright (c) 2009 Jim Idle + + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. The name of the author may not be used to endorse or promote products + derived from this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + + + --- a/libs.antlr3.runtime/external/binaries-list +++ a/libs.antlr3.runtime/external/binaries-list @@ -1,1 +1,1 @@ -B7ADB35C7BC16AFA8AE49C4D61F87E607BDADB41 antlr-runtime-3.3.jar +4E74C6BE42FE89871A878C7C4D6158F21A6D8010 antlr-runtime-3.4.jar --- a/libs.antlr3.runtime/nbproject/project.properties +++ a/libs.antlr3.runtime/nbproject/project.properties @@ -43,9 +43,9 @@ is.autoload=true javac.source=1.6 -release.external/antlr-runtime-3.3.jar=modules/ext/antlr-runtime-3.3.jar +release.external/antlr-runtime-3.4.jar=modules/ext/antlr-runtime-3.4.jar -license.file=../external/antlr-3.3-license.txt +license.file=../external/antlr-3.4-license.txt nbm.homepage=http://www.antlr.org/ sigtest.gen.fail.on.error=false -spec.version.base=1.8.0 +spec.version.base=1.9.0 --- a/libs.antlr3.runtime/nbproject/project.xml +++ a/libs.antlr3.runtime/nbproject/project.xml @@ -55,8 +55,8 @@ org.antlr.runtime.tree - ext/antlr-runtime-3.3.jar - external/antlr-runtime-3.3.jar + ext/antlr-runtime-3.4.jar + external/antlr-runtime-3.4.jar