From 530ab9f19c83124d07afa0c9d04503dccb3c17e0 Mon Sep 17 00:00:00 2001 From: Marek Parfianowicz Date: Mon, 1 Jul 2024 23:55:06 +0200 Subject: [PATCH] OC-258: replace GSON by custom serializer methods; remove all references of GSON (pom.xml, license files, about boxes) --- clover-all/pom.xml | 4 - clover-core-libs/versions.xml | 1 - clover-core/pom.xml | 19 -- .../json/RenderTreeMapJsonAction.java | 42 +++- .../resources/licenses/GSON-1.3-LICENSE.TXT | 210 ------------------ .../org.openclover.eclipse.core/pom.xml | 2 +- .../ShowAboutCloverActionDelegate.java | 1 - .../com.cenqua.clover.core/.classpath | 1 - clover-groovy/pom.xml | 4 - .../java/org/openclover/idea/AboutDialog.java | 3 - clover-third-party-library-bom.html | 13 -- pom.xml | 5 - 12 files changed, 39 insertions(+), 266 deletions(-) delete mode 100644 clover-core/src/main/resources/licenses/GSON-1.3-LICENSE.TXT diff --git a/clover-all/pom.xml b/clover-all/pom.xml index a98ce59b..9252e804 100644 --- a/clover-all/pom.xml +++ b/clover-all/pom.xml @@ -88,10 +88,6 @@ it.unimi.dsi fastutil - - com.google.code.gson - gson - com.lowagie itext diff --git a/clover-core-libs/versions.xml b/clover-core-libs/versions.xml index 0b8e1073..71233fc6 100644 --- a/clover-core-libs/versions.xml +++ b/clover-core-libs/versions.xml @@ -7,7 +7,6 @@ - diff --git a/clover-core/pom.xml b/clover-core/pom.xml index efda772c..3433307e 100644 --- a/clover-core/pom.xml +++ b/clover-core/pom.xml @@ -74,10 +74,6 @@ jdom jdom - - com.google.code.gson - gson - com.lowagie itext @@ -345,7 +341,6 @@ commons-lang:commons-lang org.apache.commons:commons-lang3 it.unimi.dsi:fastutil - com.google.code.gson:gson com.lowagie:itext org.jfree:jcommon jdom:jdom @@ -409,13 +404,6 @@ build.xml - - com.google.code.gson:gson - - META-INF/MANIFEST.MF - **/assembly-descriptor.xml - - org.jfree:jcommon @@ -449,13 +437,6 @@ antlr.** - - com.google.gson - clover.com.google.gson - - com.google.gson.** - - com.lowagie clover.com.lowagie diff --git a/clover-core/src/main/java/org/openclover/core/reporters/json/RenderTreeMapJsonAction.java b/clover-core/src/main/java/org/openclover/core/reporters/json/RenderTreeMapJsonAction.java index 7d81c8aa..1acde72a 100644 --- a/clover-core/src/main/java/org/openclover/core/reporters/json/RenderTreeMapJsonAction.java +++ b/clover-core/src/main/java/org/openclover/core/reporters/json/RenderTreeMapJsonAction.java @@ -1,7 +1,6 @@ package org.openclover.core.reporters.json; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; +import org.apache.commons.lang3.StringEscapeUtils; import org.openclover.core.api.registry.BlockMetrics; import org.openclover.core.api.registry.ClassInfo; import org.openclover.core.api.registry.HasMetrics; @@ -16,10 +15,10 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; +import java.util.stream.Collectors; public class RenderTreeMapJsonAction { public static String generateJson(ProjectInfo project, HtmlRenderingSupportImpl renderSupport, boolean classLevel) { - final Gson gson = new GsonBuilder().setPrettyPrinting().create(); final List pkgInfos = project.getAllPackages(); @@ -44,7 +43,42 @@ public static String generateJson(ProjectInfo project, HtmlRenderingSupportImpl } } - return gson.toJson(projectNode); + return toJsonObject(projectNode); + } + + private static String toJsonObject(Node projectNode) { + return "{" + + toJsonAttr("id", projectNode.id) + "," + + toJsonAttr("name", projectNode.name) + "," + + toJsonAttr("data", toJsonObject(projectNode.data)) + "," + + toJsonAttr("children", toJsonArray(projectNode.children)) + + "}"; + } + + private static String toJsonObject(Data projectNodeData) { + return "{" + + toJsonAttr("$area", projectNodeData.$area) + "," + + toJsonAttr("$color", projectNodeData.$color) + "," + + toJsonAttr("path", projectNodeData.path) + "," + + toJsonAttr("title", projectNodeData.title) + + "}"; + } + + private static String toJsonAttr(String name, float value) { + return "\"" + name + "\":" + value; + } + + private static String toJsonAttr(String name, String value) { + return "\"" + name + "\":\"" + StringEscapeUtils.escapeJson(value) + "\""; + } + + private static String toJsonArray(Collection projectNodes) { + return "[" + + projectNodes + .stream() + .map(RenderTreeMapJsonAction::toJsonObject) + .collect(Collectors.joining(",")) + + "]"; } private static Node createNode(HtmlRenderingSupportImpl renderSupport, int index, String nodeName, diff --git a/clover-core/src/main/resources/licenses/GSON-1.3-LICENSE.TXT b/clover-core/src/main/resources/licenses/GSON-1.3-LICENSE.TXT deleted file mode 100644 index 93972acc..00000000 --- a/clover-core/src/main/resources/licenses/GSON-1.3-LICENSE.TXT +++ /dev/null @@ -1,210 +0,0 @@ -============================================================================================================ -Modified by Atlassian - -The binary file of the original library has been modified by Atlassian in such way that classes have changed -their package name from 'com.google.json' to 'clover.com.google.json'. This was necessary to -avoid potential name conflicts during instrumentation of a code using the original library when using OpenClover. -No source code of the original library was modified. -============================================================================================================ - - 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/clover-eclipse/org.openclover.eclipse.core/pom.xml b/clover-eclipse/org.openclover.eclipse.core/pom.xml index f69d6583..63687189 100644 --- a/clover-eclipse/org.openclover.eclipse.core/pom.xml +++ b/clover-eclipse/org.openclover.eclipse.core/pom.xml @@ -119,7 +119,7 @@ org.openclover.eclipse.core.CloverPlugin true . - clover.antlr,clover.antlr.ASdebug,clover.antlr.actions.cpp,clover.antlr.actions.csharp,clover.antlr.actions.java,clover.antlr.actions.python,clover.antlr.build,clover.antlr.collections,clover.antlr.collections.impl,clover.antlr.debug,clover.antlr.debug.misc,clover.antlr.preprocessor,clover.com.google.gson,clover.com.google.gson.annotations,clover.com.google.gson.reflect,clover.com.keypoint,clover.com.lowagie.text,clover.com.lowagie.text.html,clover.com.lowagie.text.html.simpleparser,clover.com.lowagie.text.pdf,clover.com.lowagie.text.pdf.codec,clover.com.lowagie.text.pdf.codec.postscript,clover.com.lowagie.text.pdf.codec.wmf,clover.com.lowagie.text.pdf.collection,clover.com.lowagie.text.pdf.crypto,clover.com.lowagie.text.pdf.events,clover.com.lowagie.text.pdf.fonts,clover.com.lowagie.text.pdf.hyphenation,clover.com.lowagie.text.pdf.interfaces,clover.com.lowagie.text.pdf.internal,clover.com.lowagie.text.rtf,clover.com.lowagie.text.rtf.direct,clover.com.lowagie.text.rtf.document,clover.com.lowagie.text.rtf.document.output,clover.com.lowagie.text.rtf.field,clover.com.lowagie.text.rtf.graphic,clover.com.lowagie.text.rtf.headerfooter,clover.com.lowagie.text.rtf.list,clover.com.lowagie.text.rtf.style,clover.com.lowagie.text.rtf.table,clover.com.lowagie.text.rtf.text,clover.com.lowagie.text.xml,clover.com.lowagie.text.xml.simpleparser,clover.com.lowagie.text.xml.xmp,clover.com.lowagie.tools,clover.com.lowagie.tools.arguments,clover.com.lowagie.tools.plugins,clover.com.lowagie.tools.plugins.treeview,clover.gnu.cajo,clover.gnu.cajo.invoke,clover.gnu.cajo.utils,clover.gnu.cajo.utils.extra,clover.it.unimi.dsi.fastutil,clover.it.unimi.dsi.fastutil.bytes,clover.it.unimi.dsi.fastutil.ints,clover.it.unimi.dsi.fastutil.io,clover.it.unimi.dsi.fastutil.longs,clover.it.unimi.dsi.fastutil.objects,clover.org.apache.commons.codec,clover.org.apache.commons.codec.binary,clover.org.apache.commons.codec.digest,clover.org.apache.commons.codec.language,clover.org.apache.commons.codec.language.bm,clover.org.apache.commons.codec.net,clover.org.apache.commons.collections,clover.org.apache.commons.collections.bag,clover.org.apache.commons.collections.bidimap,clover.org.apache.commons.collections.buffer,clover.org.apache.commons.collections.collection,clover.org.apache.commons.collections.comparators,clover.org.apache.commons.collections.functors,clover.org.apache.commons.collections.iterators,clover.org.apache.commons.collections.keyvalue,clover.org.apache.commons.collections.list,clover.org.apache.commons.collections.map,clover.org.apache.commons.collections.set,clover.org.apache.commons.lang,clover.org.apache.commons.lang.builder,clover.org.apache.commons.lang.enums,clover.org.apache.commons.lang.exception,clover.org.apache.commons.lang.math,clover.org.apache.commons.lang.mutable,clover.org.apache.commons.lang.reflect,clover.org.apache.commons.lang.text,clover.org.apache.commons.lang.time,clover.org.apache.commons.lang3,clover.org.apache.commons.lang3.builder,clover.org.apache.commons.lang3.concurrent,clover.org.apache.commons.lang3.event,clover.org.apache.commons.lang3.exception,clover.org.apache.commons.lang3.math,clover.org.apache.commons.lang3.mutable,clover.org.apache.commons.lang3.reflect,clover.org.apache.commons.lang3.text,clover.org.apache.commons.lang3.text.translate,clover.org.apache.commons.lang3.time,clover.org.apache.commons.lang3.tuple,clover.org.apache.velocity,clover.org.apache.velocity.anakia,clover.org.apache.velocity.app,clover.org.apache.velocity.app.event,clover.org.apache.velocity.app.event.implement,clover.org.apache.velocity.app.tools,clover.org.apache.velocity.context,clover.org.apache.velocity.convert,clover.org.apache.velocity.exception,clover.org.apache.velocity.io,clover.org.apache.velocity.runtime,clover.org.apache.velocity.runtime.directive,clover.org.apache.velocity.runtime.log,clover.org.apache.velocity.runtime.parser,clover.org.apache.velocity.runtime.parser.node,clover.org.apache.velocity.runtime.resource,clover.org.apache.velocity.runtime.resource.loader,clover.org.apache.velocity.runtime.resource.util,clover.org.apache.velocity.runtime.visitor,clover.org.apache.velocity.servlet,clover.org.apache.velocity.texen,clover.org.apache.velocity.texen.ant,clover.org.apache.velocity.texen.util,clover.org.apache.velocity.util,clover.org.apache.velocity.util.introspection,clover.org.codehaus.groovy.antlr,clover.org.codehaus.groovy.antlr.parser,clover.org.jdom,clover.org.jdom.adapters,clover.org.jdom.filter,clover.org.jdom.input,clover.org.jdom.output,clover.org.jdom.transform,clover.org.jdom.xpath,clover.org.jfree,clover.org.jfree.base,clover.org.jfree.base.config,clover.org.jfree.base.log,clover.org.jfree.base.modules,clover.org.jfree.chart,clover.org.jfree.chart.annotations,clover.org.jfree.chart.axis,clover.org.jfree.chart.block,clover.org.jfree.chart.editor,clover.org.jfree.chart.encoders,clover.org.jfree.chart.entity,clover.org.jfree.chart.event,clover.org.jfree.chart.imagemap,clover.org.jfree.chart.labels,clover.org.jfree.chart.needle,clover.org.jfree.chart.panel,clover.org.jfree.chart.plot,clover.org.jfree.chart.plot.dial,clover.org.jfree.chart.renderer,clover.org.jfree.chart.renderer.category,clover.org.jfree.chart.renderer.xy,clover.org.jfree.chart.resources,clover.org.jfree.chart.servlet,clover.org.jfree.chart.title,clover.org.jfree.chart.urls,clover.org.jfree.chart.util,clover.org.jfree.data,clover.org.jfree.data.category,clover.org.jfree.data.contour,clover.org.jfree.data.function,clover.org.jfree.data.gantt,clover.org.jfree.data.general,clover.org.jfree.data.io,clover.org.jfree.data.jdbc,clover.org.jfree.data.resources,clover.org.jfree.data.statistics,clover.org.jfree.data.time,clover.org.jfree.data.time.ohlc,clover.org.jfree.data.xml,clover.org.jfree.data.xy,clover.org.jfree.date,clover.org.jfree.io,clover.org.jfree.layout,clover.org.jfree.resources,clover.org.jfree.text,clover.org.jfree.threads,clover.org.jfree.ui,clover.org.jfree.ui.about,clover.org.jfree.ui.about.resources,clover.org.jfree.ui.action,clover.org.jfree.ui.tabbedui,clover.org.jfree.util,clover.org.slf4j,clover.org.slf4j.event,clover.org.slf4j.helpers,clover.org.slf4j.spi,org.openclover.core,org.openclover.ant,org.openclover.ant.groovy,org.openclover.ant.taskdefs,org.openclover.ant.tasks,org.openclover.ant.tasks.testng,org.openclover.ant.types,org.openclover.core.api,org.openclover.ant.ci,org.openclover.core.api.command,org.openclover.core.api.instrumentation,org.openclover.core.api.optimization,org.openclover.core.api.registry,org.openclover.core.cfg,org.openclover.core.cfg.instr,org.openclover.core.cfg.instr.java,org.openclover.core.cmdline,org.openclover.core.context,org.openclover.core.instr,org.openclover.core.instr.java,org.openclover.core.instr.tests,org.openclover.core.instr.tests.naming,org.openclover.core.io.tags,org.openclover.core.lang,org.openclover.core.model,org.openclover.core.optimization,org.openclover.runtime.recorder,org.openclover.runtime.recorder.junit,org.openclover.runtime.recorder.pertest,org.openclover.runtime.recorder.spock,org.openclover.core.registry,org.openclover.core.registry.entities,org.openclover.core.registry.format,org.openclover.core.registry.metrics,org.openclover.core.registry.util,org.openclover.runtime.remote,org.openclover.core.reporters,org.openclover.core.reporters.console,org.openclover.core.reporters.filters,org.openclover.core.reporters.html,org.openclover.core.reporters.html.source,org.openclover.core.reporters.html.source.groovy,org.openclover.core.reporters.html.source.java,org.openclover.core.reporters.json,org.openclover.core.reporters.pdf,org.openclover.core.reporters.util,org.openclover.core.reporters.xml,org.openclover.core.services,org.openclover.core.spec.instr.test,org.openclover.core.spi.lang,org.openclover.core.spi.reporters.html.source,org.openclover.core.util,org.openclover.core.util.collections,org.openclover.core.util.format,org.openclover.core.util.trie,org.openclover.core.versions,org_openclover_runtime,net.sf.jtreemap.ktreemap,net.sf.jtreemap.ktreemap.example,org.eclipse.jdt.internal.compiler.batch,org.jetbrains.annotations,org.objectweb.asm,org.objectweb.asm.signature,org.openclover.ci,org.openclover.eclipse.core,org.openclover.eclipse.core.exclusion,org.openclover.eclipse.core.launching,org.openclover.eclipse.core.launching.actions,org.openclover.eclipse.core.projects,org.openclover.eclipse.core.projects.builder,org.openclover.eclipse.core.projects.model,org.openclover.eclipse.core.projects.settings,org.openclover.eclipse.core.projects.settings.source,org.openclover.eclipse.core.projects.settings.source.test,org.openclover.eclipse.core.reports,org.openclover.eclipse.core.reports.model,org.openclover.eclipse.core.reports.reporters,org.openclover.eclipse.core.settings,org.openclover.eclipse.core.settings.upgrade,org.openclover.eclipse.core.ui,org.openclover.eclipse.core.ui.editors,org.openclover.eclipse.core.ui.editors.cloud,org.openclover.eclipse.core.ui.editors.java,org.openclover.eclipse.core.ui.editors.java.actions,org.openclover.eclipse.core.ui.editors.java.annotations.strategies,org.openclover.eclipse.core.ui.editors.java.annotations.strategies.space,org.openclover.eclipse.core.ui.editors.treemap,org.openclover.eclipse.core.ui.projects,org.openclover.eclipse.core.ui.projects.widgets,org.openclover.eclipse.core.ui.widgets,org.openclover.eclipse.core.ui.workingset,org.openclover.eclipse.core.upgrade.hooks,org.openclover.eclipse.core.views,org.openclover.eclipse.core.views.actions,org.openclover.eclipse.core.views.coverageexplorer,org.openclover.eclipse.core.views.coverageexplorer.actions,org.openclover.eclipse.core.views.coverageexplorer.nodes,org.openclover.eclipse.core.views.coverageexplorer.widgets,org.openclover.eclipse.core.views.dashboard,org.openclover.eclipse.core.views.nodes,org.openclover.eclipse.core.views.testcontributions,org.openclover.eclipse.core.views.testrunexplorer,org.openclover.eclipse.core.views.testrunexplorer.actions,org.openclover.eclipse.core.views.testrunexplorer.nodes,org.openclover.eclipse.core.views.testrunexplorer.widgets,org.openclover.eclipse.core.views.widgets,org.openclover.eclipse.core.views.widgets.columns,org.openclover.eclipse.core.views.widgets.context,org.openclover.util,org.openclover.util.function + clover.antlr,clover.antlr.ASdebug,clover.antlr.actions.cpp,clover.antlr.actions.csharp,clover.antlr.actions.java,clover.antlr.actions.python,clover.antlr.build,clover.antlr.collections,clover.antlr.collections.impl,clover.antlr.debug,clover.antlr.debug.misc,clover.antlr.preprocessor,clover.com.keypoint,clover.com.lowagie.text,clover.com.lowagie.text.html,clover.com.lowagie.text.html.simpleparser,clover.com.lowagie.text.pdf,clover.com.lowagie.text.pdf.codec,clover.com.lowagie.text.pdf.codec.postscript,clover.com.lowagie.text.pdf.codec.wmf,clover.com.lowagie.text.pdf.collection,clover.com.lowagie.text.pdf.crypto,clover.com.lowagie.text.pdf.events,clover.com.lowagie.text.pdf.fonts,clover.com.lowagie.text.pdf.hyphenation,clover.com.lowagie.text.pdf.interfaces,clover.com.lowagie.text.pdf.internal,clover.com.lowagie.text.rtf,clover.com.lowagie.text.rtf.direct,clover.com.lowagie.text.rtf.document,clover.com.lowagie.text.rtf.document.output,clover.com.lowagie.text.rtf.field,clover.com.lowagie.text.rtf.graphic,clover.com.lowagie.text.rtf.headerfooter,clover.com.lowagie.text.rtf.list,clover.com.lowagie.text.rtf.style,clover.com.lowagie.text.rtf.table,clover.com.lowagie.text.rtf.text,clover.com.lowagie.text.xml,clover.com.lowagie.text.xml.simpleparser,clover.com.lowagie.text.xml.xmp,clover.com.lowagie.tools,clover.com.lowagie.tools.arguments,clover.com.lowagie.tools.plugins,clover.com.lowagie.tools.plugins.treeview,clover.gnu.cajo,clover.gnu.cajo.invoke,clover.gnu.cajo.utils,clover.gnu.cajo.utils.extra,clover.it.unimi.dsi.fastutil,clover.it.unimi.dsi.fastutil.bytes,clover.it.unimi.dsi.fastutil.ints,clover.it.unimi.dsi.fastutil.io,clover.it.unimi.dsi.fastutil.longs,clover.it.unimi.dsi.fastutil.objects,clover.org.apache.commons.codec,clover.org.apache.commons.codec.binary,clover.org.apache.commons.codec.digest,clover.org.apache.commons.codec.language,clover.org.apache.commons.codec.language.bm,clover.org.apache.commons.codec.net,clover.org.apache.commons.collections,clover.org.apache.commons.collections.bag,clover.org.apache.commons.collections.bidimap,clover.org.apache.commons.collections.buffer,clover.org.apache.commons.collections.collection,clover.org.apache.commons.collections.comparators,clover.org.apache.commons.collections.functors,clover.org.apache.commons.collections.iterators,clover.org.apache.commons.collections.keyvalue,clover.org.apache.commons.collections.list,clover.org.apache.commons.collections.map,clover.org.apache.commons.collections.set,clover.org.apache.commons.lang,clover.org.apache.commons.lang.builder,clover.org.apache.commons.lang.enums,clover.org.apache.commons.lang.exception,clover.org.apache.commons.lang.math,clover.org.apache.commons.lang.mutable,clover.org.apache.commons.lang.reflect,clover.org.apache.commons.lang.text,clover.org.apache.commons.lang.time,clover.org.apache.commons.lang3,clover.org.apache.commons.lang3.builder,clover.org.apache.commons.lang3.concurrent,clover.org.apache.commons.lang3.event,clover.org.apache.commons.lang3.exception,clover.org.apache.commons.lang3.math,clover.org.apache.commons.lang3.mutable,clover.org.apache.commons.lang3.reflect,clover.org.apache.commons.lang3.text,clover.org.apache.commons.lang3.text.translate,clover.org.apache.commons.lang3.time,clover.org.apache.commons.lang3.tuple,clover.org.apache.velocity,clover.org.apache.velocity.anakia,clover.org.apache.velocity.app,clover.org.apache.velocity.app.event,clover.org.apache.velocity.app.event.implement,clover.org.apache.velocity.app.tools,clover.org.apache.velocity.context,clover.org.apache.velocity.convert,clover.org.apache.velocity.exception,clover.org.apache.velocity.io,clover.org.apache.velocity.runtime,clover.org.apache.velocity.runtime.directive,clover.org.apache.velocity.runtime.log,clover.org.apache.velocity.runtime.parser,clover.org.apache.velocity.runtime.parser.node,clover.org.apache.velocity.runtime.resource,clover.org.apache.velocity.runtime.resource.loader,clover.org.apache.velocity.runtime.resource.util,clover.org.apache.velocity.runtime.visitor,clover.org.apache.velocity.servlet,clover.org.apache.velocity.texen,clover.org.apache.velocity.texen.ant,clover.org.apache.velocity.texen.util,clover.org.apache.velocity.util,clover.org.apache.velocity.util.introspection,clover.org.codehaus.groovy.antlr,clover.org.codehaus.groovy.antlr.parser,clover.org.jdom,clover.org.jdom.adapters,clover.org.jdom.filter,clover.org.jdom.input,clover.org.jdom.output,clover.org.jdom.transform,clover.org.jdom.xpath,clover.org.jfree,clover.org.jfree.base,clover.org.jfree.base.config,clover.org.jfree.base.log,clover.org.jfree.base.modules,clover.org.jfree.chart,clover.org.jfree.chart.annotations,clover.org.jfree.chart.axis,clover.org.jfree.chart.block,clover.org.jfree.chart.editor,clover.org.jfree.chart.encoders,clover.org.jfree.chart.entity,clover.org.jfree.chart.event,clover.org.jfree.chart.imagemap,clover.org.jfree.chart.labels,clover.org.jfree.chart.needle,clover.org.jfree.chart.panel,clover.org.jfree.chart.plot,clover.org.jfree.chart.plot.dial,clover.org.jfree.chart.renderer,clover.org.jfree.chart.renderer.category,clover.org.jfree.chart.renderer.xy,clover.org.jfree.chart.resources,clover.org.jfree.chart.servlet,clover.org.jfree.chart.title,clover.org.jfree.chart.urls,clover.org.jfree.chart.util,clover.org.jfree.data,clover.org.jfree.data.category,clover.org.jfree.data.contour,clover.org.jfree.data.function,clover.org.jfree.data.gantt,clover.org.jfree.data.general,clover.org.jfree.data.io,clover.org.jfree.data.jdbc,clover.org.jfree.data.resources,clover.org.jfree.data.statistics,clover.org.jfree.data.time,clover.org.jfree.data.time.ohlc,clover.org.jfree.data.xml,clover.org.jfree.data.xy,clover.org.jfree.date,clover.org.jfree.io,clover.org.jfree.layout,clover.org.jfree.resources,clover.org.jfree.text,clover.org.jfree.threads,clover.org.jfree.ui,clover.org.jfree.ui.about,clover.org.jfree.ui.about.resources,clover.org.jfree.ui.action,clover.org.jfree.ui.tabbedui,clover.org.jfree.util,clover.org.slf4j,clover.org.slf4j.event,clover.org.slf4j.helpers,clover.org.slf4j.spi,org.openclover.core,org.openclover.ant,org.openclover.ant.groovy,org.openclover.ant.taskdefs,org.openclover.ant.tasks,org.openclover.ant.tasks.testng,org.openclover.ant.types,org.openclover.core.api,org.openclover.ant.ci,org.openclover.core.api.command,org.openclover.core.api.instrumentation,org.openclover.core.api.optimization,org.openclover.core.api.registry,org.openclover.core.cfg,org.openclover.core.cfg.instr,org.openclover.core.cfg.instr.java,org.openclover.core.cmdline,org.openclover.core.context,org.openclover.core.instr,org.openclover.core.instr.java,org.openclover.core.instr.tests,org.openclover.core.instr.tests.naming,org.openclover.core.io.tags,org.openclover.core.lang,org.openclover.core.model,org.openclover.core.optimization,org.openclover.runtime.recorder,org.openclover.runtime.recorder.junit,org.openclover.runtime.recorder.pertest,org.openclover.runtime.recorder.spock,org.openclover.core.registry,org.openclover.core.registry.entities,org.openclover.core.registry.format,org.openclover.core.registry.metrics,org.openclover.core.registry.util,org.openclover.runtime.remote,org.openclover.core.reporters,org.openclover.core.reporters.console,org.openclover.core.reporters.filters,org.openclover.core.reporters.html,org.openclover.core.reporters.html.source,org.openclover.core.reporters.html.source.groovy,org.openclover.core.reporters.html.source.java,org.openclover.core.reporters.json,org.openclover.core.reporters.pdf,org.openclover.core.reporters.util,org.openclover.core.reporters.xml,org.openclover.core.services,org.openclover.core.spec.instr.test,org.openclover.core.spi.lang,org.openclover.core.spi.reporters.html.source,org.openclover.core.util,org.openclover.core.util.collections,org.openclover.core.util.format,org.openclover.core.util.trie,org.openclover.core.versions,org_openclover_runtime,net.sf.jtreemap.ktreemap,net.sf.jtreemap.ktreemap.example,org.eclipse.jdt.internal.compiler.batch,org.jetbrains.annotations,org.objectweb.asm,org.objectweb.asm.signature,org.openclover.ci,org.openclover.eclipse.core,org.openclover.eclipse.core.exclusion,org.openclover.eclipse.core.launching,org.openclover.eclipse.core.launching.actions,org.openclover.eclipse.core.projects,org.openclover.eclipse.core.projects.builder,org.openclover.eclipse.core.projects.model,org.openclover.eclipse.core.projects.settings,org.openclover.eclipse.core.projects.settings.source,org.openclover.eclipse.core.projects.settings.source.test,org.openclover.eclipse.core.reports,org.openclover.eclipse.core.reports.model,org.openclover.eclipse.core.reports.reporters,org.openclover.eclipse.core.settings,org.openclover.eclipse.core.settings.upgrade,org.openclover.eclipse.core.ui,org.openclover.eclipse.core.ui.editors,org.openclover.eclipse.core.ui.editors.cloud,org.openclover.eclipse.core.ui.editors.java,org.openclover.eclipse.core.ui.editors.java.actions,org.openclover.eclipse.core.ui.editors.java.annotations.strategies,org.openclover.eclipse.core.ui.editors.java.annotations.strategies.space,org.openclover.eclipse.core.ui.editors.treemap,org.openclover.eclipse.core.ui.projects,org.openclover.eclipse.core.ui.projects.widgets,org.openclover.eclipse.core.ui.widgets,org.openclover.eclipse.core.ui.workingset,org.openclover.eclipse.core.upgrade.hooks,org.openclover.eclipse.core.views,org.openclover.eclipse.core.views.actions,org.openclover.eclipse.core.views.coverageexplorer,org.openclover.eclipse.core.views.coverageexplorer.actions,org.openclover.eclipse.core.views.coverageexplorer.nodes,org.openclover.eclipse.core.views.coverageexplorer.widgets,org.openclover.eclipse.core.views.dashboard,org.openclover.eclipse.core.views.nodes,org.openclover.eclipse.core.views.testcontributions,org.openclover.eclipse.core.views.testrunexplorer,org.openclover.eclipse.core.views.testrunexplorer.actions,org.openclover.eclipse.core.views.testrunexplorer.nodes,org.openclover.eclipse.core.views.testrunexplorer.widgets,org.openclover.eclipse.core.views.widgets,org.openclover.eclipse.core.views.widgets.columns,org.openclover.eclipse.core.views.widgets.context,org.openclover.util,org.openclover.util.function diff --git a/clover-eclipse/org.openclover.eclipse.core/src/main/java/org/openclover/eclipse/core/views/actions/ShowAboutCloverActionDelegate.java b/clover-eclipse/org.openclover.eclipse.core/src/main/java/org/openclover/eclipse/core/views/actions/ShowAboutCloverActionDelegate.java index 0debb517..6ba933f5 100644 --- a/clover-eclipse/org.openclover.eclipse.core/src/main/java/org/openclover/eclipse/core/views/actions/ShowAboutCloverActionDelegate.java +++ b/clover-eclipse/org.openclover.eclipse.core/src/main/java/org/openclover/eclipse/core/views/actions/ShowAboutCloverActionDelegate.java @@ -123,7 +123,6 @@ private void createAckTab(TabFolder tabFolder) { linkAndLicense("Commons Lang", "https://commons.apache.org", "COMMONS-LANG3-3.3.2-LICENSE.TXT", ackComposite); linkAndLicense("FastUtil", "https://fastutil.dsi.unimi.it/", "FASTUTIL-4.4.3-LICENSE.TXT", ackComposite); linkAndLicense("Groovy", "https://groovy.codehaus.org", "GROOVY-1.7.0-LICENSE.TXT", ackComposite); - linkAndLicense("GSON", "https://code.google.com/p/google-gson", "GSON-1.3-LICENSE.TXT", ackComposite); linkAndLicense("iText", "https://itextpdf.com", "ITEXT-2.0.1-LICENSE.TXT", ackComposite); linkAndLicense("JCommon", "https://www.jfree.org/jfreechart/", "JCOMMON-1.0.23-LICENSE.TXT", ackComposite); linkAndLicense("JDOM", "https://www.jdom.org", "JDOM-1.0-LICENSE.TXT", ackComposite); diff --git a/clover-eclipse/workspace/com.cenqua.clover.core/.classpath b/clover-eclipse/workspace/com.cenqua.clover.core/.classpath index 0ddad0c9..9844d6ab 100644 --- a/clover-eclipse/workspace/com.cenqua.clover.core/.classpath +++ b/clover-eclipse/workspace/com.cenqua.clover.core/.classpath @@ -13,7 +13,6 @@ - diff --git a/clover-groovy/pom.xml b/clover-groovy/pom.xml index 56a475c5..73ab197d 100644 --- a/clover-groovy/pom.xml +++ b/clover-groovy/pom.xml @@ -193,10 +193,6 @@ it.unimi.dsi fastutil - - com.google.code.gson - gson - com.lowagie itext diff --git a/clover-idea/src/main/java/org/openclover/idea/AboutDialog.java b/clover-idea/src/main/java/org/openclover/idea/AboutDialog.java index 99bdd8e7..d63e55d1 100644 --- a/clover-idea/src/main/java/org/openclover/idea/AboutDialog.java +++ b/clover-idea/src/main/java/org/openclover/idea/AboutDialog.java @@ -108,9 +108,6 @@ private String getAcknowledgementsText() { addRow(sb, addProduct("FastUtil", "https://fastutil.dsi.unimi.it/", "FASTUTIL-4.4.3-LICENSE.TXT"), addProduct("Groovy", "https://groovy.codehaus.org", "GROOVY-1.7.0-LICENSE.TXT")); - addRow(sb, - addProduct("GSON", "https://code.google.com/p/google-gson", "GSON-1.3-LICENSE.TXT"), - addProduct("", "", "")); addRow(sb, addProduct("iText", "https://itextpdf.com", "ITEXT-2.0.1-LICENSE.TXT"), addProduct("JCommon", "https://www.jfree.org/jfreechart/", "JCOMMON-1.0.23-LICENSE.TXT")); diff --git a/clover-third-party-library-bom.html b/clover-third-party-library-bom.html index 18c7f1ea..23a51d54 100644 --- a/clover-third-party-library-bom.html +++ b/clover-third-party-library-bom.html @@ -155,19 +155,6 @@

Third party binaries bundled in the final OpenClover products (Clover-for-An clover-core/src/main/resources/licenses/FASTUTIL-4.4.3-LICENSE.TXT   - - GSON - 2.10.1 - Apache 2.0 - code.google.com/p/google-gson - clover-core - no - clover. prefix - clover-core-libs\clover-gson\src\main\resources\gson-1.3.jar - Atlassian Private org.openclover:clover-gson - clover-core/src/main/resources/licenses/GSON-1.3-LICENSE.TXT -   - iText 2.0.1 diff --git a/pom.xml b/pom.xml index b48f173a..b3503ba6 100644 --- a/pom.xml +++ b/pom.xml @@ -117,11 +117,6 @@ fastutil 4.4.3 - - com.google.code.gson - gson - 2.10.1 -