Improve version management, update dependencies, remove unused depend…

…encies (#10544)

* Move verion properties to main pom.xml

* Sort properties and remove duplicates

* Use properties for known versions

* Deduplicate versions of maven plugins

* Deduplicate wagon dependencies

* Deduplicate maven targer and source properties

* Explicitly set testng version

* Remove property used once

* Sort lines

* Standardise name of maven version properties

* Upgrade maven-surefire-plugin

* Comment out jackson-datatype-jsr310

* Comment out com.fasterxml.jackson.core:jackson-core:jar:2.10.2:compile

* Remove commented out dependencies

* Rename maven param name

* Remove org.hamcrest:java-hamcrest:jar:2.0.0.0:test

* Bump jacoco

* Upgrade guava, replace deprecated or removed api with vanilla java

* Bump jmustache.version

* Bump jackson.version

* Bump jackson.version and mockito

* Bump testng

* Bump wagon-ssh-external.version

* Downgrade jmustache

* Bump spring boot version and add junit

* Bump maven in wrapper

* Bump apache libs

* Bump dependencies

* Revert checkstyle bump

.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

modules/openapi-generator-cli/pom.xml

@@ -36,6 +36,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
+                <version>${maven-jar-plugin.version}</version>
                 <configuration>
                     <archive>
                         <manifest>
@@ -144,13 +145,13 @@
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
-<!--             <version>${testng-version}</version> -->
+            <version>${testng.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>${mockito-version}</version>
+            <version>${mockito.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

modules/openapi-generator-core/pom.xml

@@ -32,16 +32,17 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>${guava-version}</version>
+      <version>${guava.version}</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>${slf4j-version}</version>
+      <version>${slf4j.version}</version>
     </dependency>
     <dependency>
       <groupId>org.testng</groupId>
       <artifactId>testng</artifactId>
+      <version>${testng.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -70,9 +71,4 @@
       </build>
     </profile>
   </profiles>
-
-  <properties>
-    <slf4j-version>1.7.29</slf4j-version>
-    <guava-version>26.0-jre</guava-version>
-  </properties>
 </project>

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<String, String> instantiationTypes;
-    private final ImmutableMap<String, String> typeMappings;
-    private final ImmutableMap<String, Object> additionalProperties;
-    private final ImmutableMap<String, String> importMappings;
-    private final ImmutableSet<String> languageSpecificPrimitives;
-    private final ImmutableMap<String, String> reservedWordMappings;
-    private final ImmutableMap<String, String> serverVariables;
+    private final Map<String, String> instantiationTypes;
+    private final Map<String, String> typeMappings;
+    private final Map<String, Object> additionalProperties;
+    private final Map<String, String> importMappings;
+    private final Set<String> languageSpecificPrimitives;
+    private final Map<String, String> reservedWordMappings;
+    private final Map<String, String> serverVariables;
 
     private String gitHost;
     private String gitUserId;
@@ -348,12 +346,12 @@ private GeneratorSettings(Builder builder) {
         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 @@ private GeneratorSettings(Builder builder) {
             additional.put("httpUserAgent", httpUserAgent);
         }
 
-        additionalProperties = ImmutableMap.copyOf(additional);
+        additionalProperties = Collections.unmodifiableMap(additional);
     }
 
     /**
@@ -417,13 +415,13 @@ private GeneratorSettings(Builder builder) {
     @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() {

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.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<String, String> DEFAULT_GLOBAL_PROPERTIES = ImmutableMap.of();
+    public static final Map<String, String> 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<String, ?> globalProperties = DEFAULT_GLOBAL_PROPERTIES;
+    private Map<String, ?> globalProperties = DEFAULT_GLOBAL_PROPERTIES;
 
     private WorkflowSettings(Builder builder) {
         this.inputSpec = builder.inputSpec;
@@ -84,7 +80,7 @@ private WorkflowSettings(Builder builder) {
         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;
     }
 

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 boolean isSupported() {
         }
 
         public List<AnnotationType> getSource() {
-            return ImmutableList.copyOf(source);
+            return Collections.unmodifiableList(source);
         }
     }
 

modules/openapi-generator-gradle-plugin/pom.xml

@@ -106,7 +106,7 @@
                     <dependency>
                         <groupId>org.gradle</groupId>
                         <artifactId>gradle-tooling-api</artifactId>
-                        <version>${gradleVersion}</version>
+                        <version>5.6.4</version>
                     </dependency>
                 </dependencies>
             </plugin>

modules/openapi-generator-maven-plugin/pom.xml

@@ -17,7 +17,6 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <sonar.exclusions>**/src/main/java/org/openapitools/codegen/plugin/**/*</sonar.exclusions>
         <!-- used for integration tests verification scripts, managed by the test harness plugin -->
-        <groovy.version>3.0.5</groovy.version>
     </properties>
     <dependencies>
         <dependency>
@@ -59,7 +58,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-<!--             <version>4.12</version> -->
+            <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

modules/openapi-generator-online/pom.xml

@@ -12,21 +12,16 @@
     <packaging>jar</packaging>
     <name>openapi-generator-online</name>
     <properties>
-        <java.version>1.8</java.version>
-        <maven.compiler.source>${java.version}</maven.compiler.source>
-        <maven.compiler.target>${java.version}</maven.compiler.target>
-        <spring-boot-version>2.2.9.RELEASE</spring-boot-version>
+        <spring-boot.version>2.5.5</spring-boot.version>
         <springfox-version>3.0.0</springfox-version>
-        <junit-version>4.13</junit-version>
-        <jackson-version>2.10.2</jackson-version>
         <sonar.exclusions>**/org/openapitools/codegen/online/**/*</sonar.exclusions>
     </properties>
     <dependencyManagement>
         <dependencies>
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
-                <version>${spring-boot-version}</version>
+                <version>${spring-boot.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -54,7 +49,7 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>${spring-boot-version}</version>
+                <version>${spring-boot.version}</version>
                 <executions>
                     <execution>
                         <goals>
@@ -120,16 +115,6 @@
             </exclusions>
         </dependency>
 
-        <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-jsr310</artifactId>
-           <version>${jackson-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-            <version>${jackson-version}</version>
-        </dependency>
         <!-- Bean Validation API support -->
         <dependency>
             <groupId>jakarta.validation</groupId>
@@ -142,21 +127,20 @@
         </dependency>
 
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-test</artifactId>
+            <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>java-hamcrest</artifactId>
-            <version>2.0.0.0</version>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-test</artifactId>
             <scope>test</scope>
         </dependency>
-
     </dependencies>
 </project>

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 void generateWIthForwardedHeaders() throws Exception {
                 .andExpect(header().string(HttpHeaders.CONTENT_LENGTH, not(0)));
     }
 
-}
+}