diff --git a/build.gradle b/build.gradle index f6515f55..0b2b6b18 100644 --- a/build.gradle +++ b/build.gradle @@ -10,6 +10,8 @@ plugins { id 'co.riiid.gradle' version '0.4.2' id 'de.itemis.mps.gradle.launcher' version '2.2.0.+' + + id 'org.cyclonedx.bom' version '2.2.0' } ext.jbrVers = '17.0.8.1-b1000.32' @@ -56,7 +58,8 @@ ext.jdk_home = jdk_home ext.dependencyRepositories = [ 'https://maven.pkg.github.com/mbeddr/*', - 'https://artifacts.itemis.cloud/repository/maven-mps/' + 'https://artifacts.itemis.cloud/repository/maven-mps/', + 'https://packages.atlassian.com/maven-public/' ] // Dependency versions @@ -81,15 +84,42 @@ if (ciBuild) { version = "$major.$minor-SNAPSHOT" } +group = 'org.mpsqa' + configurations { mps - languageLibs // includes also junit tasks support antLib + + plantuml { transitive = false } + baseLib { transitive = false } + treemap { transitive = false } + jacoco { transitive = false } } dependencies { mps "com.jetbrains:mps:$mpsVersion" + + plantuml "net.sourceforge.plantuml:plantuml-asl:1.2023.13" + + baseLib "org.apache.commons:commons-lang3:3.3.2" + baseLib "commons-cli:commons-cli:1.5.0" + baseLib "commons-io:commons-io:2.6" + + treemap "net.sf.jtreemap:jtreemap:1.1.3" + treemap "net.sf.jtreemap:ktreemap:1.1.0-atlassian-01" + + def asmVersion = "9.2" + def jacocoVersion = "0.8.7" + + jacoco "org.ow2.asm:asm:$asmVersion" + jacoco "org.ow2.asm:asm-commons:$asmVersion" + jacoco "org.ow2.asm:asm-tree:$asmVersion" + jacoco "org.jacoco:org.jacoco.agent:$jacocoVersion" + jacoco "org.jacoco:org.jacoco.ant:$jacocoVersion" + jacoco "org.jacoco:org.jacoco.core:$jacocoVersion" + jacoco "org.jacoco:org.jacoco.report:$jacocoVersion" + antLib "org.apache.ant:ant-junit:1.10.6" antLib "org.jacoco:org.jacoco.ant:0.8.12" } @@ -132,6 +162,7 @@ ext.buildScriptClasspath = project.configurations.antLib.fileCollection { true } project.files("$project.jdk_home/lib/tools.jar") def artifactsDir = file("$buildDir/artifacts") +def reportsDir = file("$buildDir/reports") def dependenciesDir = file("$buildDir/dependencies") @@ -167,7 +198,35 @@ File scriptFile(String name) { file("$buildDir/scripts/$name") } +def createResolveTask(taskName, configurationName, outputDir) { + tasks.register(taskName, Sync) { + from configurations."${configurationName}" + into file(outputDir) + // Strip version numbers from file names + rename { filename -> + def ra = configurations."${configurationName}".resolvedConfiguration.resolvedArtifacts.find { ResolvedArtifact ra -> ra.file.name == filename } + String finalName + if (ra.classifier != null) { + finalName = "${ra.name}-${ra.classifier}.${ra.extension}" + } else { + finalName = "${ra.name}.${ra.extension}" + } + return finalName + } + } +} + +// Define tasks using the reusable function +createResolveTask('resolvePlantUML', 'plantuml', 'code/languages/org.mpsqa.arch/solutions/org.mpsqa.arch.pluginSolution/lib') +createResolveTask('resolveBaseLibs', 'baseLib', 'code/languages/org.mpsqa.base/solutions/org.mpsqa.base.lib/lib') +createResolveTask('resolveTreeMap', 'treemap', 'code/languages/org.mpsqa.base/solutions/org.mpsqa.treemap.lib/lib') +createResolveTask('resolveJacoco', 'jacoco', 'code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/lib/lib') + +task resolveDependencies(dependsOn: [resolvePlantUML, resolveBaseLibs, resolveTreeMap, resolveJacoco]) + + def build_allScripts = tasks.register('build_allScripts', BuildLanguages) { + dependsOn resolveDependencies script scriptFile('build_all_scripts.xml') } @@ -252,10 +311,14 @@ task build_allInOne_package(type: BuildLanguages, dependsOn: [build_allScripts]) script scriptFile("build-allInOne-package.xml") } -task package_mpsqa(type: Zip, dependsOn: build_allInOne_package) { +task package_mpsqa(type: Zip, dependsOn: [build_allInOne_package, cyclonedxBom]) { archiveBaseName = 'org.mpsqa' - from artifactsDir - include 'org.mpsqa.allInOne/**' + from(artifactsDir) { + include 'org.mpsqa.allInOne/**' + } + from(reportsDir) { + include 'sbom.json' + } } task test_clones(type: TestLanguages, dependsOn: build_clones_languages) { @@ -281,6 +344,15 @@ tasks.register('check_lint', MpsCheck) { pluginRoots.add(layout.dir(provider { new File(mpsHomeDir, 'plugins/mps-modelchecker') })) } +cyclonedxBom { + destination = reportsDir + outputName = "sbom" + outputFormat = "json" + includeLicenseText = false + schemaVersion = "1.5" + includeConfigs = ["plantuml","baseLib","treemap","jacoco"] +} + check.dependsOn(tasks.withType(TestLanguages)) assemble.dependsOn(tasks.withType(BuildLanguages)) @@ -311,17 +383,23 @@ publishing { groupId 'org.mpsqa' artifactId 'all-in-one' artifact package_mpsqa + pom.withXml { - def dependenciesNode = asNode().appendNode('dependencies') - configurations.languageLibs.resolvedConfiguration.firstLevelModuleDependencies.each { - def dependencyNode = dependenciesNode.appendNode('dependency') - dependencyNode.appendNode('groupId', it.moduleGroup) - dependencyNode.appendNode('artifactId', it.moduleName) - dependencyNode.appendNode('version', it.moduleVersion) - dependencyNode.appendNode('type', it.moduleArtifacts[0].type) + def dependencyNode = dependenciesNode.appendNode('dependency') + + def languageLibs = ['plantuml', 'baseLib', 'treemap', 'jacoco'] + languageLibs.each { configName -> + def configuration = configurations.findByName(configName) + + configuration.resolvedConfiguration.firstLevelModuleDependencies.each { + dependencyNode.appendNode('groupId', it.moduleGroup) + dependencyNode.appendNode('artifactId', it.moduleName) + dependencyNode.appendNode('version', it.moduleVersion) + dependencyNode.appendNode('type', it.moduleArtifacts[0].type) + } } + configurations.mps.resolvedConfiguration.firstLevelModuleDependencies.each { - def dependencyNode = dependenciesNode.appendNode('dependency') dependencyNode.appendNode('groupId', it.moduleGroup) dependencyNode.appendNode('artifactId', it.moduleName) dependencyNode.appendNode('version', it.moduleVersion) diff --git a/code/languages/org.mpsqa.arch/solutions/org.mpsqa.arch.pluginSolution/lib/.gitignore b/code/languages/org.mpsqa.arch/solutions/org.mpsqa.arch.pluginSolution/lib/.gitignore new file mode 100644 index 00000000..c96a04f0 --- /dev/null +++ b/code/languages/org.mpsqa.arch/solutions/org.mpsqa.arch.pluginSolution/lib/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore \ No newline at end of file diff --git a/code/languages/org.mpsqa.arch/solutions/org.mpsqa.arch.pluginSolution/lib/COPYING b/code/languages/org.mpsqa.arch/solutions/org.mpsqa.arch.pluginSolution/lib/COPYING deleted file mode 100644 index f6324dcf..00000000 --- a/code/languages/org.mpsqa.arch/solutions/org.mpsqa.arch.pluginSolution/lib/COPYING +++ /dev/null @@ -1,196 +0,0 @@ -======================================================================== -PlantUML : a free UML diagram generator -======================================================================== - -(C) Copyright 2009-2017, Arnaud Roques - -THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC -LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0] - -ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES -RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. - - You may obtain a copy of the License at - - http://www.eclipse.org/legal/epl-v10.html - - 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. - -======================================================================== - -Eclipse Public License - v 1.0 - -THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, -REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. - -1. DEFINITIONS - -"Contribution" means: - -a) in the case of the initial Contributor, the initial code and documentation distributed under this -Agreement, and - -b) in the case of each subsequent Contributor: - -i) changes to the Program, and - -ii) additions to the Program; - -where such changes and/or additions to the Program originate from and are distributed by that particular -Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such -Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions -to the Program which: (i) are separate modules of software distributed in conjunction with the Program -under their own license agreement, and (ii) are not derivative works of the Program. - -"Contributor" means any person or entity that distributes the Program. - -"Licensed Patents" mean patent claims licensable by a Contributor which are necessarily infringed by -the use or sale of its Contribution alone or when combined with the Program. - -"Program" means the Contributions distributed in accordance with this Agreement. - -"Recipient" means anyone who receives the Program under this Agreement, including all Contributors. - -2. GRANT OF RIGHTS - -a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, -worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, -publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative -works, in source code and object code form. - -b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, -worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import -and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. -This patent license shall apply to the combination of the Contribution and the Program if, at the time the -Contribution is added by the Contributor, such addition of the Contribution causes such combination to be -covered by the Licensed Patents. The patent license shall not apply to any other combinations which include -the Contribution. No hardware per se is licensed hereunder. - -c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth -herein, no assurances are provided by any Contributor that the Program does not infringe the patent or -other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient -for claims brought by any other entity based on infringement of intellectual property rights or otherwise. -As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole -responsibility to secure any other intellectual property rights needed, if any. For example, if a third -party patent license is required to allow Recipient to distribute the Program, it is Recipient's -responsibility to acquire that license before distributing the Program. - -d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, -if any, to grant the copyright license set forth in this Agreement. - -3. REQUIREMENTS - -A Contributor may choose to distribute the Program in object code form under its own license agreement, -provided that: - -a) it complies with the terms and conditions of this Agreement; and - -b) its license agreement: - -i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, -including warranties or conditions of title and non-infringement, and implied warranties or conditions of -merchantability and fitness for a particular purpose; - -ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, -indirect, special, incidental and consequential damages, such as lost profits; - -iii) states that any provisions which differ from this Agreement are offered by that Contributor alone -and not by any other party; and - -iv) states that source code for the Program is available from such Contributor, and informs licensees -how to obtain it in a reasonable manner on or through a medium customarily used for software exchange. - -When the Program is made available in source code form: - -a) it must be made available under this Agreement; and - -b) a copy of this Agreement must be included with each copy of the Program. - -Contributors may not remove or alter any copyright notices contained within the Program. - -Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that -reasonably allows subsequent Recipients to identify the originator of the Contribution. - -4. COMMERCIAL DISTRIBUTION - -Commercial distributors of software may accept certain responsibilities with respect to end users, business -partners and the like. While this license is intended to facilitate the commercial use of the Program, -the Contributor who includes the Program in a commercial product offering should do so in a manner which -does not create potential liability for other Contributors. Therefore, if a Contributor includes the -Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to -defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages -and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a -third party against the Indemnified Contributor to the extent caused by the acts or omissions of such -Commercial Contributor in connection with its distribution of the Program in a commercial product offering. -The obligations in this section do not apply to any claims or Losses relating to any actual or alleged -intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify -the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, -and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. -The Indemnified Contributor may participate in any such claim at its own expense. - -For example, a Contributor might include the Program in a commercial product offering, Product X. That -Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, -or offers warranties related to Product X, those performance claims and warranties are such Commercial -Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend -claims against the other Contributors related to those performance claims and warranties, and if a court -requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages. - -5. NO WARRANTY - -EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT -WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES -OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient -is solely responsible for determining the appropriateness of using and distributing the Program and assumes -all risks associated with its exercise of rights under this Agreement , including but not limited to the risks -and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or -equipment, and unavailability or interruption of operations. - -6. DISCLAIMER OF LIABILITY - -EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY -LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING -WITHOUT LIMITATION LOST PROFITS), 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 OR -DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - -7. GENERAL - -If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the -validity or enforceability of the remainder of the terms of this Agreement, and without further action by -the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision -valid and enforceable. - -If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a -lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or -hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall -terminate as of the date such litigation is filed. - -All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material -terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after -becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient -agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's -obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue -and survive. - -Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency -the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves -the right to publish new versions (including revisions) of this Agreement from time to time. No one other -than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial -Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward -to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. -The Program (including Contributions) may always be distributed subject to the version of the Agreement under -which it was received. In addition, after a new version of the Agreement is published, Contributor may elect -to distribute the Program (including its Contributions) under the new version. Except as expressly stated in -Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any -Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in -the Program not expressly granted under this Agreement are reserved. - -This Agreement is governed by the laws of the State of New York and the intellectual property laws of the -United States of America. No party to this Agreement will bring a legal action under this Agreement more -than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting -litigation. diff --git a/code/languages/org.mpsqa.arch/solutions/org.mpsqa.arch.pluginSolution/lib/plantuml-asl-1.2023.13.jar b/code/languages/org.mpsqa.arch/solutions/org.mpsqa.arch.pluginSolution/lib/plantuml-asl-1.2023.13.jar deleted file mode 100644 index d9f4618e..00000000 Binary files a/code/languages/org.mpsqa.arch/solutions/org.mpsqa.arch.pluginSolution/lib/plantuml-asl-1.2023.13.jar and /dev/null differ diff --git a/code/languages/org.mpsqa.arch/solutions/org.mpsqa.arch.pluginSolution/org.mpsqa.arch.pluginSolution.msd b/code/languages/org.mpsqa.arch/solutions/org.mpsqa.arch.pluginSolution/org.mpsqa.arch.pluginSolution.msd index 8ccb4bd6..3ae61e92 100644 --- a/code/languages/org.mpsqa.arch/solutions/org.mpsqa.arch.pluginSolution/org.mpsqa.arch.pluginSolution.msd +++ b/code/languages/org.mpsqa.arch/solutions/org.mpsqa.arch.pluginSolution/org.mpsqa.arch.pluginSolution.msd @@ -5,13 +5,13 @@ - + - + @@ -20,8 +20,6 @@ 498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA) 742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform) ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core) - 86441d7a-e194-42da-81a5-2161ec62a379(MPS.Workbench) - 0cf935df-4699-4e9c-a132-fa109541cba3(jetbrains.mps.build.mps) @@ -49,13 +47,7 @@ - - - - - - diff --git a/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.build/models/org.mpsqa.base.build.mps b/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.build/models/org.mpsqa.base.build.mps index e33ff819..e0d7f665 100644 --- a/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.build/models/org.mpsqa.base.build.mps +++ b/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.build/models/org.mpsqa.base.build.mps @@ -184,30 +184,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - + @@ -223,8 +200,8 @@ - - + + @@ -240,8 +217,8 @@ - - + + @@ -257,8 +234,8 @@ - - + + @@ -274,42 +251,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -485,43 +428,34 @@ - - - + + + + + + - + - + - - - - - - - - - - - - + + + - + - + - + - - - - - + + @@ -529,18 +463,18 @@ - - - + + + - + - + - + - - + + @@ -548,18 +482,18 @@ - - - + + + - + - + - + - - + + @@ -567,22 +501,6 @@ - - - - - - - - - - - - - - - - @@ -606,78 +524,34 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - + - + - + - - - - - - - - - + + + - + - + - + - - + + @@ -685,18 +559,18 @@ - - - + + + - + - + - + - - + + @@ -704,22 +578,6 @@ - - - - - - - - - - - - - - - - diff --git a/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.lib/.gitignore b/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.lib/.gitignore new file mode 100644 index 00000000..dc555529 --- /dev/null +++ b/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.lib/.gitignore @@ -0,0 +1 @@ +/lib \ No newline at end of file diff --git a/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.lib/lib/commons-cli-1.5.0.jar b/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.lib/lib/commons-cli-1.5.0.jar deleted file mode 100644 index e0364565..00000000 Binary files a/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.lib/lib/commons-cli-1.5.0.jar and /dev/null differ diff --git a/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.lib/lib/commons-io-2.6.jar b/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.lib/lib/commons-io-2.6.jar deleted file mode 100644 index 00556b11..00000000 Binary files a/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.lib/lib/commons-io-2.6.jar and /dev/null differ diff --git a/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.lib/lib/commons-lang3-3.3.2/LICENSE.txt b/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.lib/lib/commons-lang3-3.3.2/LICENSE.txt deleted file mode 100644 index d6456956..00000000 --- a/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.lib/lib/commons-lang3-3.3.2/LICENSE.txt +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - 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. diff --git a/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.lib/lib/commons-lang3-3.3.2/NOTICE.txt b/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.lib/lib/commons-lang3-3.3.2/NOTICE.txt deleted file mode 100644 index 07828245..00000000 --- a/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.lib/lib/commons-lang3-3.3.2/NOTICE.txt +++ /dev/null @@ -1,8 +0,0 @@ -Apache Commons Lang -Copyright 2001-2014 The Apache Software Foundation - -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). - -This product includes software from the Spring Framework, -under the Apache License 2.0 (see: StringUtils.containsWhitespace()) diff --git a/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.lib/lib/commons-lang3-3.3.2/RELEASE-NOTES.txt b/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.lib/lib/commons-lang3-3.3.2/RELEASE-NOTES.txt deleted file mode 100644 index a0923ed4..00000000 --- a/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.lib/lib/commons-lang3-3.3.2/RELEASE-NOTES.txt +++ /dev/null @@ -1,492 +0,0 @@ - Apache Commons Lang - Version 3.3.2 - Release Notes - - -INTRODUCTION: - -This document contains the release notes for the 3.3.2 version of -Apache Commons Lang. Commons Lang is a set of utility functions and reusable -components that should be of use in any Java environment. Commons Lang 3.3.2 -at least requires Java 6.0. - -For the advice on upgrading from 2.x to 3.x, see the following page: - - http://commons.apache.org/lang/article3_0.html - - -NEW FEATURES -============== - -o LANG-989: Add org.apache.commons.lang3.SystemUtils.IS_JAVA_1_8 - -FIXED BUGS -============ - -o LANG-992: NumberUtils#isNumber() returns false for "0.0", "0.4790", et al - - Release Notes for version 3.3.1 - -FIXED BUGS -============ - -o LANG-987: DateUtils.getFragmentInDays(Date, Calendar.MONTH) returns wrong - days -o LANG-983: DurationFormatUtils does not describe format string fully -o LANG-981: DurationFormatUtils#lexx does not detect unmatched quote char -o LANG-984: DurationFormatUtils does not handle large durations correctly -o LANG-982: DurationFormatUtils.formatDuration(61999, "s.SSSS") - ms field - size should be 4 digits -o LANG-978: Failing tests with Java 8 b128 - - Release Notes for version 3.3 - -NEW FEATURES -============== - -o LANG-955: Add methods for removing all invalid characters according to - XML 1.0 and XML 1.1 in an input string to StringEscapeUtils. - Thanks to Adam Hooper. -o LANG-970: Add APIs MutableBoolean setTrue() and setFalse() -o LANG-962: Add SerializationUtils.roundtrip(T extends Serializable) to - serialize then deserialize -o LANG-637: There should be a DifferenceBuilder with a - ReflectionDifferenceBuilder implementation -o LANG-944: Add the Jaro-Winkler string distance algorithm to StringUtils. - Thanks to Rekha Joshi. -o LANG-417: New class ClassPathUtils with methods for turning FQN into - resource path -o LANG-834: Validate: add inclusiveBetween and exclusiveBetween overloads - for primitive types -o LANG-900: New RandomUtils class. Thanks to Duncan Jones. -o LANG-966: Add IBM OS/400 detection - -FIXED BUGS -============ - -o LANG-621: ReflectionToStringBuilder.toString does not debug 3rd party object - fields within 3rd party object. Thanks to Philip Hodges, - Thomas Neidhart. -o LANG-977: NumericEntityEscaper incorrectly encodes supplementary characters. - Thanks to Chris Karcher. -o LANG-973: Make some private fields final -o LANG-971: NumberUtils#isNumber(String) fails to reject invalid Octal numbers -o LANG-972: NumberUtils#isNumber does not allow for hex 0XABCD -o LANG-969: StringUtils.toEncodedString(byte[], Charset) needlessly throws - UnsupportedEncodingException. Thanks to Matt Bishop. -o LANG-946: ConstantInitializerTest fails when building with IBM JDK 7 -o LANG-954: uncaught PatternSyntaxException in FastDateFormat on Android. - Thanks to Michael Keppler. -o LANG-936: StringUtils.getLevenshteinDistance with too big of a threshold - returns wrong result. Thanks to Yaniv Kunda, Eli Lindsey. -o LANG-943: Test DurationFormatUtilsTest.testEdgeDuration fails in - JDK 1.6, 1.7 and 1.8, BRST time zone -o LANG-613: ConstructorUtils.getAccessibleConstructor() Does Not Check the - Accessibility of Enclosing Classes -o LANG-951: Fragments are wrong by 1 day when using fragment YEAR or MONTH. - Thanks to Sebastian Götz. -o LANG-950: FastDateParser does not handle two digit year parsing like - SimpleDateFormat -o LANG-949: FastDateParserTest.testParses does not test FastDateParser -o LANG-915: Wrong locale handling in LocaleUtils.toLocale(). - Thanks to Sergio Fernández. - -CHANGES -========= - -o LANG-961: org.apache.commons.lang3.reflect.FieldUtils.removeFinalModifier(Field) - does not clean up after itself -o LANG-958: FastDateParser javadoc incorrectly states that SimpleDateFormat - is used internally -o LANG-956: Improve JavaDoc of WordUtils.wrap methods -o LANG-939: Move Documentation from user guide to package-info files -o LANG-953: Convert package.html files to package-info.java files -o LANG-940: Fix deprecation warnings -o LANG-819: EnumUtils.generateBitVector needs a "? extends" - - Release Notes for version 3.2.1 - -BUG FIXES -=========== - -o LANG-937: Fix missing Hamcrest dependency in Ant Build -o LANG-941: Test failure in LocaleUtilsTest when building with JDK 8 -o LANG-942: Test failure in FastDateParserTest and FastDateFormat_ParserTest - when building with JDK8. Thanks to Bruno P. Kinoshita, - Henri Yandell. -o LANG-938: Build fails with test failures when building with JDK 8 - - Release Notes for version 3.2 - -COMPATIBILITY WITH 3.1 -======================== - -This release introduces backwards incompatible changes in -org.apache.commons.lang3.time.FastDateFormat: -o Method 'protected java.util.List parsePattern()' has been removed -o Method 'protected java.lang.String parseToken(java.lang.String, int[])' has - been removed -o Method 'protected org.apache.commons.lang3.time.FastDateFormat$NumberRule - selectNumberRule(int, int)' has been removed - -These changes were the result of [LANG-462]. It is assumed that this change -will not break clients as Charles Honton pointed out on 25/Jan/12: -" - 1. Methods "FastDateFormat$NumberRule selectNumberRule(int, int)" and - "List parsePattern()" couldn't have been overridden because - NumberRule and Rule were private to FastDateFormat. - 2. Due to the factory pattern used, it's unlikely other two methods would have - been overridden. - 3. The four methods are highly implementation specific. I consider it a - mistake that the methods were exposed. -" -For more information see https://issues.apache.org/jira/browse/LANG-462. - -NEW FEATURES -============== - -o LANG-934: Add removeFinalModifier to FieldUtils -o LANG-863: Method returns number of inheritance hops between parent and - subclass. Thanks to Daneel S. Yaitskov. -o LANG-774: Added isStarted, isSuspended and isStopped to StopWatch. - Thanks to Erhan Bagdemir. -o LANG-848: Added StringUtils.isBlank/isEmpty CharSequence... methods. - Thanks to Alexander Muthmann. -o LANG-926: Added ArrayUtils.reverse(array, from, to) methods. -o LANG-795: StringUtils.toString(byte[], String) deprecated in favour of a new - StringUtils.toString(byte[], CharSet). Thanks to Aaron Digulla. -o LANG-893: StrSubstitutor now supports default values for variables. - Thanks to Woonsan Ko. -o LANG-913: Adding .gitignore to commons-lang. Thanks to Allon Mureinik. -o LANG-837: Add ObjectUtils.toIdentityString methods that support - StringBuilder, StrBuilder, and Appendable. -o LANG-886: Added CharSetUtils.containsAny(String, String). -o LANG-797: Added escape/unescapeJson to StringEscapeUtils. -o LANG-875: Added appendIfMissing and prependIfMissing methods to StringUtils. -o LANG-870: Add StringUtils.LF and StringUtils.CR values. -o LANG-873: Add FieldUtils getAllFields() to return all the fields defined in - the given class and super classes. -o LANG-835: StrBuilder should support StringBuilder as an input parameter. -o LANG-857: StringIndexOutOfBoundsException in CharSequenceTranslator. -o LANG-856: Code refactoring in NumberUtils. -o LANG-855: NumberUtils#createBigInteger does not allow for hex and octal - numbers. -o LANG-854: NumberUtils#createNumber - does not allow for hex numbers to be - larger than Long. -o LANG-853: StringUtils join APIs for primitives. -o LANG-841: Add StringUtils API to call String.replaceAll in DOTALL a.k.a. - single-line mode. -o LANG-825: Create StrBuilder APIs similar to - String.format(String, Object...). -o LANG-675: Add Triple class (ternary version of Pair). -o LANG-462: FastDateFormat supports parse methods. - -BUG FIXES -=========== - -o LANG-932: Spelling fixes. Thanks to Ville Skyttä. -o LANG-929: OctalUnescaper tried to parse all of \279. -o LANG-928: OctalUnescaper had bugs when parsing octals starting with a zero. -o LANG-905: EqualsBuilder returned true when comparing arrays, even when the - elements are different. -o LANG-917: Fixed exception when combining custom and choice format in - ExtendedMessageFormat. Thanks to Arne Burmeister. -o LANG-902: RandomStringUtils.random javadoc was incorrectly promising letters - and numbers would, as opposed to may, appear Issue:. Thanks to - Andrzej Winnicki. -o LANG-921: BooleanUtils.xor(boolean...) produces wrong results. -o LANG-896: BooleanUtils.toBoolean(String str) javadoc is not updated. Thanks - to Mark Bryan Yu. -o LANG-879: LocaleUtils test fails with new Locale "ja_JP_JP_#u-ca-japanese" - of JDK7. -o LANG-836: StrSubstitutor does not support StringBuilder or CharSequence. - Thanks to Arnaud Brunet. -o LANG-693: Method createNumber from NumberUtils doesn't work for floating - point numbers other than Float Issue: LANG-693. Thanks to - Calvin Echols. -o LANG-887: FastDateFormat does not use the locale specific cache correctly. -o LANG-754: ClassUtils.getShortName(String) will now only do a reverse lookup - for array types. -o LANG-881: NumberUtils.createNumber() Javadoc says it does not work for octal - numbers. -o LANG-865: LocaleUtils.toLocale does not parse strings starting with an - underscore. -o LANG-858: StringEscapeUtils.escapeJava() and escapeEcmaScript() do not - output the escaped surrogate pairs that are Java parsable. -o LANG-849: FastDateFormat and FastDatePrinter generates Date objects - wastefully. -o LANG-845: Spelling fixes. -o LANG-844: Fix examples contained in javadoc of StringUtils.center methods. -o LANG-832: FastDateParser does not handle unterminated quotes correctly. -o LANG-831: FastDateParser does not handle white-space properly. -o LANG-830: FastDateParser could use \Q \E to quote regexes. -o LANG-828: FastDateParser does not handle non-Gregorian calendars properly. -o LANG-826: FastDateParser does not handle non-ASCII digits correctly. -o LANG-822: NumberUtils#createNumber - bad behaviour for leading "--". -o LANG-818: FastDateFormat's "z" pattern does not respect timezone of Calendar - instances passed to format(). -o LANG-817: Add org.apache.commons.lang3.SystemUtils.IS_OS_WINDOWS_8. -o LANG-813: StringUtils.equalsIgnoreCase doesn't check string reference - equality. -o LANG-810: StringUtils.join() endIndex, bugged for loop. -o LANG-807: RandomStringUtils throws confusing IAE when end <= start. -o LANG-805: RandomStringUtils.random(count, 0, 0, false, false, universe, - random) always throws java.lang.ArrayIndexOutOfBoundsException. -o LANG-802: LocaleUtils - unnecessary recursive call in SyncAvoid class. -o LANG-800: Javadoc bug in DateUtils#ceiling for Calendar and Object versions. -o LANG-788: SerializationUtils throws ClassNotFoundException when cloning - primitive classes. -o LANG-786: StringUtils equals() relies on undefined behavior. -o LANG-783: Documentation bug: StringUtils.split. -o LANG-777: jar contains velocity template of release notes. -o LANG-776: TypeUtilsTest contains incorrect type assignability assertion. -o LANG-775: TypeUtils.getTypeArguments() misses type arguments for - partially-assigned classes. -o LANG-773: ImmutablePair doc contains nonsense text. -o LANG-772: ClassUtils.PACKAGE_SEPARATOR Javadoc contains garbage text. -o LANG-765: EventListenerSupport.ProxyInvocationHandler no longer defines - serialVersionUID. -o LANG-764: StrBuilder is now serializable. -o LANG-761: Fix Javadoc Ant warnings. -o LANG-747: NumberUtils does not handle Long Hex numbers. -o LANG-743: Javadoc bug in static inner class DateIterator. - -CHANGES -========= - -o LANG-931: Misleading Javadoc comment in StrBuilderReader class. Thanks - to Christoph Schneegans. -o LANG-910: StringUtils.normalizeSpace now handles non-breaking spaces - (Unicode 00A0). Thanks to Timur Yarosh. -o LANG-804: Redundant check for zero in HashCodeBuilder ctor. Thanks to - Allon Mureinik. -o LANG-884: Simplify FastDateFormat; eliminate boxing. -o LANG-882: LookupTranslator now works with implementations of CharSequence - other than String. -o LANG-846: Provide CharSequenceUtils.regionMatches with a proper green - implementation instead of inefficiently converting to Strings. -o LANG-839: ArrayUtils removeElements methods use unnecessary HashSet. -o LANG-838: ArrayUtils removeElements methods clone temporary index arrays - unnecessarily. -o LANG-799: DateUtils#parseDate uses default locale; add Locale support. -o LANG-798: Use generics in SerializationUtils. - -CHANGES WITHOUT TICKET -======================== - -o Fixed URLs in javadoc to point to new oracle.com pages - - - Release Notes for version 3.1 - -NEW FEATURES -============== - -o LANG-801: Add Conversion utility to convert between data types on byte level -o LANG-760: Add API StringUtils.toString(byte[] intput, String charsetName) -o LANG-756: Add APIs ClassUtils.isPrimitiveWrapper(Class) and - isPrimitiveOrWrapper(Class) -o LANG-695: SystemUtils.IS_OS_UNIX doesn't recognize FreeBSD as a Unix system - -BUG FIXES -=========== - -o LANG-749: Incorrect Bundle-SymbolicName in Manifest -o LANG-746: NumberUtils does not handle upper-case hex: 0X and -0X -o LANG-744: StringUtils throws java.security.AccessControlException on Google - App Engine -o LANG-741: Ant build has wrong component.name -o LANG-698: Document that the Mutable numbers don't work as expected with - String.format - -CHANGES -========= - -o LANG-758: Add an example with whitespace in StringUtils.defaultIfEmpty -o LANG-752: Fix createLong() so it behaves like createInteger() -o LANG-751: Include the actual type in the Validate.isInstance and - isAssignableFrom exception messages -o LANG-748: Deprecating chomp(String, String) -o LANG-736: CharUtils static final array CHAR_STRING is not needed to compute - CHAR_STRING_ARRAY - - - Release Notes for version 3.0 - -ADDITIONS -=========== - -o LANG-276: MutableBigDecimal and MutableBigInteger. -o LANG-285: Wish : method unaccent. -o LANG-358: ObjectUtils.coalesce. -o LANG-386: LeftOf/RightOfNumber in Range convenience methods necessary. -o LANG-435: Add ClassUtils.isAssignable() variants with autoboxing. -o LANG-444: StringUtils.emptyToNull. -o LANG-482: Enhance StrSubstitutor to support nested ${var-${subvr}} expansion -o LANG-482: StrSubstitutor now supports substitution in variable names. -o LANG-496: A generic implementation of the Lazy initialization pattern. -o LANG-497: Addition of ContextedException and ContextedRuntimeException. -o LANG-498: Add StringEscapeUtils.escapeText() methods. -o LANG-499: Add support for the handling of ExecutionExceptions. -o LANG-501: Add support for background initialization. -o LANG-529: Add a concurrent package. -o LANG-533: Validate: support for validating blank strings. -o LANG-537: Add ArrayUtils.toArray to create generic arrays. -o LANG-545: Add ability to create a Future for a constant. -o LANG-546: Add methods to Validate to check whether the index is valid for - the array/list/string. -o LANG-553: Add TypeUtils class to provide utility code for working with generic - types. -o LANG-559: Added isAssignableFrom and isInstanceOf validation methods. -o LANG-559: Added validState validation method. -o LANG-560: New TimedSemaphore class. -o LANG-582: Provide an implementation of the ThreadFactory interface. -o LANG-588: Create a basic Pair class. -o LANG-594: DateUtils equal & compare functions up to most significant field. -o LANG-601: Add Builder Interface / Update Builders to Implement It. -o LANG-609: Support lazy initialization using atomic variables -o LANG-610: Extend exception handling in ConcurrentUtils to runtime exceptions. -o LANG-614: StringUtils.endsWithAny method -o LANG-640: Add normalizeSpace to StringUtils -o LANG-644: Provide documentation about the new concurrent package -o LANG-649: BooleanUtils.toBooleanObject to support single character input -o LANG-651: Add AnnotationUtils -o LANG-653: Provide a very basic ConcurrentInitializer implementation -o LANG-655: Add StringUtils.defaultIfBlank() -o LANG-667: Add a Null-safe compare() method to ObjectUtils -o LANG-676: Documented potential NPE if auto-boxing occurs for some BooleanUtils - methods -o LANG-678: Add support for ConcurrentMap.putIfAbsent() -o LANG-692: Add hashCodeMulti varargs method -o LANG-697: Add FormattableUtils class -o LANG-684: Levenshtein Distance Within a Given Threshold - -REMOVALS -========== - -o LANG-438: Remove @deprecateds. -o LANG-492: Remove code handled now by the JDK. -o LANG-493: Remove code that does not hold enough value to remain. -o LANG-590: Remove JDK 1.2/1.3 bug handling in - StringUtils.indexOf(String, String, int). -o LANG-673: WordUtils.abbreviate() removed -o LANG-691: Removed DateUtils.UTC_TIME_ZONE - -IMPROVEMENTS -============== - -o LANG-290: EnumUtils for JDK 5.0. -o LANG-336: Finally start using generics. -o LANG-355: StrBuilder should implement CharSequence and Appendable. -o LANG-396: Investigate for vararg usages. -o LANG-424: Improve Javadoc for StringUtils class. -o LANG-458: Refactor Validate.java to eliminate code redundancy. -o LANG-479: Document where in SVN trunk is. -o LANG-504: bring ArrayUtils.isEmpty to the generics world. -o LANG-505: Rewrite StringEscapeUtils. -o LANG-507: StringEscapeUtils.unescapeJava should support \u+ notation. -o LANG-510: Convert StringUtils API to take CharSequence. -o LANG-513: Better EnumUtils. -o LANG-528: Mutable classes should implement an appropriately typed Mutable - interface. -o LANG-539: Compile commons.lang for CDC 1.1/Foundation 1.1. -o LANG-540: Make NumericEntityEscaper immutable. -o LANG-541: Replace StringBuffer with StringBuilder. -o LANG-548: Use Iterable on API instead of Collection. -o LANG-551: Replace Range classes with generic version. -o LANG-562: Change Maven groupId. -o LANG-563: Change Java package name. -o LANG-570: Do the test cases really still require main() and suite() methods? -o LANG-579: Add new Validate methods. -o LANG-599: ClassUtils.getClass(): Allow Dots as Inner Class Separators. -o LANG-605: DefaultExceptionContext overwrites values in recursive situations. -o LANG-668: Change ObjectUtils min() & max() functions to use varargs rather - than just two parameters -o LANG-681: Push down WordUtils to "text" sub-package. -o LANG-711: Add includeantruntime=false to javac targets to quell warnings in - ant 1.8.1 and better (and modest performance gain). -o LANG-713: Increase test coverage of FieldUtils read methods and tweak - javadoc. -o LANG-718: build.xml Java 1.5+ updates. - -BUG FIXES -=========== - -o LANG-11: Depend on JDK 1.5+. -o LANG-302: StrBuilder does not implement clone(). -o LANG-339: StringEscapeUtils.escapeHtml() escapes multibyte characters like - Chinese, Japanese, etc. -o LANG-369: ExceptionUtils not thread-safe. -o LANG-418: Javadoc incorrect for StringUtils.endsWithIgnoreCase. -o LANG-428: StringUtils.isAlpha, isAlphanumeric and isNumeric now return false - for "" -o LANG-439: StringEscapeUtils.escapeHTML() does not escape chars (0x00-0x20). -o LANG-448: Lower Ascii Characters don't get encoded by Entities.java. -o LANG-468: JDK 1.5 build/runtime failure on LANG-393 (EqualsBuilder). -o LANG-474: Fixes for thread safety. -o LANG-478: StopWatch does not resist to system time changes. -o LANG-480: StringEscapeUtils.escapeHtml incorrectly converts unicode - characters above U+00FFFF into 2 characters. -o LANG-481: Possible race-conditions in hashCode of the range classes. -o LANG-564: Improve StrLookup API documentation. -o LANG-568: @SuppressWarnings("unchecked") is used too generally. -o LANG-571: ArrayUtils.add(T[: array, T element) can create unexpected - ClassCastException. -o LANG-585: exception.DefaultExceptionContext.getFormattedExceptionMessage - catches Throwable. -o LANG-596: StrSubstitutor should also handle the default properties of a - java.util.Properties class -o LANG-600: Javadoc is incorrect for public static int - lastIndexOf(String str, String searchStr). -o LANG-602: ContextedRuntimeException no longer an 'unchecked' exception. -o LANG-606: EqualsBuilder causes StackOverflowException. -o LANG-608: Some StringUtils methods should take an int character instead of - char to use String API features. -o LANG-617: StringEscapeUtils.escapeXML() can't process UTF-16 supplementary - characters -o LANG-624: SystemUtils.getJavaVersionAsFloat throws - StringIndexOutOfBoundsException on Android runtime/Dalvik VM -o LANG-629: Charset may not be threadsafe, because the HashSet is not synch. -o LANG-638: NumberUtils createNumber throws a StringIndexOutOfBoundsException - when argument containing "e" and "E" is passed in -o LANG-643: Javadoc StringUtils.left() claims to throw on negative len, but - doesn't -o LANG-645: FastDateFormat.format() outputs incorrect week of year because - locale isn't respected -o LANG-646: StringEscapeUtils.unescapeJava doesn't handle octal escapes and - Unicode with extra u -o LANG-656: Example StringUtils.indexOfAnyBut("zzabyycdxx", '') = 0 incorrect -o LANG-658: Some Entitys like Ö are not matched properly against its - ISO8859-1 representation -o LANG-659: EntityArrays typo: {"\u2122", "−"}, // minus sign, U+2212 - ISOtech -o LANG-66: StringEscaper.escapeXml() escapes characters > 0x7f. -o LANG-662: org.apache.commons.lang3.math.Fraction does not reduce - (Integer.MIN_VALUE, 2^k) -o LANG-663: org.apache.commons.lang3.math.Fraction does not always succeed in - multiplyBy and divideBy -o LANG-664: NumberUtils.isNumber(String) is not right when the String is - "1.1L" -o LANG-672: Doc bug in DateUtils#ceiling -o LANG-677: DateUtils.isSameLocalTime compares using 12 hour clock and not - 24 hour -o LANG-685: EqualsBuilder synchronizes on HashCodeBuilder. -o LANG-703: StringUtils.join throws NPE when toString returns null for one of - objects in collection -o LANG-710: StringIndexOutOfBoundsException when calling unescapeHtml4("") -o LANG-714: StringUtils doc/comment spelling fixes. -o LANG-715: CharSetUtils.squeeze() speedup. -o LANG-716: swapCase and *capitalize speedups. - - -Historical list of changes: http://commons.apache.org/lang/changes-report.html - -For complete information on Commons Lang, including instructions on how to -submit bug reports, patches, or suggestions for improvement, see the -Apache Commons Lang website: - -http://commons.apache.org/lang/ - -Have fun! --Apache Commons Lang team - diff --git a/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.lib/lib/commons-lang3-3.3.2/commons-lang3-3.3.2-javadoc.jar b/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.lib/lib/commons-lang3-3.3.2/commons-lang3-3.3.2-javadoc.jar deleted file mode 100644 index bd2f4220..00000000 Binary files a/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.lib/lib/commons-lang3-3.3.2/commons-lang3-3.3.2-javadoc.jar and /dev/null differ diff --git a/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.lib/lib/commons-lang3-3.3.2/commons-lang3-3.3.2.jar b/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.lib/lib/commons-lang3-3.3.2/commons-lang3-3.3.2.jar deleted file mode 100644 index bb069797..00000000 Binary files a/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.lib/lib/commons-lang3-3.3.2/commons-lang3-3.3.2.jar and /dev/null differ diff --git a/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.lib/org.mpsqa.base.lib.msd b/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.lib/org.mpsqa.base.lib.msd index 0687d017..365aa183 100644 --- a/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.lib/org.mpsqa.base.lib.msd +++ b/code/languages/org.mpsqa.base/solutions/org.mpsqa.base.lib/org.mpsqa.base.lib.msd @@ -1,22 +1,18 @@ - - - - - - - + + + + - - - - + + + diff --git a/code/languages/org.mpsqa.base/solutions/org.mpsqa.treemap.lib/.gitignore b/code/languages/org.mpsqa.base/solutions/org.mpsqa.treemap.lib/.gitignore new file mode 100644 index 00000000..7115be1a --- /dev/null +++ b/code/languages/org.mpsqa.base/solutions/org.mpsqa.treemap.lib/.gitignore @@ -0,0 +1,2 @@ + * +!.gitignore \ No newline at end of file diff --git a/code/languages/org.mpsqa.base/solutions/org.mpsqa.treemap.lib/lib/LICENSE.txt b/code/languages/org.mpsqa.base/solutions/org.mpsqa.treemap.lib/lib/LICENSE.txt deleted file mode 100644 index 261eeb9e..00000000 --- a/code/languages/org.mpsqa.base/solutions/org.mpsqa.treemap.lib/lib/LICENSE.txt +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - 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. diff --git a/code/languages/org.mpsqa.base/solutions/org.mpsqa.treemap.lib/lib/jtreemap-1.1.0-bundle.jar b/code/languages/org.mpsqa.base/solutions/org.mpsqa.treemap.lib/lib/jtreemap-1.1.0-bundle.jar deleted file mode 100644 index 6828c846..00000000 Binary files a/code/languages/org.mpsqa.base/solutions/org.mpsqa.treemap.lib/lib/jtreemap-1.1.0-bundle.jar and /dev/null differ diff --git a/code/languages/org.mpsqa.base/solutions/org.mpsqa.treemap.lib/lib/jtreemap-1.1.0.jar b/code/languages/org.mpsqa.base/solutions/org.mpsqa.treemap.lib/lib/jtreemap-1.1.0.jar deleted file mode 100644 index febcbd7d..00000000 Binary files a/code/languages/org.mpsqa.base/solutions/org.mpsqa.treemap.lib/lib/jtreemap-1.1.0.jar and /dev/null differ diff --git a/code/languages/org.mpsqa.base/solutions/org.mpsqa.treemap.lib/lib/jtreemap.jar b/code/languages/org.mpsqa.base/solutions/org.mpsqa.treemap.lib/lib/jtreemap.jar new file mode 100644 index 00000000..7b83e6f6 Binary files /dev/null and b/code/languages/org.mpsqa.base/solutions/org.mpsqa.treemap.lib/lib/jtreemap.jar differ diff --git a/code/languages/org.mpsqa.base/solutions/org.mpsqa.treemap.lib/lib/ktreemap.jar b/code/languages/org.mpsqa.base/solutions/org.mpsqa.treemap.lib/lib/ktreemap.jar new file mode 100644 index 00000000..618003a4 Binary files /dev/null and b/code/languages/org.mpsqa.base/solutions/org.mpsqa.treemap.lib/lib/ktreemap.jar differ diff --git a/code/languages/org.mpsqa.base/solutions/org.mpsqa.treemap.lib/lib/net.sf.jtreemap.ktreemap-1.1.0-bundle.jar b/code/languages/org.mpsqa.base/solutions/org.mpsqa.treemap.lib/lib/net.sf.jtreemap.ktreemap-1.1.0-bundle.jar deleted file mode 100644 index 30a91dbc..00000000 Binary files a/code/languages/org.mpsqa.base/solutions/org.mpsqa.treemap.lib/lib/net.sf.jtreemap.ktreemap-1.1.0-bundle.jar and /dev/null differ diff --git a/code/languages/org.mpsqa.base/solutions/org.mpsqa.treemap.lib/lib/net.sf.jtreemap.ktreemap-1.1.0.jar b/code/languages/org.mpsqa.base/solutions/org.mpsqa.treemap.lib/lib/net.sf.jtreemap.ktreemap-1.1.0.jar deleted file mode 100644 index 8e2b4c12..00000000 Binary files a/code/languages/org.mpsqa.base/solutions/org.mpsqa.treemap.lib/lib/net.sf.jtreemap.ktreemap-1.1.0.jar and /dev/null differ diff --git a/code/languages/org.mpsqa.base/solutions/org.mpsqa.treemap.lib/org.mpsqa.treemap.lib.msd b/code/languages/org.mpsqa.base/solutions/org.mpsqa.treemap.lib/org.mpsqa.treemap.lib.msd index bdded7d7..2db55156 100644 --- a/code/languages/org.mpsqa.base/solutions/org.mpsqa.treemap.lib/org.mpsqa.treemap.lib.msd +++ b/code/languages/org.mpsqa.base/solutions/org.mpsqa.treemap.lib/org.mpsqa.treemap.lib.msd @@ -1,23 +1,16 @@ - - - - - - - + + - - - - + + diff --git a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._060_arch_build.mps b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._060_arch_build.mps index d32d8be0..a929f4f6 100644 --- a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._060_arch_build.mps +++ b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._060_arch_build.mps @@ -203,8 +203,8 @@ - - + + @@ -431,18 +431,18 @@ - - - + + + - + - + - + - - + + @@ -450,16 +450,6 @@ - - - - - - - - - - diff --git a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.pluginSolution/models/visualization.mps b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.pluginSolution/models/visualization.mps index e4a82ad4..5a522ff7 100644 --- a/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.pluginSolution/models/visualization.mps +++ b/code/languages/org.mpsqa.clones/solutions/org.mpsqa.clones.pluginSolution/models/visualization.mps @@ -135,7 +135,6 @@ - @@ -149,7 +148,6 @@ - @@ -177,10 +175,8 @@ - - @@ -756,129 +752,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -1013,9 +888,9 @@ - + + - @@ -1038,7 +913,7 @@ - + diff --git a/code/languages/org.mpsqa.testing/README.md b/code/languages/org.mpsqa.testing/README.md index 7b51008a..17489494 100644 --- a/code/languages/org.mpsqa.testing/README.md +++ b/code/languages/org.mpsqa.testing/README.md @@ -10,7 +10,7 @@ small utilities about baseline generators tests (comparing the generated artifac 2. Use the javaagent in the to collect the coverage information 1. documentation about javaagent is [here](https://www.jacoco.org/jacoco/trunk/doc/agent.html) 2. enable collection of coverage by adding the jacoco java agent to jvm parameters as in the example below - 1. -javaagent:c:/work/mps-qa/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/lib/lib/jacocoagent.jar=destfile=C:/work/MPS_2021_1_4/bin/jacoco.exec,output=file,append=true” + 1. -javaagent:c:/work/mps-qa/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/lib/agent/jacocoagent.jar=destfile=C:/work/MPS_2021_1_4/bin/jacoco.exec,output=file,append=true” 3. start MPS and perform some actions in the IDE 4. close MPS and jacoco coverage will be saved in jacoco.exec in the bin directory 5. re-open MPS, goto ```Tools->Display JaCoCo Tests Coverage for This Project``` and the ```jacoco.exec``` file will be loaded and the coverage information displayed as a tree-map diff --git a/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/lib/.gitignore b/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/lib/.gitignore new file mode 100644 index 00000000..dc555529 --- /dev/null +++ b/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/lib/.gitignore @@ -0,0 +1 @@ +/lib \ No newline at end of file diff --git a/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/lib/lib/jacocoagent.jar b/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/lib/agent/jacocoagent.jar similarity index 100% rename from code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/lib/lib/jacocoagent.jar rename to code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/lib/agent/jacocoagent.jar diff --git a/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/lib/lib/jacocoant.jar b/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/lib/agent/jacocoant.jar similarity index 100% rename from code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/lib/lib/jacocoant.jar rename to code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/lib/agent/jacocoant.jar diff --git a/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/lib/lib/jacococli.jar b/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/lib/agent/jacococli.jar similarity index 100% rename from code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/lib/lib/jacococli.jar rename to code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/lib/agent/jacococli.jar diff --git a/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/lib/lib/asm-9.2.jar b/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/lib/lib/asm-9.2.jar deleted file mode 100644 index 3557ae41..00000000 Binary files a/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/lib/lib/asm-9.2.jar and /dev/null differ diff --git a/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/lib/lib/asm-commons-9.2.jar b/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/lib/lib/asm-commons-9.2.jar deleted file mode 100644 index 01028a00..00000000 Binary files a/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/lib/lib/asm-commons-9.2.jar and /dev/null differ diff --git a/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/lib/lib/asm-tree-9.2.jar b/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/lib/lib/asm-tree-9.2.jar deleted file mode 100644 index 0a6833a6..00000000 Binary files a/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/lib/lib/asm-tree-9.2.jar and /dev/null differ diff --git a/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/lib/lib/org.jacoco.agent-0.8.7.202105040129.jar b/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/lib/lib/org.jacoco.agent-0.8.7.202105040129.jar deleted file mode 100644 index 52332a37..00000000 Binary files a/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/lib/lib/org.jacoco.agent-0.8.7.202105040129.jar and /dev/null differ diff --git a/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/lib/lib/org.jacoco.ant-0.8.7.202105040129.jar b/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/lib/lib/org.jacoco.ant-0.8.7.202105040129.jar deleted file mode 100644 index 3372aa60..00000000 Binary files a/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/lib/lib/org.jacoco.ant-0.8.7.202105040129.jar and /dev/null differ diff --git a/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/lib/lib/org.jacoco.core-0.8.7.202105040129.jar b/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/lib/lib/org.jacoco.core-0.8.7.202105040129.jar deleted file mode 100644 index bb9e9a90..00000000 Binary files a/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/lib/lib/org.jacoco.core-0.8.7.202105040129.jar and /dev/null differ diff --git a/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/lib/lib/org.jacoco.report-0.8.7.202105040129.jar b/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/lib/lib/org.jacoco.report-0.8.7.202105040129.jar deleted file mode 100644 index 70b60627..00000000 Binary files a/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/lib/lib/org.jacoco.report-0.8.7.202105040129.jar and /dev/null differ diff --git a/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/models/org.mpsqa.testcov.jacoco.rt.java_coverage.mps b/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/models/org.mpsqa.testcov.jacoco.rt.java_coverage.mps index a4a27ab7..8a5955e9 100644 --- a/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/models/org.mpsqa.testcov.jacoco.rt.java_coverage.mps +++ b/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/models/org.mpsqa.testcov.jacoco.rt.java_coverage.mps @@ -1303,7 +1303,7 @@ - + diff --git a/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/models/org.mpsqa.testcov.jacoco.rt.visualization.mps b/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/models/org.mpsqa.testcov.jacoco.rt.visualization.mps index eb785400..a247a51f 100644 --- a/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/models/org.mpsqa.testcov.jacoco.rt.visualization.mps +++ b/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/models/org.mpsqa.testcov.jacoco.rt.visualization.mps @@ -155,7 +155,6 @@ - @@ -172,7 +171,6 @@ - @@ -201,10 +199,8 @@ - - @@ -1184,129 +1180,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -1441,8 +1316,8 @@ - - + + @@ -1462,7 +1337,7 @@ - + diff --git a/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/org.mpsqa.testcov.jacoco.rt.msd b/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/org.mpsqa.testcov.jacoco.rt.msd index 86c5ed20..3ea9671c 100644 --- a/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/org.mpsqa.testcov.jacoco.rt.msd +++ b/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testcov.jacoco.rt/org.mpsqa.testcov.jacoco.rt.msd @@ -1,46 +1,29 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + - - - - - + + + + + + + diff --git a/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testing.build/models/org.mpsqa.testing.build.mps b/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testing.build/models/org.mpsqa.testing.build.mps index df799c8b..41e243a6 100644 --- a/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testing.build/models/org.mpsqa.testing.build.mps +++ b/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testing.build/models/org.mpsqa.testing.build.mps @@ -210,8 +210,8 @@ - - + + @@ -230,8 +230,8 @@ - - + + @@ -250,8 +250,8 @@ - - + + @@ -270,8 +270,8 @@ - - + + @@ -290,8 +290,48 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -557,20 +597,73 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - - + + @@ -579,20 +672,20 @@ - - - + + + - + - + - + - + - - + + @@ -601,20 +694,20 @@ - - - + + + - + - + - + - + - - + + @@ -623,20 +716,20 @@ - - - + + + - + - + - + - + - - + + @@ -645,20 +738,20 @@ - - - + + + - + - + - + - + - - + + @@ -667,54 +760,45 @@ - - - - - - + + + - + - + - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + - + - + + + + + + + + + +