diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index 642d572ce90..a9f1ef87bb2 100755 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -1,2 +1,2 @@ -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.3/apache-maven-3.8.3-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar diff --git a/modules/openapi-generator-cli/pom.xml b/modules/openapi-generator-cli/pom.xml index f8fc8dd8a8e..eff2ae39ca4 100644 --- a/modules/openapi-generator-cli/pom.xml +++ b/modules/openapi-generator-cli/pom.xml @@ -36,6 +36,7 @@ org.apache.maven.plugins maven-jar-plugin + ${maven-jar-plugin.version} @@ -144,13 +145,13 @@ org.testng testng - + ${testng.version} test org.mockito mockito-core - ${mockito-version} + ${mockito.version} test diff --git a/modules/openapi-generator-core/pom.xml b/modules/openapi-generator-core/pom.xml index 558f9ab56e7..9eedc6a8347 100644 --- a/modules/openapi-generator-core/pom.xml +++ b/modules/openapi-generator-core/pom.xml @@ -32,16 +32,17 @@ com.google.guava guava - ${guava-version} + ${guava.version} org.slf4j slf4j-api - ${slf4j-version} + ${slf4j.version} org.testng testng + ${testng.version} test @@ -70,9 +71,4 @@ - - - 1.7.29 - 26.0-jre - diff --git a/modules/openapi-generator-core/src/main/java/org/openapitools/codegen/config/GeneratorSettings.java b/modules/openapi-generator-core/src/main/java/org/openapitools/codegen/config/GeneratorSettings.java index e1044092007..8bbece6784a 100644 --- a/modules/openapi-generator-core/src/main/java/org/openapitools/codegen/config/GeneratorSettings.java +++ b/modules/openapi-generator-core/src/main/java/org/openapitools/codegen/config/GeneratorSettings.java @@ -16,8 +16,6 @@ package org.openapitools.codegen.config; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableSet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -48,13 +46,13 @@ public final class GeneratorSettings implements Serializable { private String artifactVersion; private String library; - private final ImmutableMap instantiationTypes; - private final ImmutableMap typeMappings; - private final ImmutableMap additionalProperties; - private final ImmutableMap importMappings; - private final ImmutableSet languageSpecificPrimitives; - private final ImmutableMap reservedWordMappings; - private final ImmutableMap serverVariables; + private final Map instantiationTypes; + private final Map typeMappings; + private final Map additionalProperties; + private final Map importMappings; + private final Set languageSpecificPrimitives; + private final Map reservedWordMappings; + private final Map serverVariables; private String gitHost; private String gitUserId; @@ -348,12 +346,12 @@ public final class GeneratorSettings implements Serializable { artifactId = builder.artifactId; artifactVersion = builder.artifactVersion; library = builder.library; - instantiationTypes = ImmutableMap.copyOf(builder.instantiationTypes); - typeMappings = ImmutableMap.copyOf(builder.typeMappings); - importMappings = ImmutableMap.copyOf(builder.importMappings); - languageSpecificPrimitives = ImmutableSet.copyOf(builder.languageSpecificPrimitives); - reservedWordMappings = ImmutableMap.copyOf(builder.reservedWordMappings); - serverVariables = ImmutableMap.copyOf(builder.serverVariables); + instantiationTypes = Collections.unmodifiableMap(builder.instantiationTypes); + typeMappings = Collections.unmodifiableMap(builder.typeMappings); + importMappings = Collections.unmodifiableMap(builder.importMappings); + languageSpecificPrimitives = Collections.unmodifiableSet(builder.languageSpecificPrimitives); + reservedWordMappings = Collections.unmodifiableMap(builder.reservedWordMappings); + serverVariables = Collections.unmodifiableMap(builder.serverVariables); gitHost = builder.gitHost; gitUserId = builder.gitUserId; gitRepoId = builder.gitRepoId; @@ -408,7 +406,7 @@ public final class GeneratorSettings implements Serializable { additional.put("httpUserAgent", httpUserAgent); } - additionalProperties = ImmutableMap.copyOf(additional); + additionalProperties = Collections.unmodifiableMap(additional); } /** @@ -417,13 +415,13 @@ public final class GeneratorSettings implements Serializable { @SuppressWarnings("unused") public GeneratorSettings() { setDefaults(); - instantiationTypes = ImmutableMap.of(); - typeMappings = ImmutableMap.of(); - additionalProperties = ImmutableMap.of(); - importMappings = ImmutableMap.of(); - languageSpecificPrimitives = ImmutableSet.of(); - reservedWordMappings = ImmutableMap.of(); - serverVariables = ImmutableMap.of(); + instantiationTypes = Collections.unmodifiableMap(new HashMap<>(0)); + typeMappings = Collections.unmodifiableMap(new HashMap<>(0)); + additionalProperties = Collections.unmodifiableMap(new HashMap<>(0)); + importMappings = Collections.unmodifiableMap(new HashMap<>(0)); + languageSpecificPrimitives = Collections.unmodifiableSet(new HashSet<>(0)); + reservedWordMappings = Collections.unmodifiableMap(new HashMap<>(0)); + serverVariables = Collections.unmodifiableMap(new HashMap<>(0)); } private void setDefaults() { diff --git a/modules/openapi-generator-core/src/main/java/org/openapitools/codegen/config/WorkflowSettings.java b/modules/openapi-generator-core/src/main/java/org/openapitools/codegen/config/WorkflowSettings.java index 0f2f605dd66..e2feddb9822 100644 --- a/modules/openapi-generator-core/src/main/java/org/openapitools/codegen/config/WorkflowSettings.java +++ b/modules/openapi-generator-core/src/main/java/org/openapitools/codegen/config/WorkflowSettings.java @@ -16,7 +16,6 @@ package org.openapitools.codegen.config; -import com.google.common.collect.ImmutableMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -25,10 +24,7 @@ import java.net.URI; import java.net.URISyntaxException; import java.net.URL; import java.nio.file.Paths; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; +import java.util.*; import java.util.regex.Pattern; import java.util.stream.Collectors; @@ -51,7 +47,7 @@ public class WorkflowSettings { public static final boolean DEFAULT_STRICT_SPEC_BEHAVIOR = true; public static final boolean DEFAULT_GENERATE_ALIAS_AS_MODEL = false; public static final String DEFAULT_TEMPLATING_ENGINE_NAME = "mustache"; - public static final ImmutableMap DEFAULT_GLOBAL_PROPERTIES = ImmutableMap.of(); + public static final Map DEFAULT_GLOBAL_PROPERTIES = Collections.unmodifiableMap(new HashMap<>()); private String inputSpec; private String outputDir = DEFAULT_OUTPUT_DIR; @@ -68,7 +64,7 @@ public class WorkflowSettings { private String templateDir; private String templatingEngineName = DEFAULT_TEMPLATING_ENGINE_NAME; private String ignoreFileOverride; - private ImmutableMap globalProperties = DEFAULT_GLOBAL_PROPERTIES; + private Map globalProperties = DEFAULT_GLOBAL_PROPERTIES; private WorkflowSettings(Builder builder) { this.inputSpec = builder.inputSpec; @@ -84,7 +80,7 @@ public class WorkflowSettings { this.templateDir = builder.templateDir; this.templatingEngineName = builder.templatingEngineName; this.ignoreFileOverride = builder.ignoreFileOverride; - this.globalProperties = ImmutableMap.copyOf(builder.globalProperties); + this.globalProperties = Collections.unmodifiableMap(builder.globalProperties); this.generateAliasAsModel = builder.generateAliasAsModel; } diff --git a/modules/openapi-generator-core/src/main/java/org/openapitools/codegen/meta/FeatureSet.java b/modules/openapi-generator-core/src/main/java/org/openapitools/codegen/meta/FeatureSet.java index 3ff23a51a39..db98fe2be7b 100644 --- a/modules/openapi-generator-core/src/main/java/org/openapitools/codegen/meta/FeatureSet.java +++ b/modules/openapi-generator-core/src/main/java/org/openapitools/codegen/meta/FeatureSet.java @@ -16,7 +16,6 @@ package org.openapitools.codegen.meta; -import com.google.common.collect.ImmutableList; import org.openapitools.codegen.meta.features.*; import org.openapitools.codegen.meta.features.annotations.AnnotationType; @@ -203,7 +202,7 @@ public class FeatureSet { } public List getSource() { - return ImmutableList.copyOf(source); + return Collections.unmodifiableList(source); } } diff --git a/modules/openapi-generator-gradle-plugin/pom.xml b/modules/openapi-generator-gradle-plugin/pom.xml index a21ff37cbd8..d5ba85c0ef3 100644 --- a/modules/openapi-generator-gradle-plugin/pom.xml +++ b/modules/openapi-generator-gradle-plugin/pom.xml @@ -106,7 +106,7 @@ org.gradle gradle-tooling-api - ${gradleVersion} + 5.6.4 diff --git a/modules/openapi-generator-maven-plugin/pom.xml b/modules/openapi-generator-maven-plugin/pom.xml index dea22fd5c7f..1ba1413d34c 100644 --- a/modules/openapi-generator-maven-plugin/pom.xml +++ b/modules/openapi-generator-maven-plugin/pom.xml @@ -17,7 +17,6 @@ UTF-8 **/src/main/java/org/openapitools/codegen/plugin/**/* - 3.0.5 @@ -59,7 +58,7 @@ junit junit - + ${junit.version} test diff --git a/modules/openapi-generator-online/pom.xml b/modules/openapi-generator-online/pom.xml index 5fcf6e8ab52..a63300a1adf 100644 --- a/modules/openapi-generator-online/pom.xml +++ b/modules/openapi-generator-online/pom.xml @@ -12,13 +12,8 @@ jar openapi-generator-online - 1.8 - ${java.version} - ${java.version} - 2.2.9.RELEASE + 2.5.5 3.0.0 - 4.13 - 2.10.2 **/org/openapitools/codegen/online/**/* @@ -26,7 +21,7 @@ org.springframework.boot spring-boot-dependencies - ${spring-boot-version} + ${spring-boot.version} pom import @@ -54,7 +49,7 @@ org.springframework.boot spring-boot-maven-plugin - ${spring-boot-version} + ${spring-boot.version} @@ -120,16 +115,6 @@ - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - ${jackson-version} - - - com.fasterxml.jackson.core - jackson-core - ${jackson-version} - jakarta.validation @@ -141,6 +126,12 @@ ${project.parent.version} + + junit + junit + ${junit.version} + test + org.springframework.boot spring-boot-starter-test @@ -151,12 +142,5 @@ spring-boot-test test - - org.hamcrest - java-hamcrest - 2.0.0.0 - test - - diff --git a/modules/openapi-generator-online/src/test/java/org/openapitools/codegen/online/api/GenApiControllerTest.java b/modules/openapi-generator-online/src/test/java/org/openapitools/codegen/online/api/GenApiControllerTest.java index 14254c446a3..262e0eba660 100644 --- a/modules/openapi-generator-online/src/test/java/org/openapitools/codegen/online/api/GenApiControllerTest.java +++ b/modules/openapi-generator-online/src/test/java/org/openapitools/codegen/online/api/GenApiControllerTest.java @@ -28,7 +28,6 @@ public class GenApiControllerTest { @Autowired private MockMvc mockMvc; - @Test public void clientLanguages() throws Exception { getLanguages("clients", "java"); @@ -126,4 +125,4 @@ public class GenApiControllerTest { .andExpect(header().string(HttpHeaders.CONTENT_LENGTH, not(0))); } -} \ No newline at end of file +} diff --git a/modules/openapi-generator/pom.xml b/modules/openapi-generator/pom.xml index 53980c499c2..112bcc4d980 100644 --- a/modules/openapi-generator/pom.xml +++ b/modules/openapi-generator/pom.xml @@ -27,17 +27,17 @@ org.jvnet.wagon-svn wagon-svn - 1.12 + ${wagon-svn.version} org.apache.maven.wagon wagon-ssh-external - 2.10 + ${wagon-ssh-external.version} org.apache.maven.wagon wagon-webdav - 1.0-beta-2 + ${wagon-webdav.version} target @@ -107,16 +107,16 @@ maven-compiler-plugin - 3.8.1 + ${maven-compiler-plugin.version} - 1.8 - 1.8 + ${maven.compiler.source} + ${maven.compiler.source} org.apache.maven.plugins maven-jar-plugin - 3.1.0 + ${maven-jar-plugin.version} @@ -138,12 +138,12 @@ org.apache.maven.plugins maven-site-plugin - 3.7.1 + ${maven-site-plugin.version} org.apache.maven.plugins maven-release-plugin - 2.5.3 + ${maven-release-plugin.version} @@ -214,7 +214,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.1.1 + ${maven-javadoc-plugin.version} true @@ -235,7 +235,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.0.0 + ${maven-project-info-reports-plugin.version} @@ -246,85 +246,71 @@ - - 1.3.0 - 26.0-jre - 1.0.2 - 1.3 - 2.10.1 - 2.10.0 - 1.3.60 - io.swagger.core.v3 swagger-core - ${swagger-core-version} + ${swagger-core.version} - ${swagger-parser-groupid} + ${swagger-parser-groupid.version} swagger-parser - ${swagger-parser-version} + ${swagger-parser.version} com.samskivert jmustache - ${jmustache-version} + ${jmustache.version} com.github.jknack handlebars - ${handlebars.java-version} + ${handlebars-java.version} com.github.jknack handlebars-jackson2 - ${handlebars.java-version} + ${handlebars-java.version} commons-io commons-io - ${commons-io-version} + ${commons-io.version} org.slf4j slf4j-ext - ${slf4j-version} + ${slf4j.version} org.slf4j slf4j-api - ${slf4j-version} + ${slf4j.version} org.slf4j slf4j-simple - ${slf4j-version} + ${slf4j.version} org.apache.commons commons-lang3 - ${commons-lang-version} + ${commons-lang.version} commons-cli commons-cli - ${commons-cli-version} + ${commons-cli.version} com.google.guava guava - ${guava-version} + ${guava.version} com.fasterxml.jackson.datatype jackson-datatype-guava - ${jackson-version} - - - com.fasterxml.jackson.core - jackson-core - ${jackson-version} + ${jackson.version} com.tngtech.archunit @@ -341,7 +327,7 @@ org.testng testng - + ${testng.version} test @@ -353,13 +339,13 @@ org.reflections reflections - ${reflections-version} + ${reflections.version} test com.googlecode.java-diff-utils diffutils - ${diffutils-version} + ${diffutils.version} test @@ -370,33 +356,28 @@ org.mockito mockito-core - ${mockito-version} + ${mockito.version} test com.github.mifmif generex - ${generex-version} + ${generex.version} com.github.curious-odd-man rgxgen - ${rxgen-version} - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - ${jackson-version} + ${rxgen.version} com.fasterxml.jackson.datatype jackson-datatype-joda - ${jackson-version} + ${jackson.version} com.github.joschi.jackson jackson-datatype-threetenbp - ${jackson-threetenbp-version} + ${jackson-threetenbp.version} org.openapitools @@ -406,19 +387,19 @@ org.jetbrains.kotlin kotlin-stdlib-jdk8 - ${kotlin-version} + ${kotlin.version} test org.jetbrains.kotlin kotlin-compiler-embeddable - ${kotlin-version} + ${kotlin.version} test org.jetbrains.kotlin kotlin-script-util - ${kotlin-version} + ${kotlin.version} test diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java index e76b174022d..8e76e62e56c 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java @@ -168,7 +168,7 @@ public class DefaultCodegen implements CodegenConfig { protected Map reservedWordsMappings = new HashMap(); protected String templateDir; protected String embeddedTemplateDir; - protected Map additionalProperties = new HashMap(); + protected Map additionalProperties = new HashMap<>(); protected Map serverVariables = new HashMap(); protected Map vendorExtensions = new HashMap(); /* @@ -387,7 +387,7 @@ public class DefaultCodegen implements CodegenConfig { * If common lambdas are not desired, override addMustacheLambdas() method * and return empty builder. * - * @return preinitialized map builder with common lambdas + * @return preinitialized map with common lambdas */ protected ImmutableMap.Builder addMustacheLambdas() { @@ -3419,7 +3419,7 @@ public class DefaultCodegen implements CodegenConfig { property.example = toExampleValue(p); } catch (Exception e) { LOGGER.error("Error in generating `example` for the property {}. Default to ERROR_TO_EXAMPLE_VALUE. Enable debugging for more info.", property.baseName); - LOGGER.debug("Exception from toExampleValue: {}", e); + LOGGER.debug("Exception from toExampleValue: {}", e.getMessage()); property.example = "ERROR_TO_EXAMPLE_VALUE"; } property.defaultValue = toDefaultValue(p); @@ -3574,13 +3574,13 @@ public class DefaultCodegen implements CodegenConfig { ; } - Boolean isAnyTypeWithNothingElseSet = (ModelUtils.isAnyType(p) && + boolean isAnyTypeWithNothingElseSet = (ModelUtils.isAnyType(p) && (p.getProperties() == null || p.getProperties().isEmpty()) && !ModelUtils.isComposedSchema(p) && p.getAdditionalProperties() == null && p.getNot() == null && p.getEnum() == null); if (!ModelUtils.isArraySchema(p) && !ModelUtils.isMapSchema(p) && !isFreeFormObject(p) && !isAnyTypeWithNothingElseSet) { - /** schemas that are not Array, not ModelUtils.isMapSchema, not isFreeFormObject, not AnyType with nothing else set + /* schemas that are not Array, not ModelUtils.isMapSchema, not isFreeFormObject, not AnyType with nothing else set * so primitve schemas int, str, number, referenced schemas, AnyType schemas with properties, enums, or composition */ String type = getSchemaType(p); @@ -3673,7 +3673,7 @@ public class DefaultCodegen implements CodegenConfig { protected Boolean isPropertyInnerMostEnum(CodegenProperty property) { CodegenProperty currentProperty = getMostInnerItems(property); - return currentProperty == null ? false : currentProperty.isEnum; + return currentProperty != null && currentProperty.isEnum; } protected CodegenProperty getMostInnerItems(CodegenProperty property) { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java index f720ce6901e..62e678621d4 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java @@ -17,7 +17,6 @@ package org.openapitools.codegen; -import com.google.common.collect.ImmutableList; import io.swagger.v3.core.util.Json; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.Operation; @@ -112,7 +111,7 @@ public class DefaultGenerator implements Generator { this.config = opts.getConfig(); List userFiles = opts.getUserDefinedTemplates(); if (userFiles != null) { - this.userDefinedTemplates = ImmutableList.copyOf(userFiles); + this.userDefinedTemplates = Collections.unmodifiableList(userFiles); } TemplateManagerOptions templateManagerOptions = new TemplateManagerOptions(this.config.isEnableMinimalUpdate(),this.config.isSkipOverwrite()); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DryRunTemplateManager.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DryRunTemplateManager.java index bbab6a854b5..aa8f8ef56ec 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DryRunTemplateManager.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DryRunTemplateManager.java @@ -1,12 +1,12 @@ package org.openapitools.codegen; -import com.google.common.collect.ImmutableMap; import org.openapitools.codegen.api.TemplateProcessor; import org.openapitools.codegen.templating.TemplateManagerOptions; import java.io.File; import java.io.IOException; import java.nio.file.Path; +import java.util.Collections; import java.util.HashMap; import java.util.Map; @@ -32,7 +32,7 @@ public class DryRunTemplateManager implements TemplateProcessor { * @return An immutable copy of the dry run status. */ public Map getDryRunStatusMap() { - return ImmutableMap.copyOf(dryRunStatusMap); + return Collections.unmodifiableMap(dryRunStatusMap); } /** diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/ignore/CodegenIgnoreProcessor.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/ignore/CodegenIgnoreProcessor.java index c1975e595c0..7c209aad3a0 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/ignore/CodegenIgnoreProcessor.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/ignore/CodegenIgnoreProcessor.java @@ -17,8 +17,6 @@ package org.openapitools.codegen.ignore; -import com.google.common.collect.ImmutableList; -import com.google.common.io.Files; import org.openapitools.codegen.ignore.rules.DirectoryRule; import org.openapitools.codegen.ignore.rules.Rule; import org.slf4j.Logger; @@ -26,10 +24,10 @@ import org.slf4j.LoggerFactory; import java.io.*; import java.nio.charset.Charset; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Locale; +import java.nio.file.Files; +import java.util.*; + +import static java.nio.file.StandardCopyOption.REPLACE_EXISTING; /** * Presents a processing utility for parsing and evaluating files containing common ignore patterns. (.openapi-generator-ignore) @@ -91,7 +89,7 @@ public class CodegenIgnoreProcessor { if (legacyIgnoreFile.exists() && legacyIgnoreFile.isFile()) { LOGGER.info(String.format(Locale.ROOT, "Legacy support: '%s' file renamed to '%s'.", legacyIgnoreFile.getName(), targetIgnoreFile.getName())); try { - Files.move(legacyIgnoreFile, targetIgnoreFile); + Files.move(legacyIgnoreFile.toPath(), targetIgnoreFile.toPath(), REPLACE_EXISTING); loadFromFile(targetIgnoreFile); } catch (IOException e) { LOGGER.error(String.format(Locale.ROOT, "Could not rename file: %s", e.getMessage())); @@ -143,8 +141,8 @@ public class CodegenIgnoreProcessor { if(this.ignoreFile == null) return true; File file = new File(this.ignoreFile.getAbsoluteFile().getParentFile().toURI().relativize(targetFile.toURI()).getPath()); - Boolean directoryExcluded = false; - Boolean exclude = false; + boolean directoryExcluded = false; + boolean exclude = false; if(exclusionRules.size() == 0 && inclusionRules.size() == 0) { return true; } @@ -207,10 +205,10 @@ public class CodegenIgnoreProcessor { /** * Allows a consumer to manually inspect explicit "inclusion rules". That is, patterns in the ignore file which have been negated. * - * @return A {@link ImmutableList#copyOf(Collection)} of rules which possibly negate exclusion rules in the ignore file. + * @return A {@link Collections#unmodifiableList(List)} of rules which possibly negate exclusion rules in the ignore file. */ public List getInclusionRules() { - return ImmutableList.copyOf(inclusionRules); + return Collections.unmodifiableList(inclusionRules); } /** @@ -219,9 +217,9 @@ public class CodegenIgnoreProcessor { * * NOTE: Existence in this list doesn't mean a file is excluded. The rule can be overridden by {@link CodegenIgnoreProcessor#getInclusionRules()} rules. * - * @return A {@link ImmutableList#copyOf(Collection)} of rules which define exclusions by patterns in the ignore file. + * @return A {@link Collections#unmodifiableList(List)} of rules which define exclusions by patterns in the ignore file. */ public List getExclusionRules() { - return ImmutableList.copyOf(exclusionRules); + return Collections.unmodifiableList((exclusionRules)); } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java index 25385064ced..086d63af29b 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java @@ -17,7 +17,7 @@ package org.openapitools.codegen.languages; -import com.google.common.collect.ImmutableMap.Builder; +import com.google.common.collect.ImmutableMap; import com.samskivert.mustache.Mustache.Lambda; import io.swagger.v3.core.util.Json; @@ -393,7 +393,7 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co } @Override - protected Builder addMustacheLambdas() { + protected ImmutableMap.Builder addMustacheLambdas() { return super.addMustacheLambdas() .put("camelcase_param", new CamelCaseLambda().generator(this).escapeAsParamName(true)); } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCppCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCppCodegen.java index 2adc4b8e1b2..a6950c776fe 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCppCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCppCodegen.java @@ -17,7 +17,7 @@ package org.openapitools.codegen.languages; -import com.google.common.collect.ImmutableMap.Builder; +import com.google.common.collect.ImmutableMap; import com.samskivert.mustache.Mustache.Lambda; import io.swagger.v3.oas.models.OpenAPI; @@ -307,7 +307,7 @@ abstract public class AbstractCppCodegen extends DefaultCodegen implements Codeg } @Override - protected Builder addMustacheLambdas() { + protected ImmutableMap.Builder addMustacheLambdas() { return super.addMustacheLambdas() .put("multiline_comment_4", new IndentedLambda(4, " ", "///")); } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractDartCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractDartCodegen.java index c456b0438e3..f2d2bc289a6 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractDartCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractDartCodegen.java @@ -1,7 +1,5 @@ package org.openapitools.codegen.languages; -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; @@ -114,13 +112,12 @@ public abstract class AbstractDartCodegen extends DefaultCodegen { setReservedWordsLowerCase(reservedWordsList); // These types return isPrimitive=true in templates - languageSpecificPrimitives = Sets.newHashSet( - "String", - "bool", - "int", - "num", - "double" - ); + languageSpecificPrimitives = new HashSet<>(5); + languageSpecificPrimitives.add("String"); + languageSpecificPrimitives.add("bool"); + languageSpecificPrimitives.add("int"); + languageSpecificPrimitives.add("num"); + languageSpecificPrimitives.add("double"); typeMapping = new HashMap<>(); typeMapping.put("Array", "List"); @@ -151,18 +148,17 @@ public abstract class AbstractDartCodegen extends DefaultCodegen { typeMapping.put("AnyType", "Object"); // Data types of the above values which are automatically imported - defaultIncludes = Sets.newHashSet( - "String", - "bool", - "int", - "num", - "double", - "List", - "Set", - "Map", - "DateTime", - "Object" - ); + defaultIncludes = new HashSet<>(); + defaultIncludes.add("String"); + defaultIncludes.add("bool"); + defaultIncludes.add("int"); + defaultIncludes.add("num"); + defaultIncludes.add("double"); + defaultIncludes.add("List"); + defaultIncludes.add("Set"); + defaultIncludes.add("Map"); + defaultIncludes.add("DateTime"); + defaultIncludes.add("Object"); imports.put("String", "dart:core"); imports.put("bool", "dart:core"); @@ -345,7 +341,7 @@ public abstract class AbstractDartCodegen extends DefaultCodegen { // replace all characters that have a mapping but ignore underscores // append an underscore to each replacement so that it can be camelized if (name.chars().anyMatch(character -> specialCharReplacements.containsKey("" + ((char) character)))) { - name = escape(name, specialCharReplacements, Lists.newArrayList("_"), "_"); + name = escape(name, specialCharReplacements, Collections.singletonList("_"), "_"); } // remove the rest name = sanitizeName(name); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractEiffelCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractEiffelCodegen.java index 2bb25a1952b..e11579a2713 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractEiffelCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractEiffelCodegen.java @@ -30,7 +30,6 @@ import org.slf4j.LoggerFactory; import java.util.*; -import static com.google.common.base.Strings.isNullOrEmpty; import static org.openapitools.codegen.utils.StringUtils.camelize; import static org.openapitools.codegen.utils.StringUtils.underscore; @@ -268,13 +267,13 @@ public abstract class AbstractEiffelCodegen extends DefaultCodegen implements Co @Override public void postProcessModelProperty(CodegenModel model, CodegenProperty property) { - if (!isNullOrEmpty(model.parent)) { + if (StringUtils.isNotBlank(model.parent)) { parentModels.add(model.parent); if (!childrenByParent.containsEntry(model.parent, model)) { childrenByParent.put(model.parent, model); } } - if (!isNullOrEmpty(model.parentSchema)) { + if (StringUtils.isNotBlank(model.parentSchema)) { model.parentSchema = model.parentSchema.toLowerCase(Locale.ROOT); } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractFSharpCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractFSharpCodegen.java index a9140bd7dab..527481ecbdb 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractFSharpCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractFSharpCodegen.java @@ -16,7 +16,7 @@ package org.openapitools.codegen.languages; -import com.google.common.collect.ImmutableMap.Builder; +import com.google.common.collect.ImmutableMap; import com.samskivert.mustache.Mustache.Lambda; import io.swagger.v3.core.util.Json; @@ -306,7 +306,7 @@ public abstract class AbstractFSharpCodegen extends DefaultCodegen implements Co } @Override - protected Builder addMustacheLambdas() { + protected ImmutableMap.Builder addMustacheLambdas() { return super.addMustacheLambdas() .put("camelcase_param", new CamelCaseLambda().generator(this).escapeAsParamName(true)); } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java index c6d71e3d6c1..77cd594f7fb 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java @@ -17,67 +17,12 @@ package org.openapitools.codegen.languages; -import static org.openapitools.codegen.utils.StringUtils.camelize; -import static org.openapitools.codegen.utils.StringUtils.escape; -import static org.openapitools.codegen.utils.StringUtils.underscore; - -import java.io.File; -import java.time.LocalDate; -import java.time.ZoneId; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Date; -import java.util.EnumSet; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.ListIterator; -import java.util.Locale; -import java.util.Map; -import java.util.Objects; -import java.util.Set; -import java.util.TreeSet; -import java.util.concurrent.ConcurrentSkipListSet; -import java.util.regex.Pattern; -import java.util.stream.Stream; - -import org.apache.commons.io.FilenameUtils; -import org.apache.commons.lang3.BooleanUtils; -import org.apache.commons.lang3.StringUtils; -import org.openapitools.codegen.CliOption; -import org.openapitools.codegen.CodegenConfig; -import org.openapitools.codegen.CodegenConstants; -import org.openapitools.codegen.CodegenModel; -import org.openapitools.codegen.CodegenOperation; -import org.openapitools.codegen.CodegenParameter; -import org.openapitools.codegen.CodegenProperty; -import org.openapitools.codegen.DefaultCodegen; -import org.openapitools.codegen.meta.features.ClientModificationFeature; -import org.openapitools.codegen.meta.features.DocumentationFeature; -import org.openapitools.codegen.meta.features.GlobalFeature; -import org.openapitools.codegen.meta.features.SchemaSupportFeature; -import org.openapitools.codegen.meta.features.SecurityFeature; -import org.openapitools.codegen.meta.features.WireFormatFeature; -import org.openapitools.codegen.utils.ModelUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.base.Strings; -import com.google.common.collect.Sets; - import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.PathItem; import io.swagger.v3.oas.models.examples.Example; -import io.swagger.v3.oas.models.media.ArraySchema; -import io.swagger.v3.oas.models.media.Content; -import io.swagger.v3.oas.models.media.ComposedSchema; -import io.swagger.v3.oas.models.media.MediaType; -import io.swagger.v3.oas.models.media.Schema; -import io.swagger.v3.oas.models.media.StringSchema; +import io.swagger.v3.oas.models.media.*; import io.swagger.v3.oas.models.parameters.Parameter; import io.swagger.v3.oas.models.parameters.RequestBody; import io.swagger.v3.oas.models.servers.Server; @@ -96,6 +41,7 @@ import java.io.IOException; import java.time.LocalDate; import java.time.ZoneId; import java.util.*; +import java.util.concurrent.ConcurrentSkipListSet; import java.util.regex.Pattern; import java.util.stream.Stream; @@ -347,7 +293,7 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code if (additionalProperties.containsKey(ADDITIONAL_MODEL_TYPE_ANNOTATIONS)) { String additionalAnnotationsList = additionalProperties.get(ADDITIONAL_MODEL_TYPE_ANNOTATIONS).toString(); - this.setAdditionalModelTypeAnnotations(new ArrayList<>(Sets.newHashSet(additionalAnnotationsList.trim().split("\\s*(;|\\r?\\n)\\s*")))); + this.setAdditionalModelTypeAnnotations(Arrays.asList(additionalAnnotationsList.trim().split("\\s*(;|\\r?\\n)\\s*"))); } if (additionalProperties.containsKey(ADDITIONAL_ENUM_TYPE_ANNOTATIONS)) { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java index 7c788c9316b..1059732e84e 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java @@ -17,7 +17,6 @@ package org.openapitools.codegen.languages; -import com.google.common.collect.Maps; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.ComposedSchema; @@ -270,10 +269,10 @@ public abstract class AbstractTypeScriptClientCodegen extends DefaultCodegen imp return name.contains("&"); } - private Map toImportMap(String... names){ - Map result = Maps.newHashMap(); - for(String name: names){ - if(needToImport(name)){ + private Map toImportMap(String... names) { + Map result = new HashMap<>(); + for(final String name : names) { + if(needToImport(name)) { result.put(toModelImport(name), name); } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/K6ClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/K6ClientCodegen.java index dfc6efdd69b..002084bc616 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/K6ClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/K6ClientCodegen.java @@ -38,6 +38,7 @@ import java.util.stream.Collectors; import javax.annotation.Nullable; +import com.google.common.collect.ImmutableMap; import org.apache.commons.lang3.StringEscapeUtils; import org.apache.commons.lang3.StringUtils; import org.openapitools.codegen.CodegenConfig; @@ -55,7 +56,6 @@ import org.openapitools.codegen.utils.ModelUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.collect.ImmutableMap.Builder; import com.samskivert.mustache.Mustache; import com.samskivert.mustache.Mustache.Lambda; import com.samskivert.mustache.Template; @@ -746,7 +746,7 @@ public class K6ClientCodegen extends DefaultCodegen implements CodegenConfig { } @Override - protected Builder addMustacheLambdas() { + protected ImmutableMap.Builder addMustacheLambdas() { return super.addMustacheLambdas().put("handleParamValue", new ParameterValueLambda()); } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java index b4c47af501c..c08ecec4e23 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java @@ -16,7 +16,7 @@ package org.openapitools.codegen.languages; -import com.google.common.collect.ImmutableMap.Builder; +import com.google.common.collect.ImmutableMap; import com.samskivert.mustache.Mustache; import com.samskivert.mustache.Mustache.Lambda; import com.samskivert.mustache.Template; @@ -437,7 +437,7 @@ public class KotlinSpringServerCodegen extends AbstractKotlinCodegen } @Override - protected Builder addMustacheLambdas() { + protected ImmutableMap.Builder addMustacheLambdas() { return super.addMustacheLambdas() .put("escapeDoubleQuote", new EscapeLambda("\"", "\\\"")); } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/OCamlClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/OCamlClientCodegen.java index 962ff922b5d..ad061e72c06 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/OCamlClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/OCamlClientCodegen.java @@ -16,7 +16,6 @@ package org.openapitools.codegen.languages; -import com.google.common.base.Strings; import io.swagger.v3.oas.models.*; import io.swagger.v3.oas.models.headers.Header; import io.swagger.v3.oas.models.media.*; @@ -522,11 +521,11 @@ public class OCamlClientCodegen extends DefaultCodegen implements CodegenConfig @Override public String toModelFilename(String name) { - if (!Strings.isNullOrEmpty(modelNamePrefix)) { + if (!StringUtils.isBlank(modelNamePrefix)) { name = modelNamePrefix + "_" + name; } - if (!Strings.isNullOrEmpty(modelNameSuffix)) { + if (!StringUtils.isBlank(modelNameSuffix)) { name = name + "_" + modelNameSuffix; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/OpenAPIYamlGenerator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/OpenAPIYamlGenerator.java index 37e8472ec4c..d697fe54fa1 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/OpenAPIYamlGenerator.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/OpenAPIYamlGenerator.java @@ -17,13 +17,13 @@ package org.openapitools.codegen.languages; +import com.google.common.collect.ImmutableMap; import org.openapitools.codegen.*; import org.openapitools.codegen.meta.features.*; import org.openapitools.codegen.templating.mustache.OnChangeLambda; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.collect.ImmutableMap.Builder; import com.samskivert.mustache.Mustache.Lambda; import io.swagger.v3.oas.models.Operation; @@ -85,7 +85,7 @@ public class OpenAPIYamlGenerator extends DefaultCodegen implements CodegenConfi } @Override - protected Builder addMustacheLambdas() { + protected ImmutableMap.Builder addMustacheLambdas() { return super.addMustacheLambdas() .put("onchange", new OnChangeLambda()); } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaPlayFrameworkServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaPlayFrameworkServerCodegen.java index f38d42d1020..d918994d3ec 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaPlayFrameworkServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaPlayFrameworkServerCodegen.java @@ -16,7 +16,7 @@ package org.openapitools.codegen.languages; -import com.google.common.collect.ImmutableMap.Builder; +import com.google.common.collect.ImmutableMap; import com.samskivert.mustache.Mustache.Lambda; import io.swagger.v3.oas.models.media.ArraySchema; @@ -216,7 +216,7 @@ public class ScalaPlayFrameworkServerCodegen extends AbstractScalaCodegen implem } @Override - protected Builder addMustacheLambdas() { + protected ImmutableMap.Builder addMustacheLambdas() { return super.addMustacheLambdas() .put("indented_4", new IndentedLambda(4, " ")); } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptFetchClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptFetchClientCodegen.java index 471ac31500f..ed922219016 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptFetchClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptFetchClientCodegen.java @@ -314,7 +314,7 @@ public class TypeScriptFetchClientCodegen extends AbstractTypeScriptClientCodege for (Object _mo : models) { Map mo = (Map) _mo; ExtendedCodegenModel cm = (ExtendedCodegenModel) mo.get("model"); - cm.imports = new TreeSet(cm.imports); + cm.imports = new TreeSet<>(cm.imports); this.processCodeGenModel(cm); } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/URLPathUtils.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/URLPathUtils.java index cbe94870103..5ecdf65d2bd 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/URLPathUtils.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/URLPathUtils.java @@ -17,7 +17,6 @@ package org.openapitools.codegen.utils; -import com.google.common.collect.ImmutableMap; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.servers.Server; import io.swagger.v3.oas.models.servers.ServerVariable; @@ -59,7 +58,7 @@ public class URLPathUtils { variables = new ServerVariables(); } - Map userVariables = userDefinedVariables == null ? new HashMap<>() : ImmutableMap.copyOf(userDefinedVariables); + Map userVariables = userDefinedVariables == null ? new HashMap<>() : Collections.unmodifiableMap(userDefinedVariables); if (StringUtils.isNotBlank(url)) { url = extractUrl(server, url, variables, userVariables); diff --git a/pom.xml b/pom.xml index 63e68566c63..44b23593aae 100644 --- a/pom.xml +++ b/pom.xml @@ -88,17 +88,17 @@ org.jvnet.wagon-svn wagon-svn - 1.8 + ${wagon-svn.version} org.apache.maven.wagon wagon-ssh-external - 1.0-alpha-6 + ${wagon-ssh-external.version} org.apache.maven.wagon wagon-webdav - 1.0-beta-1 + ${wagon-webdav.version} install @@ -173,7 +173,7 @@ org.apache.maven.plugins maven-surefire-plugin - ${surefire-version} + ${maven-surefire-plugin.version} true 120 @@ -216,16 +216,16 @@ maven-compiler-plugin - 3.8.1 + ${maven-compiler-plugin.version} - 1.8 - 1.8 + ${maven.compiler.source} + ${maven.compiler.source} org.apache.maven.plugins maven-jar-plugin - 3.2.0 + ${maven-jar-plugin.version} @@ -240,20 +240,20 @@ org.apache.maven.plugins maven-site-plugin - 3.7.1 + ${maven-site-plugin.version} org.apache.maven.plugins maven-release-plugin - 2.5.3 + ${maven-release-plugin.version} org.apache.maven.plugins maven-javadoc-plugin - 3.1.0 + ${maven-javadoc-plugin.version} - 1.8 + ${maven.compiler.source} UTF-8 1g true @@ -345,7 +345,7 @@ se.bjurr.violations violations-maven-plugin - ${violations-maven.plugin.version} + ${violations-maven-plugin.version} 0 VERBOSE @@ -383,12 +383,12 @@ com.github.spotbugs spotbugs-maven-plugin - ${spotbugs.plugin.version} + ${spotbugs-plugin.version} org.apache.maven.plugins maven-pmd-plugin - ${pmd.plugin.version} + ${pmd-plugin.version} org.apache.maven.plugins @@ -398,7 +398,7 @@ pl.project13.maven git-commit-id-plugin - ${git.commit.id.plugin.version} + ${git-commit-id-plugin.version} @@ -477,7 +477,7 @@ com.github.spotbugs spotbugs-maven-plugin - ${spotbugs.plugin.version} + ${spotbugs-plugin.version} false @@ -497,7 +497,7 @@ org.apache.maven.plugins maven-pmd-plugin - ${pmd.plugin.version} + ${pmd-plugin.version} ${project.build.sourceEncoding} false @@ -526,7 +526,7 @@ com.github.spotbugs spotbugs-maven-plugin - ${spotbugs.plugin.version} + ${spotbugs-plugin.version} @@ -1499,7 +1499,7 @@ net.alchim31.maven scala-maven-plugin - ${scala-maven-plugin-version} + ${scala-maven-plugin.version} org.apache.maven.plugins @@ -1512,7 +1512,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.0.0 + ${maven-project-info-reports-plugin.version} @@ -1528,13 +1528,13 @@ junit junit - ${junit-version} + ${junit.version} test org.testng testng - ${testng-version} + ${testng.version} test @@ -1551,29 +1551,44 @@ 1.8 1.8 - 2.1.2 - io.swagger.parser.v3 - 2.0.26 - 3.3.1 - 2.4 - 1.2 - 4.13 - 2.10.2 - 1.0.0 - 3.4 - 1.7.29 - 4.3.1 - 1.14 - 4.2.1 - 7.1.0 - 3.0.0-M5 - 0.9.10 - 3.6.28 - 0.8.5 - 3.1.12.2 - 3.12.0 - 1.34 + 3.1.0 - 4.0.0 + 1.4 + 2.11.0 + 3.12.0 + 1.3.0 + 1.0.2 + 4.9.10 + 3.0.9 + 30.1.1-jre + 4.2.1 + 2.10.0 + 2.10.2 + 0.8.7 + 1.14 + 4.13 + 1.3.60 + 3.8.1 + 3.2.0 + 3.1.1 + 3.0.0 + 2.5.3 + 3.7.1 + 3.12.4 + 3.12.0 + 0.10 + 1.3 + 4.3.1 + 1.7.32 + 3.1.12.2 + 3.0.0-M5 + 2.1.2 + io.swagger.parser.v3 + 2.0.26 + 7.4.0 + 1.34 + 3.4.3 + 1.12 + 1.0-beta-2