@team-supercharge/oasg 16.4.0-feature-aspdotnetcore-generator-72786d96.0 → 16.4.1-temp-oasg-template-387f8911

package/README.md

@@ -8,6 +8,7 @@ Design APIs in OpenAPI 3.0 format, lint them, and generate client/server package
   * [Create `.config.json`](#create-config.json)
   * [Configure Linter](#configure-linter)
   * [Use with Docker](#use-with-docker)
+  * [Use with GitLab CI](#use-with-gitlab-ci)
 * [Version Overview](#version-overview)
 * [Usage](#usage)
 * [Linter Rules](#linter-rules)
@@ -101,6 +102,26 @@ swaggerlint:
 
 > If no other dependency is needed for the API project being built, there is no need to run any `npm install` or `npm ci` commands before invoking `oasg`
 
+## Use with GitLab CI
+
+Built on the [Docker](#use-with-docker) setup, a set of predefined templates are readily available for GitLab CI.
+
+When your project is hosted on gitlab.com __OASg__ should always be included in your projects `.gitlab-ci.yml` by explicitly specifying a version, like this:
+
+```yaml
+include:
+  - project: team-supercharge/oasg
+    file: gitlab-ci-templates.yml
+    ref: <version tag>
+```
+
+when your project is hosted on a self-managed GitLab instance use the following snippet:
+
+```yaml
+include:
+  - https://gitlab.com/team-supercharge/oasg/raw/<version-tag>/gitlab-ci-templates.yml
+```
+
 ---
 
 # Version Overview
@@ -118,12 +139,13 @@ The table below gives an overview of the changes (breaking, non-breaking, bug fi
 | `dotnet`                     |➖  |➖  |🆕  |
 | `feign`                      |✨  |➖  |➖  |➖  |➖  |➖  |✨  |💥  |💥  |➖  |➖  |🐛  |🐛  |🆕  |
 | `feign-kotlin`               |✨  |➖  |➖  |➖  |➖  |➖  |🆕  |
+| `plain-java`                 |🆕  |
 | `flutter`                    |➖  |➖  |➖  |🆕  |
 | `ios`                        |➖  |➖  |➖  |💥  |🐛  |➖  |➖  |➖  |✨  |➖  |💥  |➖  |➖  |✨  |🆕  |
 | `kmp`                        |➖  |➖  |🆕  |
 | `python`                     |🆕  |
 | `python-legacy`              |💥  |➖  |🐛  |💥  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |🆕  |
-| `react`                      |➖  |🐛  |➖  |💥  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |🆕  |
+| `react`                      |🐛  |🐛  |➖  |💥  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |🆕  |
 | `typescript-axios`           |🆕  |
 | `typescript-fetch`           |🆕  |
 | **Server Targets**           | 16 | 15 | 14 | 13 | 12 | 11 | 10 | 9  | 8  | 7  | 6  | 5   | 4  | 3  | 2  | 1  |
@@ -1006,27 +1028,6 @@ Validations from OpenAPI spec:
 | packageName | Name of the generated package | Y | - |
 | generatorCustomArgs | Custom arguments of the generator (--global-property, --additional-properties) | N | - |
 
-#### `dotnet-webapi`
-
-```json
-{
-  "id": "dotnet-webapi",
-  "type": "dotnet-webapi",
-  "source": "source-merged",
-  "sourceUrl": "https://api.nuget.org/v3/index.json",
-  "apiKey": "apiKey",
-  "packageName": "packageName",
-  "generatorCustomArgs": "--global-property=supportingFiles,modelDocs --additional-properties=nullableReferenceTypes=false"
-}
-```
-
-| Parameter           | Description                                                                    | Required | Default |
-| ------------------- | ------------------------------------------------------------------------------ | -------- | ------- |
-| sourceUrl           | Url to where the package will be published                                     | Y        | -       |
-| packageName         | Name of the generated package                                                  | Y        | -       |
-| apiKey              | Api key of nuget source (If not specified, provide the CI_JOB_TOKEN)           | N        | -       |
-| generatorCustomArgs | Custom arguments of the generator (--global-property, --additional-properties) | N        | -       |
-
 #### `postman`
 
 ```json

package/bin/oasg

@@ -39,6 +39,7 @@ const DEFAULT_GENERATOR_MAPPING = {
   "angular":                      { version: '7.11.0',  generator: 'typescript-angular' },
   "feign":                        { version: '7.11.0',  generator: 'spring' },
   "feign-kotlin":                 { version: '7.11.0',  generator: 'kotlin-spring' },
+  "plain-java":                   { version: '7.11.0',  generator: 'java' },
   "flutter":                      { version: '7.0.1',   generator: 'dart-dio' },
   "ios":                          { version: '7.0.1',   generator: 'swift5' },
   "kmp":                          { version: '7.8.0',   generator: 'kotlin' },
@@ -54,7 +55,6 @@ const DEFAULT_GENERATOR_MAPPING = {
   "python-fastapi":               { version: '7.8.0',   generator: 'python-fastapi' },
   "python-fastapi-raw-request":   { version: '7.0.1',   generator: 'python-fastapi' },
   "dotnet":                       { version: '7.8.0',   generator: 'csharp-functions' },
-  "dotnet-webapi":                { version: '7.11.0',   generator: 'aspnetcore' },
   // misc targets
   "contract-testing":             { version: '4.3.1',   generator: 'typescript-node' },
   "openapi":                      { version: undefined, generator: undefined },

package/config.schema.yml

@@ -12,6 +12,7 @@ properties:
       oneOf:
         - $ref: '#/targets/Angular'
         - $ref: '#/targets/React'
+        - $ref: '#/targets/PlainJava'
         - $ref: '#/targets/Feign'
         - $ref: '#/targets/FeignKotlin'
         - $ref: '#/targets/Spring'
@@ -29,7 +30,6 @@ properties:
         - $ref: '#/targets/Flutter'
         - $ref: '#/targets/Kmp'
         - $ref: '#/targets/Dotnet'
-        - $ref: '#/targets/DotnetWebApi'
         - $ref: '#/targets/Postman'
         - $ref: '#/targets/TypeScriptAxios'
         - $ref: '#/targets/TypeScriptFetch'
@@ -166,6 +166,28 @@ targets:
           - basePackage
           - mavenRepoUrl
 
+  PlainJava:
+    allOf:
+      - $ref: '#/targets/Base'
+      - properties:
+          type:
+            pattern: "^plain-java$"
+          artifactId:
+            type: string
+          groupId:
+            type: string
+          basePackage:
+            type: string
+          mavenRepoUrl:
+            type: string
+          overrideSettingsXml:
+            type: string
+        required:
+          - artifactId
+          - groupId
+          - basePackage
+          - mavenRepoUrl
+
   FeignKotlin:
     allOf:
       - $ref: '#/targets/Base'
@@ -414,22 +436,6 @@ targets:
           - apiKey
           - packageName
 
-  DotnetWebApi:
-    allOf:
-      - $ref: '#/targets/Base'
-      - properties:
-          type:
-            pattern: '^dotnet-webapi$'
-          sourceUrl:
-            type: string
-          apiKey:
-            type: string
-          packageName:
-            type: string
-        required:
-          - sourceUrl
-          - packageName    
-
   Kmp:
     allOf:
       - $ref: '#/targets/Base'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@team-supercharge/oasg",
-  "version": "16.4.0-feature-aspdotnetcore-generator-72786d96.0",
+  "version": "16.4.1-temp-oasg-template-387f8911",
   "description": "Node-based tool to lint OpenAPI documents and generate clients, servers and documentation from them",
   "author": "Supercharge",
   "license": "MIT",

package/targets/nestjs/templates/package.mustache

@@ -13,9 +13,9 @@
   },
   "main": "dist/index.js",
   "peerDependencies": {
-    "@nestjs/common": "^10.0.0",
-    "@nestjs/core": "^10.0.0",
-    "@nestjs/platform-express": "^10.0.0",
+    "@nestjs/common": ">=10.0.0",
+    "@nestjs/core": ">=10.0.0",
+    "@nestjs/platform-express": ">=10.0.0",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.0",
     "reflect-metadata": "0.2.2",

package/targets/plain-java/.mvn/wrapper/MavenWrapperDownloader.java

@@ -0,0 +1,117 @@
+/*
+ * Copyright 2007-present the original author or authors.
+ *
+ * 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
+ *
+ *      https://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.
+ */
+import java.net.*;
+import java.io.*;
+import java.nio.channels.*;
+import java.util.Properties;
+
+public class MavenWrapperDownloader {
+
+    private static final String WRAPPER_VERSION = "0.5.6";
+    /**
+     * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
+     */
+    private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
+        + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
+
+    /**
+     * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
+     * use instead of the default one.
+     */
+    private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
+            ".mvn/wrapper/maven-wrapper.properties";
+
+    /**
+     * Path where the maven-wrapper.jar will be saved to.
+     */
+    private static final String MAVEN_WRAPPER_JAR_PATH =
+            ".mvn/wrapper/maven-wrapper.jar";
+
+    /**
+     * Name of the property which should be used to override the default download url for the wrapper.
+     */
+    private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
+
+    public static void main(String args[]) {
+        System.out.println("- Downloader started");
+        File baseDirectory = new File(args[0]);
+        System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
+
+        // If the maven-wrapper.properties exists, read it and check if it contains a custom
+        // wrapperUrl parameter.
+        File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
+        String url = DEFAULT_DOWNLOAD_URL;
+        if(mavenWrapperPropertyFile.exists()) {
+            FileInputStream mavenWrapperPropertyFileInputStream = null;
+            try {
+                mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
+                Properties mavenWrapperProperties = new Properties();
+                mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
+                url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
+            } catch (IOException e) {
+                System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
+            } finally {
+                try {
+                    if(mavenWrapperPropertyFileInputStream != null) {
+                        mavenWrapperPropertyFileInputStream.close();
+                    }
+                } catch (IOException e) {
+                    // Ignore ...
+                }
+            }
+        }
+        System.out.println("- Downloading from: " + url);
+
+        File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
+        if(!outputFile.getParentFile().exists()) {
+            if(!outputFile.getParentFile().mkdirs()) {
+                System.out.println(
+                        "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
+            }
+        }
+        System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
+        try {
+            downloadFileFromURL(url, outputFile);
+            System.out.println("Done");
+            System.exit(0);
+        } catch (Throwable e) {
+            System.out.println("- Error downloading");
+            e.printStackTrace();
+            System.exit(1);
+        }
+    }
+
+    private static void downloadFileFromURL(String urlString, File destination) throws Exception {
+        if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
+            String username = System.getenv("MVNW_USERNAME");
+            char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
+            Authenticator.setDefault(new Authenticator() {
+                @Override
+                protected PasswordAuthentication getPasswordAuthentication() {
+                    return new PasswordAuthentication(username, password);
+                }
+            });
+        }
+        URL website = new URL(urlString);
+        ReadableByteChannel rbc;
+        rbc = Channels.newChannel(website.openStream());
+        FileOutputStream fos = new FileOutputStream(destination);
+        fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
+        fos.close();
+        rbc.close();
+    }
+
+}

package/targets/plain-java/.mvn/wrapper/maven-wrapper.properties

@@ -0,0 +1,2 @@
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar

package/targets/plain-java/generate.sh

@@ -0,0 +1,20 @@
+#/bin/bash
+
+source $(dirname "$0")/../common.sh
+
+rm -rf out/$targetId
+mkdir -p out/$targetId
+
+java -jar $binary generate \
+  -g $generatorId \
+  -i $openApiFile \
+  -t $templateDir \
+  -o out/$targetId \
+  -c $(dirname "$0")/generator-config.json \
+  -p "artifactId=${artifactId},groupId=${groupId},basePackage=${basePackage},apiPackage=${basePackage}.api,modelPackage=${basePackage}.model,artifactVersion=${version}" $generatorCustomArgs
+
+cd out/$targetId
+cp $(dirname "$0")/mvnw .
+cp -r $(dirname "$0")/.mvn .
+./mvnw package
+cd ../..

package/targets/plain-java/generator-config.json

@@ -0,0 +1,20 @@
+{
+  "library": "native",
+  "openApiNullable": false,
+  "useRuntimeException": true,
+  "annotationLibrary": "none",
+  "documentationProvider": "none",
+  "typeMappings": {
+    "DateTime": "java.time.Instant",
+    "OffsetDateTime": "java.time.Instant"
+  },
+  "importMappings": {
+    "DateTime": "java.time.Instant",
+    "java.time.OffsetDateTime": "java.time.Instant"
+  },
+  "inlineSchemaOptions": {
+    "ARRAY_ITEM_SUFFIX": "",
+    "MAP_ITEM_SUFFIX": "",
+    "SKIP_SCHEMA_REUSE": "true"
+  }
+}

package/targets/plain-java/mvnw

@@ -0,0 +1,310 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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
+#
+#    https://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.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Maven Start Up Batch script
+#
+# Required ENV vars:
+# ------------------
+#   JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+#   M2_HOME - location of maven2's installed home dir
+#   MAVEN_OPTS - parameters passed to the Java VM when running Maven
+#     e.g. to debug Maven itself, use
+#       set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+#   MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+# ----------------------------------------------------------------------------
+
+if [ -z "$MAVEN_SKIP_RC" ] ; then
+
+  if [ -f /etc/mavenrc ] ; then
+    . /etc/mavenrc
+  fi
+
+  if [ -f "$HOME/.mavenrc" ] ; then
+    . "$HOME/.mavenrc"
+  fi
+
+fi
+
+# OS specific support.  $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+mingw=false
+case "`uname`" in
+  CYGWIN*) cygwin=true ;;
+  MINGW*) mingw=true;;
+  Darwin*) darwin=true
+    # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
+    # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+    if [ -z "$JAVA_HOME" ]; then
+      if [ -x "/usr/libexec/java_home" ]; then
+        export JAVA_HOME="`/usr/libexec/java_home`"
+      else
+        export JAVA_HOME="/Library/Java/Home"
+      fi
+    fi
+    ;;
+esac
+
+if [ -z "$JAVA_HOME" ] ; then
+  if [ -r /etc/gentoo-release ] ; then
+    JAVA_HOME=`java-config --jre-home`
+  fi
+fi
+
+if [ -z "$M2_HOME" ] ; then
+  ## resolve links - $0 may be a link to maven's home
+  PRG="$0"
+
+  # need this for relative symlinks
+  while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+      PRG="$link"
+    else
+      PRG="`dirname "$PRG"`/$link"
+    fi
+  done
+
+  saveddir=`pwd`
+
+  M2_HOME=`dirname "$PRG"`/..
+
+  # make it fully qualified
+  M2_HOME=`cd "$M2_HOME" && pwd`
+
+  cd "$saveddir"
+  # echo Using m2 at $M2_HOME
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME=`cygpath --unix "$M2_HOME"`
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For Mingw, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME="`(cd "$M2_HOME"; pwd)`"
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+  javaExecutable="`which javac`"
+  if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
+    # readlink(1) is not available as standard on Solaris 10.
+    readLink=`which readlink`
+    if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+      if $darwin ; then
+        javaHome="`dirname \"$javaExecutable\"`"
+        javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
+      else
+        javaExecutable="`readlink -f \"$javaExecutable\"`"
+      fi
+      javaHome="`dirname \"$javaExecutable\"`"
+      javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+      JAVA_HOME="$javaHome"
+      export JAVA_HOME
+    fi
+  fi
+fi
+
+if [ -z "$JAVACMD" ] ; then
+  if [ -n "$JAVA_HOME"  ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+      # IBM's JDK on AIX uses strange locations for the executables
+      JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+      JAVACMD="$JAVA_HOME/bin/java"
+    fi
+  else
+    JAVACMD="`which java`"
+  fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+  echo "Error: JAVA_HOME is not defined correctly." >&2
+  echo "  We cannot execute $JAVACMD" >&2
+  exit 1
+fi
+
+if [ -z "$JAVA_HOME" ] ; then
+  echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+
+# traverses directory structure from process work directory to filesystem root
+# first directory with .mvn subdirectory is considered project base directory
+find_maven_basedir() {
+
+  if [ -z "$1" ]
+  then
+    echo "Path not specified to find_maven_basedir"
+    return 1
+  fi
+
+  basedir="$1"
+  wdir="$1"
+  while [ "$wdir" != '/' ] ; do
+    if [ -d "$wdir"/.mvn ] ; then
+      basedir=$wdir
+      break
+    fi
+    # workaround for JBEAP-8937 (on Solaris 10/Sparc)
+    if [ -d "${wdir}" ]; then
+      wdir=`cd "$wdir/.."; pwd`
+    fi
+    # end of workaround
+  done
+  echo "${basedir}"
+}
+
+# concatenates all lines of a file
+concat_lines() {
+  if [ -f "$1" ]; then
+    echo "$(tr -s '\n' ' ' < "$1")"
+  fi
+}
+
+BASE_DIR=`find_maven_basedir "$(pwd)"`
+if [ -z "$BASE_DIR" ]; then
+  exit 1;
+fi
+
+##########################################################################################
+# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+# This allows using the maven wrapper in projects that prohibit checking in binary data.
+##########################################################################################
+if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Found .mvn/wrapper/maven-wrapper.jar"
+    fi
+else
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
+    fi
+    if [ -n "$MVNW_REPOURL" ]; then
+      jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+    else
+      jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+    fi
+    while IFS="=" read key value; do
+      case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
+      esac
+    done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Downloading from: $jarUrl"
+    fi
+    wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
+    if $cygwin; then
+      wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
+    fi
+
+    if command -v wget > /dev/null; then
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Found wget ... using wget"
+        fi
+        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+            wget "$jarUrl" -O "$wrapperJarPath"
+        else
+            wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath"
+        fi
+    elif command -v curl > /dev/null; then
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Found curl ... using curl"
+        fi
+        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+            curl -o "$wrapperJarPath" "$jarUrl" -f
+        else
+            curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
+        fi
+
+    else
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Falling back to using Java to download"
+        fi
+        javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+        # For Cygwin, switch paths to Windows format before running javac
+        if $cygwin; then
+          javaClass=`cygpath --path --windows "$javaClass"`
+        fi
+        if [ -e "$javaClass" ]; then
+            if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+                if [ "$MVNW_VERBOSE" = true ]; then
+                  echo " - Compiling MavenWrapperDownloader.java ..."
+                fi
+                # Compiling the Java class
+                ("$JAVA_HOME/bin/javac" "$javaClass")
+            fi
+            if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+                # Running the downloader
+                if [ "$MVNW_VERBOSE" = true ]; then
+                  echo " - Running MavenWrapperDownloader.java ..."
+                fi
+                ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
+            fi
+        fi
+    fi
+fi
+##########################################################################################
+# End of extension
+##########################################################################################
+
+export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
+if [ "$MVNW_VERBOSE" = true ]; then
+  echo $MAVEN_PROJECTBASEDIR
+fi
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME=`cygpath --path --windows "$M2_HOME"`
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+  [ -n "$MAVEN_PROJECTBASEDIR" ] &&
+    MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
+fi
+
+# Provide a "standardized" way to retrieve the CLI args that will
+# work with both Windows and non-Windows executions.
+MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
+export MAVEN_CMD_LINE_ARGS
+
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+exec "$JAVACMD" \
+  $MAVEN_OPTS \
+  -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+  "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+  ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"

package/targets/plain-java/publish.sh

@@ -0,0 +1,30 @@
+#/bin/bash
+
+source $(dirname "$0")/../common.sh
+
+settingsXml=${overrideSettingsXml:-$(dirname "$0")/settings.xml}
+cp $settingsXml out/$targetId/settings.xml
+
+cd out/$targetId
+
+echo Deploying ${artifactId}-${version}.jar to ${mavenRepoUrl}
+
+jarName=target/${artifactId}-${version}.jar
+
+sourcesJarName=target/${artifactId}-${version}-sources.jar
+attachSources=""
+if [ -f ${sourcesJarName} ]; then
+    attachSources="-Dsources=${sourcesJarName}"
+fi
+
+./mvnw deploy:deploy-file -e -s settings.xml \
+                       -Durl=${mavenRepoUrl} \
+                       -DrepositoryId=target \
+                       -Dfile=${jarName} \
+                       -Dpom=pom.xml \
+                       -DgroupId=${groupId} \
+                       -DartifactId=${artifactId} \
+                       -Dversion=${version} \
+                       ${attachSources}
+
+cd ../..

package/targets/plain-java/settings.xml

@@ -0,0 +1,16 @@
+<settings>
+  <servers>
+    <server>
+      <id>target</id>
+      <configuration>
+        <httpHeaders>
+          <property>
+
+            <name>Job-Token</name>
+            <value>${env.CI_JOB_TOKEN}</value>
+          </property>
+        </httpHeaders>
+      </configuration>
+    </server>
+  </servers>
+</settings>

package/targets/react/templates/package.mustache

@@ -13,12 +13,10 @@
 {{^packageAsSourceOnlyLibrary}}
   "main": "./dist/index.js",
   "typings": "./dist/index.d.ts",
-{{#supportsES6}}
   "module": "./dist/esm/index.js",
   "sideEffects": false,
-{{/supportsES6}}
   "scripts": {
-    "build": "tsc{{#supportsES6}} && tsc -p tsconfig.esm.json{{/supportsES6}}"{{^sagasAndRecords}},
+    "build": "tsc && tsc -p tsconfig.esm.json"{{^sagasAndRecords}},
     "prepare": "npm run build"{{/sagasAndRecords}}
   },
 {{/packageAsSourceOnlyLibrary}}

package/targets/react/templates/tsconfig.mustache

@@ -1,19 +1,13 @@
 {
   "compilerOptions": {
     "declaration": true,
-    "target": "{{#supportsES6}}es6{{/supportsES6}}{{^supportsES6}}es5{{/supportsES6}}",
+    "target": "es2022",
 {{#sagasAndRecords}}
     "strict": true,
 {{/sagasAndRecords}}
     "module": "commonjs",
     "moduleResolution": "node",
     "outDir": "dist",
-    {{^supportsES6}}
-    "lib": [
-      "es6",
-      "dom"
-    ],
-    {{/supportsES6}}
     "typeRoots": [
       "node_modules/@types"
     ],

package/targets/dotnet-webapi/generate.sh

@@ -1,15 +0,0 @@
-#!/bin/bash
-
-source $(dirname "$0")/../common.sh
-
-rm -rf out/$targetId
-mkdir -p out/$targetId
-
-java -jar $binary generate \
-  -g $generatorId \
-  -i $openApiFile \
-  -t $templateDir \
-  -o out/$targetId \
-  -c $(dirname "$0")/generator-config.json \
-  -p "packageVersion=$version,packageName=$packageName" \
-  $generatorCustomArgs

package/targets/dotnet-webapi/generator-config.json

@@ -1,17 +0,0 @@
-{
-  "inlineSchemaOptions": {
-    "ARRAY_ITEM_SUFFIX": "",
-    "MAP_ITEM_SUFFIX": "",
-    "SKIP_SCHEMA_REUSE": "true"
-  },
-  "additionalProperties": {
-    "aspnetCoreVersion": "8.0",
-    "operationIsAsync": true,
-    "buildTarget": "library",
-    "generateBody": false,
-    "nullableReferenceTypes": true,
-    "operationResultTask": true,
-    "enumNameSuffix": "",
-    "enumValueSuffix": ""
-  }
-}

package/targets/dotnet-webapi/publish.sh

@@ -1,21 +0,0 @@
-#!/bin/bash
-
-source $(dirname "$0")/../common.sh
-
-cd out/$targetId
-
-# install dotnet
-wget https://dot.net/v1/dotnet-install.sh -O dotnet-install.sh
-chmod +x dotnet-install.sh
-./dotnet-install.sh --channel 8.0 --install-dir "$HOME/.dotnet"
-export PATH="$HOME/.dotnet:$PATH"
-
-# pack
-dotnet restore
-dotnet build -c Release
-dotnet pack -c Release -p:Version=$version -p:IsPackable=true
-
-# publish
-dotnet nuget push "src/**/bin/Release/*.nupkg" --source $sourceUrl -k ${apiKey:-$CI_JOB_TOKEN}
-
-cd ../..

package/targets/dotnet-webapi/templates/model.mustache

@@ -1,198 +0,0 @@
-{{>partial_header}}
-using System;
-using System.Linq;
-using System.Text;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.ComponentModel.DataAnnotations;
-using System.Runtime.Serialization;
-{{#useNewtonsoft}}
-using Newtonsoft.Json;
-{{/useNewtonsoft}}
-{{^useNewtonsoft}}
-using System.Text.Json;
-{{/useNewtonsoft}}
-{{#models}}
-{{#model}}
-{{#discriminator}}
-using JsonSubTypes;
-{{#useSwashbuckle}}
-using Swashbuckle.AspNetCore.Annotations;
-{{/useSwashbuckle}}
-{{/discriminator}}
-{{/model}}
-{{/models}}
-using {{packageName}}.Converters;
-
-{{#models}}
-{{#model}}
-namespace {{modelPackage}}
-{ {{#isEnum}}{{>enumClass}}{{/isEnum}}{{^isEnum}}
-    /// <summary>
-    /// {{description}}
-    /// </summary>
-    [DataContract]
-    {{#discriminator}}
-    {{#useNewtonsoft}}
-    {{#mappedModels.size}}
-    [JsonConverter(typeof(JsonSubtypes), "{{{discriminatorName}}}")]
-    {{/mappedModels.size}}
-    {{/useNewtonsoft}}
-    {{#useSwashbuckle}}
-    [SwaggerDiscriminator("{{{discriminatorName}}}")]
-    {{/useSwashbuckle}}
-    {{#mappedModels}}
-    [JsonSubtypes.KnownSubType(typeof({{{modelName}}}), "{{^vendorExtensions.x-discriminator-value}}{{{mappingName}}}{{/vendorExtensions.x-discriminator-value}}{{#vendorExtensions.x-discriminator-value}}{{{.}}}{{/vendorExtensions.x-discriminator-value}}")]
-    {{#useSwashbuckle}}
-    [SwaggerSubType(typeof({{{modelName}}}), DiscriminatorValue =  "{{^vendorExtensions.x-discriminator-value}}{{{mappingName}}}{{/vendorExtensions.x-discriminator-value}}{{#vendorExtensions.x-discriminator-value}}{{{.}}}{{/vendorExtensions.x-discriminator-value}}")]
-    {{/useSwashbuckle}}
-    {{/mappedModels}}
-    {{/discriminator}}
-    public {{#modelClassModifier}}{{.}} {{/modelClassModifier}}class {{classname}} {{#parent}}: {{{.}}}{{^pocoModels}}, {{/pocoModels}}{{/parent}}{{^pocoModels}}{{^parent}}: {{/parent}}IEquatable<{{classname}}>{{/pocoModels}}
-    {
-        {{#vars}}
-        {{#items.isEnum}}
-        {{#items}}
-        {{^complexType}}
-{{>enumClass}}
-        {{/complexType}}
-        {{/items}}
-        {{/items.isEnum}}
-        {{#isEnum}}
-        {{^complexType}}
-{{>enumClass}}
-        {{/complexType}}
-        {{/isEnum}}
-        /// <summary>
-        /// {{description}}{{^description}}Gets or Sets {{{name}}}{{/description}}
-        /// </summary>{{#description}}
-        /// <value>{{.}}</value>{{/description}}{{#example}}
-        /* <example>{{.}}</example> */{{/example}}{{#required}}
-        [Required]{{/required}}{{#pattern}}
-        [RegularExpression("{{{.}}}")]{{/pattern}}{{#minLength}}{{#maxLength}}
-        [StringLength({{maxLength}}, MinimumLength={{minLength}})]{{/maxLength}}{{/minLength}}{{#minLength}}{{^maxLength}}
-        [MinLength({{minLength}})]{{/maxLength}}{{/minLength}}{{^minLength}}{{#maxLength}}
-        [MaxLength({{.}})]{{/maxLength}}{{/minLength}}{{#minimum}}{{#maximum}}
-        [Range({{minimum}}, {{maximum}})]{{/maximum}}{{/minimum}}
-        [DataMember(Name="{{baseName}}", EmitDefaultValue={{#isNullable}}true{{/isNullable}}{{^isNullable}}{{#vendorExtensions.x-is-value-type}}true{{/vendorExtensions.x-is-value-type}}{{^vendorExtensions.x-is-value-type}}false{{/vendorExtensions.x-is-value-type}}{{/isNullable}})]
-        {{#isEnum}}
-        public {{{datatypeWithEnum}}}{{#isNullable}}{{^required}}?{{/required}}{{/isNullable}} {{name}} { get; set; }{{#defaultValue}} = {{{.}}};{{/defaultValue}}
-        {{/isEnum}}
-        {{^isEnum}}
-        public {{{dataType}}}{{#nullableReferenceTypes}}{{^isContainer}}{{^required}}{{^isNullable}}?{{/isNullable}}{{/required}}{{/isContainer}}{{/nullableReferenceTypes}} {{name}} { get; set; }{{#defaultValue}} = {{{.}}};{{/defaultValue}}
-        {{/isEnum}}
-        {{^-last}}
-
-        {{/-last}}
-        {{/vars}}
-
-        {{^pocoModels}}
-        /// <summary>
-        /// Returns the string presentation of the object
-        /// </summary>
-        /// <returns>String presentation of the object</returns>
-        public override string ToString()
-        {
-            var sb = new StringBuilder();
-            sb.Append("class {{classname}} {\n");
-            {{#vars}}
-            sb.Append("  {{name}}: ").Append({{name}}).Append("\n");
-            {{/vars}}
-            sb.Append("}\n");
-            return sb.ToString();
-        }
-
-        /// <summary>
-        /// Returns the JSON string presentation of the object
-        /// </summary>
-        /// <returns>JSON string presentation of the object</returns>
-        public {{#parent}}{{^isMap}}{{^isArray}}new {{/isArray}}{{/isMap}}{{/parent}}string ToJson()
-        {
-            {{#useNewtonsoft}}
-            return JsonConvert.SerializeObject(this, Formatting.Indented);
-            {{/useNewtonsoft}}
-            {{^useNewtonsoft}}
-            var options = new JsonSerializerOptions
-            {
-                WriteIndented = true
-            };
-
-            return JsonSerializer.Serialize(this, options);
-            {{/useNewtonsoft}}
-        }
-
-        /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="obj">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object obj)
-        {
-            if (obj is null) return false;
-            if (ReferenceEquals(this, obj)) return true;
-            return obj.GetType() == GetType() && Equals(({{classname}})obj);
-        }
-
-        /// <summary>
-        /// Returns true if {{classname}} instances are equal
-        /// </summary>
-        /// <param name="other">Instance of {{classname}} to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals({{classname}} other)
-        {
-            if (other is null) return false;
-            if (ReferenceEquals(this, other)) return true;
-
-            return {{#vars}}{{^isContainer}}
-                (
-                    {{name}} == other.{{name}} ||
-                    {{^vendorExtensions.x-is-value-type}}{{name}} != null &&{{/vendorExtensions.x-is-value-type}}
-                    {{name}}.Equals(other.{{name}})
-                ){{^-last}} && {{/-last}}{{/isContainer}}{{#isContainer}}
-                (
-                    {{name}} == other.{{name}} ||
-                    {{^vendorExtensions.x-is-value-type}}{{name}} != null &&
-                    other.{{name}} != null &&
-                    {{/vendorExtensions.x-is-value-type}}{{name}}.SequenceEqual(other.{{name}})
-                ){{^-last}} && {{/-last}}{{/isContainer}}{{/vars}}{{^vars}}false{{/vars}};
-        }
-
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                var hashCode = 41;
-                // Suitable nullity checks etc, of course :)
-                {{#vars}}
-                    {{^vendorExtensions.x-is-value-type}}if ({{name}} != null){{/vendorExtensions.x-is-value-type}}
-                    hashCode = hashCode * 59 + {{name}}.GetHashCode();
-                {{/vars}}
-                return hashCode;
-            }
-        }
-
-        #region Operators
-        #pragma warning disable 1591
-
-        public static bool operator ==({{classname}} left, {{classname}} right)
-        {
-            return Equals(left, right);
-        }
-
-        public static bool operator !=({{classname}} left, {{classname}} right)
-        {
-            return !Equals(left, right);
-        }
-
-        #pragma warning restore 1591
-        #endregion Operators
-        {{/pocoModels}}
-    }
-{{/isEnum}}
-{{/model}}
-{{/models}}
-}