diff --git a/.github/workflows/maven-master-pulls.yml b/.github/workflows/maven-master-pulls.yml
index 104c004f794..8bb58056e9c 100644
--- a/.github/workflows/maven-master-pulls.yml
+++ b/.github/workflows/maven-master-pulls.yml
@@ -19,7 +19,7 @@ jobs:
         with:
           java-version: ${{ matrix.java }}
       - name: Cache local Maven repository
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -42,7 +42,7 @@ jobs:
         with:
           java-version: ${{ matrix.java }}
       - name: Cache local Maven repository
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenOperation.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenOperation.java
index e5e0cf89597..506587817c3 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenOperation.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenOperation.java
@@ -15,7 +15,7 @@ public class CodegenOperation {
     public boolean hasAuthMethods, hasConsumes, hasProduces, hasParams, hasOptionalParams, hasRequiredParams,
             returnTypeIsPrimitive, returnSimpleType, subresourceOperation, isMapContainer,
             isListContainer, isMultipart, hasMore = true,
-            isResponseBinary = false, isResponseFile = false, hasReference = false,
+            isResponseBinary = false, isResponseFile = false, isResponseText = false, hasReference = false,
             isRestfulIndex, isRestfulShow, isRestfulCreate, isRestfulUpdate, isRestfulDestroy,
             isRestful, isDeprecated;
     public String path, testPath, operationId, returnType, httpMethod, returnBaseType,
@@ -248,6 +248,8 @@ public boolean equals(Object o) {
             return false;
         if (isResponseFile != that.isResponseFile)
             return false;
+        if (isResponseText != that.isResponseText)
+            return false;
         if (isDeprecated != that.isDeprecated)
             return false;
         if (path != null ? !path.equals(that.path) : that.path != null)
@@ -335,6 +337,7 @@ public int hashCode() {
         result = 31 * result + (hasMore ? 13:31);
         result = 31 * result + (isResponseBinary ? 13:31);
         result = 31 * result + (isResponseFile ? 13:31);
+        result = 31 * result + (isResponseText ? 13:31);
         result = 31 * result + (hasReference ? 13:31);
         result = 31 * result + (isDeprecated ? 13:31);
         result = 31 * result + (path != null ? path.hashCode() : 0);
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
index b4fd03124ae..9ebba4b2c32 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
@@ -2312,6 +2312,11 @@ public CodegenOperation fromOperation(String path,
                 if (Boolean.TRUE.equals(r.isFile) && Boolean.TRUE.equals(r.isDefault)){
                     op.isResponseFile = Boolean.TRUE;
                 }
+                if (Boolean.TRUE.equals(r.isString)
+                        && operation.getProduces() != null && operation.getProduces().contains("text/plain") // otherwise if "application/json" => wrap text with "..", and escape
+                        && Boolean.TRUE.equals(r.isDefault)){
+                    op.isResponseText = Boolean.TRUE;
+                }
             }
             op.responses.get(op.responses.size() - 1).hasMore = false;
 
diff --git a/modules/swagger-codegen/src/main/resources/typescript-angular/api.service.mustache b/modules/swagger-codegen/src/main/resources/typescript-angular/api.service.mustache
index b4a04c98cb2..5196375b8e2 100644
--- a/modules/swagger-codegen/src/main/resources/typescript-angular/api.service.mustache
+++ b/modules/swagger-codegen/src/main/resources/typescript-angular/api.service.mustache
@@ -314,8 +314,14 @@ export class {{classname}} {
 
 {{/hasFormParams}}
 {{#useHttpClient}}
-        return this.httpClient.{{httpMethod}}{{^isResponseFile}}<{{#returnType}}{{{returnType}}}{{#isResponseTypeFile}}|undefined{{/isResponseTypeFile}}{{/returnType}}{{^returnType}}any{{/returnType}}>{{/isResponseFile}}(`${this.basePath}{{{path}}}`,{{#isBodyAllowed}}
+    {{#isResponseText}}
+        return this.httpClient.{{httpMethod}}(`${this.basePath}{{{path}}}`,{{#isBodyAllowed}}
             {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}{{#hasFormParams}}convertFormParamsToString ? formParams.toString() : formParams{{/hasFormParams}}{{^hasFormParams}}null{{/hasFormParams}}{{/bodyParam}},{{/isBodyAllowed}}
+    {{/isResponseText}}
+    {{^isResponseText}}
+        return this.httpClient.{{httpMethod}}{{#isResponseText}}/*{{/isResponseText}}{{^isResponseFile}}<{{#returnType}}{{{returnType}}}{{#isResponseTypeFile}}|undefined{{/isResponseTypeFile}}{{/returnType}}{{^returnType}}any{{/returnType}}>{{/isResponseFile}}{{#isResponseText}}*/{{/isResponseText}}(`${this.basePath}{{{path}}}`,{{#isBodyAllowed}}
+            {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}{{#hasFormParams}}convertFormParamsToString ? formParams.toString() : formParams{{/hasFormParams}}{{^hasFormParams}}null{{/hasFormParams}}{{/bodyParam}},{{/isBodyAllowed}}
+    {{/isResponseText}}
             {
 {{#hasQueryParams}}
                 params: queryParameters,
@@ -323,6 +329,9 @@ export class {{classname}} {
 {{#isResponseFile}}
                 responseType: "blob",
 {{/isResponseFile}}
+{{#isResponseText}}
+                responseType: 'text' as const,
+{{/isResponseText}}
                 withCredentials: this.configuration.withCredentials,
                 headers: headers,
                 observe: observe,
@@ -343,6 +352,9 @@ export class {{classname}} {
 {{#isResponseFile}}
             responseType: ResponseContentType.Blob,
 {{/isResponseFile}}
+{{#isResponseText}}
+                responseType: "text",
+{{/isResponseText}}
 {{#hasQueryParams}}
             search: queryParameters,
 {{/hasQueryParams}}
diff --git a/samples/client/petstore-security-test/typescript-angular/.swagger-codegen/VERSION b/samples/client/petstore-security-test/typescript-angular/.swagger-codegen/VERSION
index 855ff9501eb..d6a8e234502 100644
--- a/samples/client/petstore-security-test/typescript-angular/.swagger-codegen/VERSION
+++ b/samples/client/petstore-security-test/typescript-angular/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.4.0-SNAPSHOT
\ No newline at end of file
+2.4.44
\ No newline at end of file
diff --git a/samples/client/petstore-security-test/typescript-angular/README.md b/samples/client/petstore-security-test/typescript-angular/README.md
index f679bcb1320..9c7753a47b7 100644
--- a/samples/client/petstore-security-test/typescript-angular/README.md
+++ b/samples/client/petstore-security-test/typescript-angular/README.md
@@ -2,7 +2,7 @@
 
 ### Building
 
-To build an compile the typescript sources to javascript use:
+To install the required dependencies and to build the typescript sources run:
 ```
 npm install
 npm run build
@@ -14,7 +14,7 @@ First build the package than run ```npm publish```
 
 ### consuming
 
-navigate to the folder of your consuming project and run one of next commando's.
+Navigate to the folder of your consuming project and run one of next commands.
 
 _published:_
 
@@ -22,7 +22,7 @@ _published:_
 npm install @ --save
 ```
 
-_unPublished (not recommended):_
+_without publishing (not recommended):_
 
 ```
 npm install PATH_TO_GENERATED_PACKAGE --save
@@ -37,9 +37,16 @@ npm link
 
 In your project:
 ```
-npm link @
+npm link 
 ```
 
+__Note for Windows users:__ The Angular CLI has troubles to use linked npm packages.
+Please refer to this issue https://github.com/angular/angular-cli/issues/8284 for a solution / workaround.
+Published packages are not effected by this issue.
+
+
+#### General usage
+
 In your Angular project:
 
 
diff --git a/samples/client/petstore-security-test/typescript-angular/api.module.ts b/samples/client/petstore-security-test/typescript-angular/api.module.ts
index a95cda25231..867cee5c7b2 100644
--- a/samples/client/petstore-security-test/typescript-angular/api.module.ts
+++ b/samples/client/petstore-security-test/typescript-angular/api.module.ts
@@ -17,7 +17,7 @@ export class ApiModule {
         return {
             ngModule: ApiModule,
             providers: [ { provide: Configuration, useFactory: configurationFactory } ]
-        }
+        };
     }
 
     constructor( @Optional() @SkipSelf() parentModule: ApiModule,
diff --git a/samples/client/petstore-security-test/typescript-angular/api/fake.service.ts b/samples/client/petstore-security-test/typescript-angular/api/fake.service.ts
index d0047d78bee..a664ad81802 100644
--- a/samples/client/petstore-security-test/typescript-angular/api/fake.service.ts
+++ b/samples/client/petstore-security-test/typescript-angular/api/fake.service.ts
@@ -46,7 +46,7 @@ export class FakeService {
      */
     private canConsumeForm(consumes: string[]): boolean {
         const form = 'multipart/form-data';
-        for (let consume of consumes) {
+        for (const consume of consumes) {
             if (form === consume) {
                 return true;
             }
@@ -67,6 +67,7 @@ export class FakeService {
     public testCodeInjectEndRnNR(testCodeInjectEndRnNR?: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<any>>;
     public testCodeInjectEndRnNR(testCodeInjectEndRnNR?: string, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
 
+
         let headers = this.defaultHeaders;
 
         // to determine the Accept header
@@ -74,20 +75,20 @@ export class FakeService {
             'application/json',
             '*_/   =end --       '
         ];
-        let httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
         if (httpHeaderAcceptSelected != undefined) {
-            headers = headers.set("Accept", httpHeaderAcceptSelected);
+            headers = headers.set('Accept', httpHeaderAcceptSelected);
         }
 
         // to determine the Content-Type header
-        let consumes: string[] = [
+        const consumes: string[] = [
             'application/json',
             '*_/   =end --       '
         ];
 
         const canConsumeForm = this.canConsumeForm(consumes);
 
-        let formParams: { append(param: string, value: any): void; };
+        let formParams: { append(param: string, value: any): void | HttpParams; };
         let useForm = false;
         let convertFormParamsToString = false;
         if (useForm) {
diff --git a/samples/client/petstore-security-test/typescript-angular/configuration.ts b/samples/client/petstore-security-test/typescript-angular/configuration.ts
index 2ee1824f5f7..82e8458f39e 100644
--- a/samples/client/petstore-security-test/typescript-angular/configuration.ts
+++ b/samples/client/petstore-security-test/typescript-angular/configuration.ts
@@ -28,8 +28,8 @@ export class Configuration {
      * Select the correct content-type to use for a request.
      * Uses {@link Configuration#isJsonMime} to determine the correct content-type.
      * If no content type is found return the first found type if the contentTypes is not empty
-     * @param {string[]} contentTypes - the array of content types that are available for selection
-     * @returns {string} the selected content-type or <code>undefined</code> if no selection could be made.
+     * @param contentTypes - the array of content types that are available for selection
+     * @returns the selected content-type or <code>undefined</code> if no selection could be made.
      */
     public selectHeaderContentType (contentTypes: string[]): string | undefined {
         if (contentTypes.length == 0) {
@@ -47,8 +47,8 @@ export class Configuration {
      * Select the correct accept content-type to use for a request.
      * Uses {@link Configuration#isJsonMime} to determine the correct accept content-type.
      * If no content type is found return the first found type if the contentTypes is not empty
-     * @param {string[]} accepts - the array of content types that are available for selection.
-     * @returns {string} the selected content-type or <code>undefined</code> if no selection could be made.
+     * @param accepts - the array of content types that are available for selection.
+     * @returns the selected content-type or <code>undefined</code> if no selection could be made.
      */
     public selectHeaderAccept(accepts: string[]): string | undefined {
         if (accepts.length == 0) {
@@ -69,8 +69,8 @@ export class Configuration {
      *   application/json; charset=UTF8
      *   APPLICATION/JSON
      *   application/vnd.company+json
-     * @param {string} mime - MIME (Multipurpose Internet Mail Extensions)
-     * @return {boolean} True if the given MIME is JSON, false otherwise.
+     * @param mime - MIME (Multipurpose Internet Mail Extensions)
+     * @return True if the given MIME is JSON, false otherwise.
      */
     public isJsonMime(mime: string): boolean {
         const jsonMime: RegExp = new RegExp('^(application\/json|[^;/ \t]+\/[^;/ \t]+[+]json)[ \t]*(;.*)?$', 'i');
diff --git a/samples/client/petstore-security-test/typescript-angular2/.swagger-codegen/VERSION b/samples/client/petstore-security-test/typescript-angular2/.swagger-codegen/VERSION
index 855ff9501eb..d6a8e234502 100644
--- a/samples/client/petstore-security-test/typescript-angular2/.swagger-codegen/VERSION
+++ b/samples/client/petstore-security-test/typescript-angular2/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.4.0-SNAPSHOT
\ No newline at end of file
+2.4.44
\ No newline at end of file
diff --git a/samples/client/petstore-security-test/typescript-angular2/README.md b/samples/client/petstore-security-test/typescript-angular2/README.md
index f679bcb1320..9c7753a47b7 100644
--- a/samples/client/petstore-security-test/typescript-angular2/README.md
+++ b/samples/client/petstore-security-test/typescript-angular2/README.md
@@ -2,7 +2,7 @@
 
 ### Building
 
-To build an compile the typescript sources to javascript use:
+To install the required dependencies and to build the typescript sources run:
 ```
 npm install
 npm run build
@@ -14,7 +14,7 @@ First build the package than run ```npm publish```
 
 ### consuming
 
-navigate to the folder of your consuming project and run one of next commando's.
+Navigate to the folder of your consuming project and run one of next commands.
 
 _published:_
 
@@ -22,7 +22,7 @@ _published:_
 npm install @ --save
 ```
 
-_unPublished (not recommended):_
+_without publishing (not recommended):_
 
 ```
 npm install PATH_TO_GENERATED_PACKAGE --save
@@ -37,9 +37,16 @@ npm link
 
 In your project:
 ```
-npm link @
+npm link 
 ```
 
+__Note for Windows users:__ The Angular CLI has troubles to use linked npm packages.
+Please refer to this issue https://github.com/angular/angular-cli/issues/8284 for a solution / workaround.
+Published packages are not effected by this issue.
+
+
+#### General usage
+
 In your Angular project:
 
 
diff --git a/samples/client/petstore-security-test/typescript-angular2/api.module.ts b/samples/client/petstore-security-test/typescript-angular2/api.module.ts
index a95cda25231..867cee5c7b2 100644
--- a/samples/client/petstore-security-test/typescript-angular2/api.module.ts
+++ b/samples/client/petstore-security-test/typescript-angular2/api.module.ts
@@ -17,7 +17,7 @@ export class ApiModule {
         return {
             ngModule: ApiModule,
             providers: [ { provide: Configuration, useFactory: configurationFactory } ]
-        }
+        };
     }
 
     constructor( @Optional() @SkipSelf() parentModule: ApiModule,
diff --git a/samples/client/petstore-security-test/typescript-angular2/api/fake.service.ts b/samples/client/petstore-security-test/typescript-angular2/api/fake.service.ts
index d0047d78bee..a664ad81802 100644
--- a/samples/client/petstore-security-test/typescript-angular2/api/fake.service.ts
+++ b/samples/client/petstore-security-test/typescript-angular2/api/fake.service.ts
@@ -46,7 +46,7 @@ export class FakeService {
      */
     private canConsumeForm(consumes: string[]): boolean {
         const form = 'multipart/form-data';
-        for (let consume of consumes) {
+        for (const consume of consumes) {
             if (form === consume) {
                 return true;
             }
@@ -67,6 +67,7 @@ export class FakeService {
     public testCodeInjectEndRnNR(testCodeInjectEndRnNR?: string, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<any>>;
     public testCodeInjectEndRnNR(testCodeInjectEndRnNR?: string, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
 
+
         let headers = this.defaultHeaders;
 
         // to determine the Accept header
@@ -74,20 +75,20 @@ export class FakeService {
             'application/json',
             '*_/   =end --       '
         ];
-        let httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
         if (httpHeaderAcceptSelected != undefined) {
-            headers = headers.set("Accept", httpHeaderAcceptSelected);
+            headers = headers.set('Accept', httpHeaderAcceptSelected);
         }
 
         // to determine the Content-Type header
-        let consumes: string[] = [
+        const consumes: string[] = [
             'application/json',
             '*_/   =end --       '
         ];
 
         const canConsumeForm = this.canConsumeForm(consumes);
 
-        let formParams: { append(param: string, value: any): void; };
+        let formParams: { append(param: string, value: any): void | HttpParams; };
         let useForm = false;
         let convertFormParamsToString = false;
         if (useForm) {
diff --git a/samples/client/petstore-security-test/typescript-angular2/configuration.ts b/samples/client/petstore-security-test/typescript-angular2/configuration.ts
index 2ee1824f5f7..82e8458f39e 100644
--- a/samples/client/petstore-security-test/typescript-angular2/configuration.ts
+++ b/samples/client/petstore-security-test/typescript-angular2/configuration.ts
@@ -28,8 +28,8 @@ export class Configuration {
      * Select the correct content-type to use for a request.
      * Uses {@link Configuration#isJsonMime} to determine the correct content-type.
      * If no content type is found return the first found type if the contentTypes is not empty
-     * @param {string[]} contentTypes - the array of content types that are available for selection
-     * @returns {string} the selected content-type or <code>undefined</code> if no selection could be made.
+     * @param contentTypes - the array of content types that are available for selection
+     * @returns the selected content-type or <code>undefined</code> if no selection could be made.
      */
     public selectHeaderContentType (contentTypes: string[]): string | undefined {
         if (contentTypes.length == 0) {
@@ -47,8 +47,8 @@ export class Configuration {
      * Select the correct accept content-type to use for a request.
      * Uses {@link Configuration#isJsonMime} to determine the correct accept content-type.
      * If no content type is found return the first found type if the contentTypes is not empty
-     * @param {string[]} accepts - the array of content types that are available for selection.
-     * @returns {string} the selected content-type or <code>undefined</code> if no selection could be made.
+     * @param accepts - the array of content types that are available for selection.
+     * @returns the selected content-type or <code>undefined</code> if no selection could be made.
      */
     public selectHeaderAccept(accepts: string[]): string | undefined {
         if (accepts.length == 0) {
@@ -69,8 +69,8 @@ export class Configuration {
      *   application/json; charset=UTF8
      *   APPLICATION/JSON
      *   application/vnd.company+json
-     * @param {string} mime - MIME (Multipurpose Internet Mail Extensions)
-     * @return {boolean} True if the given MIME is JSON, false otherwise.
+     * @param mime - MIME (Multipurpose Internet Mail Extensions)
+     * @return True if the given MIME is JSON, false otherwise.
      */
     public isJsonMime(mime: string): boolean {
         const jsonMime: RegExp = new RegExp('^(application\/json|[^;/ \t]+\/[^;/ \t]+[+]json)[ \t]*(;.*)?$', 'i');
diff --git a/samples/client/petstore-security-test/typescript-angular2/model/modelReturn.ts b/samples/client/petstore-security-test/typescript-angular2/model/modelReturn.ts
new file mode 100644
index 00000000000..515aa6eff6a
--- /dev/null
+++ b/samples/client/petstore-security-test/typescript-angular2/model/modelReturn.ts
@@ -0,0 +1,22 @@
+/**
+ * Swagger Petstore *_/ ' \" =end -- \\r\\n \\n \\r
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  *_/ ' \" =end --       
+ *
+ * OpenAPI spec version: 1.0.0 *_/ ' \" =end -- \\r\\n \\n \\r
+ * Contact: apiteam@swagger.io *_/ ' \" =end -- \\r\\n \\n \\r
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+/**
+ * Model for testing reserved words  *_/ ' \" =end -- \\r\\n \\n \\r
+ */
+export interface ModelReturn { 
+    /**
+     * property description  *_/ ' \" =end -- \\r\\n \\n \\r
+     */
+    _return?: number;
+}
diff --git a/samples/client/petstore/typescript-angular-v2/default/.swagger-codegen/VERSION b/samples/client/petstore/typescript-angular-v2/default/.swagger-codegen/VERSION
index 8c7754221a4..d6a8e234502 100644
--- a/samples/client/petstore/typescript-angular-v2/default/.swagger-codegen/VERSION
+++ b/samples/client/petstore/typescript-angular-v2/default/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.4.19-SNAPSHOT
\ No newline at end of file
+2.4.44
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-angular-v2/default/api/pet.service.ts b/samples/client/petstore/typescript-angular-v2/default/api/pet.service.ts
index 2395c5ef295..25b5483a504 100644
--- a/samples/client/petstore/typescript-angular-v2/default/api/pet.service.ts
+++ b/samples/client/petstore/typescript-angular-v2/default/api/pet.service.ts
@@ -30,7 +30,7 @@ import { Configuration }                                     from '../configurat
 @Injectable()
 export class PetService {
 
-    protected basePath = 'https://petstore.swagger.io/v2';
+    protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders = new Headers();
     public configuration = new Configuration();
 
diff --git a/samples/client/petstore/typescript-angular-v2/default/api/store.service.ts b/samples/client/petstore/typescript-angular-v2/default/api/store.service.ts
index bc984c328e9..dfdd5149ac5 100644
--- a/samples/client/petstore/typescript-angular-v2/default/api/store.service.ts
+++ b/samples/client/petstore/typescript-angular-v2/default/api/store.service.ts
@@ -29,7 +29,7 @@ import { Configuration }                                     from '../configurat
 @Injectable()
 export class StoreService {
 
-    protected basePath = 'https://petstore.swagger.io/v2';
+    protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders = new Headers();
     public configuration = new Configuration();
 
diff --git a/samples/client/petstore/typescript-angular-v2/default/api/user.service.ts b/samples/client/petstore/typescript-angular-v2/default/api/user.service.ts
index 1876fa53693..2d4286f42f1 100644
--- a/samples/client/petstore/typescript-angular-v2/default/api/user.service.ts
+++ b/samples/client/petstore/typescript-angular-v2/default/api/user.service.ts
@@ -29,7 +29,7 @@ import { Configuration }                                     from '../configurat
 @Injectable()
 export class UserService {
 
-    protected basePath = 'https://petstore.swagger.io/v2';
+    protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders = new Headers();
     public configuration = new Configuration();
 
diff --git a/samples/client/petstore/typescript-angular-v2/npm/.swagger-codegen/VERSION b/samples/client/petstore/typescript-angular-v2/npm/.swagger-codegen/VERSION
index 8c7754221a4..d6a8e234502 100644
--- a/samples/client/petstore/typescript-angular-v2/npm/.swagger-codegen/VERSION
+++ b/samples/client/petstore/typescript-angular-v2/npm/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.4.19-SNAPSHOT
\ No newline at end of file
+2.4.44
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-angular-v2/npm/api/pet.service.ts b/samples/client/petstore/typescript-angular-v2/npm/api/pet.service.ts
index 2395c5ef295..25b5483a504 100644
--- a/samples/client/petstore/typescript-angular-v2/npm/api/pet.service.ts
+++ b/samples/client/petstore/typescript-angular-v2/npm/api/pet.service.ts
@@ -30,7 +30,7 @@ import { Configuration }                                     from '../configurat
 @Injectable()
 export class PetService {
 
-    protected basePath = 'https://petstore.swagger.io/v2';
+    protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders = new Headers();
     public configuration = new Configuration();
 
diff --git a/samples/client/petstore/typescript-angular-v2/npm/api/store.service.ts b/samples/client/petstore/typescript-angular-v2/npm/api/store.service.ts
index bc984c328e9..dfdd5149ac5 100644
--- a/samples/client/petstore/typescript-angular-v2/npm/api/store.service.ts
+++ b/samples/client/petstore/typescript-angular-v2/npm/api/store.service.ts
@@ -29,7 +29,7 @@ import { Configuration }                                     from '../configurat
 @Injectable()
 export class StoreService {
 
-    protected basePath = 'https://petstore.swagger.io/v2';
+    protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders = new Headers();
     public configuration = new Configuration();
 
diff --git a/samples/client/petstore/typescript-angular-v2/npm/api/user.service.ts b/samples/client/petstore/typescript-angular-v2/npm/api/user.service.ts
index 1876fa53693..2d4286f42f1 100644
--- a/samples/client/petstore/typescript-angular-v2/npm/api/user.service.ts
+++ b/samples/client/petstore/typescript-angular-v2/npm/api/user.service.ts
@@ -29,7 +29,7 @@ import { Configuration }                                     from '../configurat
 @Injectable()
 export class UserService {
 
-    protected basePath = 'https://petstore.swagger.io/v2';
+    protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders = new Headers();
     public configuration = new Configuration();
 
diff --git a/samples/client/petstore/typescript-angular-v2/npm/package.json b/samples/client/petstore/typescript-angular-v2/npm/package.json
index d73ea17840b..a074aeafc40 100644
--- a/samples/client/petstore/typescript-angular-v2/npm/package.json
+++ b/samples/client/petstore/typescript-angular-v2/npm/package.json
@@ -14,16 +14,6 @@
     "build": "ngc",
     "postinstall": "npm run build"
   },
-  "peerDependencies": {
-    "@angular/core": "^2.0.0",
-    "@angular/http": "^2.0.0",
-    "@angular/common": "^2.0.0",
-    "@angular/compiler": "^2.0.0",
-    "core-js": "^2.4.0",
-    "reflect-metadata": "^0.1.3",
-    "rxjs": "^5.4.0",
-    "zone.js": "^0.7.6"
-  },
   "devDependencies": {
     "@angular/compiler-cli": "^2.0.0",
     "@angular/core": "^2.0.0",
@@ -31,10 +21,11 @@
     "@angular/common": "^2.0.0",
     "@angular/compiler": "^2.0.0",
     "@angular/platform-browser": "^2.0.0",
+    "ng-packagr": "^3.0.6",
     "reflect-metadata": "^0.1.3",
-    "rxjs": "^5.4.0",
-    "zone.js": "^0.7.6",
-    "typescript": ">=2.1.5 <2.8"
+    "rxjs": "^6.1.0",
+    "zone.js": "^0.8.26",
+    "typescript": "^>=2.1.5 and <2.8"
   },
   "publishConfig": {
     "registry": "https://skimdb.npmjs.com/registry"
diff --git a/samples/client/petstore/typescript-angular-v2/with-interfaces/.swagger-codegen/VERSION b/samples/client/petstore/typescript-angular-v2/with-interfaces/.swagger-codegen/VERSION
index 8c7754221a4..d6a8e234502 100644
--- a/samples/client/petstore/typescript-angular-v2/with-interfaces/.swagger-codegen/VERSION
+++ b/samples/client/petstore/typescript-angular-v2/with-interfaces/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.4.19-SNAPSHOT
\ No newline at end of file
+2.4.44
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-angular-v2/with-interfaces/api/pet.service.ts b/samples/client/petstore/typescript-angular-v2/with-interfaces/api/pet.service.ts
index f9b6b71dcf1..136387196f3 100644
--- a/samples/client/petstore/typescript-angular-v2/with-interfaces/api/pet.service.ts
+++ b/samples/client/petstore/typescript-angular-v2/with-interfaces/api/pet.service.ts
@@ -31,7 +31,7 @@ import { PetServiceInterface }                            from './pet.serviceInt
 @Injectable()
 export class PetService implements PetServiceInterface {
 
-    protected basePath = 'https://petstore.swagger.io/v2';
+    protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders = new Headers();
     public configuration = new Configuration();
 
diff --git a/samples/client/petstore/typescript-angular-v2/with-interfaces/api/store.service.ts b/samples/client/petstore/typescript-angular-v2/with-interfaces/api/store.service.ts
index 59ea389c4d6..5a23b4a3801 100644
--- a/samples/client/petstore/typescript-angular-v2/with-interfaces/api/store.service.ts
+++ b/samples/client/petstore/typescript-angular-v2/with-interfaces/api/store.service.ts
@@ -30,7 +30,7 @@ import { StoreServiceInterface }                            from './store.servic
 @Injectable()
 export class StoreService implements StoreServiceInterface {
 
-    protected basePath = 'https://petstore.swagger.io/v2';
+    protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders = new Headers();
     public configuration = new Configuration();
 
diff --git a/samples/client/petstore/typescript-angular-v2/with-interfaces/api/user.service.ts b/samples/client/petstore/typescript-angular-v2/with-interfaces/api/user.service.ts
index f2084151a75..b093e70e7e2 100644
--- a/samples/client/petstore/typescript-angular-v2/with-interfaces/api/user.service.ts
+++ b/samples/client/petstore/typescript-angular-v2/with-interfaces/api/user.service.ts
@@ -30,7 +30,7 @@ import { UserServiceInterface }                            from './user.serviceI
 @Injectable()
 export class UserService implements UserServiceInterface {
 
-    protected basePath = 'https://petstore.swagger.io/v2';
+    protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders = new Headers();
     public configuration = new Configuration();
 
diff --git a/samples/client/petstore/typescript-angular-v4.3/npm/.swagger-codegen/VERSION b/samples/client/petstore/typescript-angular-v4.3/npm/.swagger-codegen/VERSION
index 8c7754221a4..d6a8e234502 100644
--- a/samples/client/petstore/typescript-angular-v4.3/npm/.swagger-codegen/VERSION
+++ b/samples/client/petstore/typescript-angular-v4.3/npm/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.4.19-SNAPSHOT
\ No newline at end of file
+2.4.44
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-angular-v4.3/npm/api/pet.service.ts b/samples/client/petstore/typescript-angular-v4.3/npm/api/pet.service.ts
index f8abda9e40c..a06894415ce 100644
--- a/samples/client/petstore/typescript-angular-v4.3/npm/api/pet.service.ts
+++ b/samples/client/petstore/typescript-angular-v4.3/npm/api/pet.service.ts
@@ -28,7 +28,7 @@ import { Configuration }                                     from '../configurat
 @Injectable()
 export class PetService {
 
-    protected basePath = 'https://petstore.swagger.io/v2';
+    protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders = new HttpHeaders();
     public configuration = new Configuration();
 
diff --git a/samples/client/petstore/typescript-angular-v4.3/npm/api/store.service.ts b/samples/client/petstore/typescript-angular-v4.3/npm/api/store.service.ts
index a5d5b7fb633..46f80a17b16 100644
--- a/samples/client/petstore/typescript-angular-v4.3/npm/api/store.service.ts
+++ b/samples/client/petstore/typescript-angular-v4.3/npm/api/store.service.ts
@@ -27,7 +27,7 @@ import { Configuration }                                     from '../configurat
 @Injectable()
 export class StoreService {
 
-    protected basePath = 'https://petstore.swagger.io/v2';
+    protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders = new HttpHeaders();
     public configuration = new Configuration();
 
diff --git a/samples/client/petstore/typescript-angular-v4.3/npm/api/user.service.ts b/samples/client/petstore/typescript-angular-v4.3/npm/api/user.service.ts
index e955d6fbb70..e1323ce454b 100644
--- a/samples/client/petstore/typescript-angular-v4.3/npm/api/user.service.ts
+++ b/samples/client/petstore/typescript-angular-v4.3/npm/api/user.service.ts
@@ -27,7 +27,7 @@ import { Configuration }                                     from '../configurat
 @Injectable()
 export class UserService {
 
-    protected basePath = 'https://petstore.swagger.io/v2';
+    protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders = new HttpHeaders();
     public configuration = new Configuration();
 
diff --git a/samples/client/petstore/typescript-angular-v4.3/npm/package.json b/samples/client/petstore/typescript-angular-v4.3/npm/package.json
index 3b689b9df96..aea33d152ab 100644
--- a/samples/client/petstore/typescript-angular-v4.3/npm/package.json
+++ b/samples/client/petstore/typescript-angular-v4.3/npm/package.json
@@ -10,16 +10,6 @@
   "scripts": {
     "build": "ng-packagr -p ng-package.json"
   },
-  "peerDependencies": {
-    "@angular/core": "^4.3.0",
-    "@angular/http": "^4.3.0",
-    "@angular/common": "^4.3.0",
-    "@angular/compiler": "^4.3.0",
-    "core-js": "^2.4.0",
-    "reflect-metadata": "^0.1.3",
-    "rxjs": "^5.4.0",
-    "zone.js": "^0.7.6"
-  },
   "devDependencies": {
     "@angular/compiler-cli": "^4.3.0",
     "@angular/core": "^4.3.0",
@@ -27,11 +17,11 @@
     "@angular/common": "^4.3.0",
     "@angular/compiler": "^4.3.0",
     "@angular/platform-browser": "^4.3.0",
-    "ng-packagr": "^1.6.0",
+    "ng-packagr": "^3.0.6",
     "reflect-metadata": "^0.1.3",
-    "rxjs": "^5.4.0",
-    "zone.js": "^0.7.6",
-    "typescript": ">=2.1.5 <2.8"
+    "rxjs": "^6.1.0",
+    "zone.js": "^0.8.26",
+    "typescript": "^>=2.1.5 and <2.8"
   },
   "publishConfig": {
     "registry": "https://skimdb.npmjs.com/registry"
diff --git a/samples/client/petstore/typescript-angular-v4.3/with-interfaces/.swagger-codegen/VERSION b/samples/client/petstore/typescript-angular-v4.3/with-interfaces/.swagger-codegen/VERSION
index 8c7754221a4..d6a8e234502 100644
--- a/samples/client/petstore/typescript-angular-v4.3/with-interfaces/.swagger-codegen/VERSION
+++ b/samples/client/petstore/typescript-angular-v4.3/with-interfaces/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.4.19-SNAPSHOT
\ No newline at end of file
+2.4.44
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-angular-v4.3/with-interfaces/api/pet.service.ts b/samples/client/petstore/typescript-angular-v4.3/with-interfaces/api/pet.service.ts
index 669f4120c21..189537969d6 100644
--- a/samples/client/petstore/typescript-angular-v4.3/with-interfaces/api/pet.service.ts
+++ b/samples/client/petstore/typescript-angular-v4.3/with-interfaces/api/pet.service.ts
@@ -29,7 +29,7 @@ import { PetServiceInterface }                            from './pet.serviceInt
 @Injectable()
 export class PetService implements PetServiceInterface {
 
-    protected basePath = 'https://petstore.swagger.io/v2';
+    protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders = new HttpHeaders();
     public configuration = new Configuration();
 
diff --git a/samples/client/petstore/typescript-angular-v4.3/with-interfaces/api/store.service.ts b/samples/client/petstore/typescript-angular-v4.3/with-interfaces/api/store.service.ts
index a73f0a1beb6..08649213cfa 100644
--- a/samples/client/petstore/typescript-angular-v4.3/with-interfaces/api/store.service.ts
+++ b/samples/client/petstore/typescript-angular-v4.3/with-interfaces/api/store.service.ts
@@ -28,7 +28,7 @@ import { StoreServiceInterface }                            from './store.servic
 @Injectable()
 export class StoreService implements StoreServiceInterface {
 
-    protected basePath = 'https://petstore.swagger.io/v2';
+    protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders = new HttpHeaders();
     public configuration = new Configuration();
 
diff --git a/samples/client/petstore/typescript-angular-v4.3/with-interfaces/api/user.service.ts b/samples/client/petstore/typescript-angular-v4.3/with-interfaces/api/user.service.ts
index 068a351a34d..491402e119a 100644
--- a/samples/client/petstore/typescript-angular-v4.3/with-interfaces/api/user.service.ts
+++ b/samples/client/petstore/typescript-angular-v4.3/with-interfaces/api/user.service.ts
@@ -28,7 +28,7 @@ import { UserServiceInterface }                            from './user.serviceI
 @Injectable()
 export class UserService implements UserServiceInterface {
 
-    protected basePath = 'https://petstore.swagger.io/v2';
+    protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders = new HttpHeaders();
     public configuration = new Configuration();
 
diff --git a/samples/client/petstore/typescript-angular-v4/npm/.swagger-codegen/VERSION b/samples/client/petstore/typescript-angular-v4/npm/.swagger-codegen/VERSION
index 8c7754221a4..d6a8e234502 100644
--- a/samples/client/petstore/typescript-angular-v4/npm/.swagger-codegen/VERSION
+++ b/samples/client/petstore/typescript-angular-v4/npm/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.4.19-SNAPSHOT
\ No newline at end of file
+2.4.44
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-angular-v4/npm/api/pet.service.ts b/samples/client/petstore/typescript-angular-v4/npm/api/pet.service.ts
index 2395c5ef295..25b5483a504 100644
--- a/samples/client/petstore/typescript-angular-v4/npm/api/pet.service.ts
+++ b/samples/client/petstore/typescript-angular-v4/npm/api/pet.service.ts
@@ -30,7 +30,7 @@ import { Configuration }                                     from '../configurat
 @Injectable()
 export class PetService {
 
-    protected basePath = 'https://petstore.swagger.io/v2';
+    protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders = new Headers();
     public configuration = new Configuration();
 
diff --git a/samples/client/petstore/typescript-angular-v4/npm/api/store.service.ts b/samples/client/petstore/typescript-angular-v4/npm/api/store.service.ts
index bc984c328e9..dfdd5149ac5 100644
--- a/samples/client/petstore/typescript-angular-v4/npm/api/store.service.ts
+++ b/samples/client/petstore/typescript-angular-v4/npm/api/store.service.ts
@@ -29,7 +29,7 @@ import { Configuration }                                     from '../configurat
 @Injectable()
 export class StoreService {
 
-    protected basePath = 'https://petstore.swagger.io/v2';
+    protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders = new Headers();
     public configuration = new Configuration();
 
diff --git a/samples/client/petstore/typescript-angular-v4/npm/api/user.service.ts b/samples/client/petstore/typescript-angular-v4/npm/api/user.service.ts
index 1876fa53693..2d4286f42f1 100644
--- a/samples/client/petstore/typescript-angular-v4/npm/api/user.service.ts
+++ b/samples/client/petstore/typescript-angular-v4/npm/api/user.service.ts
@@ -29,7 +29,7 @@ import { Configuration }                                     from '../configurat
 @Injectable()
 export class UserService {
 
-    protected basePath = 'https://petstore.swagger.io/v2';
+    protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders = new Headers();
     public configuration = new Configuration();
 
diff --git a/samples/client/petstore/typescript-angular-v4/npm/package.json b/samples/client/petstore/typescript-angular-v4/npm/package.json
index da24708a248..446a311db6b 100644
--- a/samples/client/petstore/typescript-angular-v4/npm/package.json
+++ b/samples/client/petstore/typescript-angular-v4/npm/package.json
@@ -10,16 +10,6 @@
   "scripts": {
     "build": "ng-packagr -p ng-package.json"
   },
-  "peerDependencies": {
-    "@angular/core": "^4.0.0",
-    "@angular/http": "^4.0.0",
-    "@angular/common": "^4.0.0",
-    "@angular/compiler": "^4.0.0",
-    "core-js": "^2.4.0",
-    "reflect-metadata": "^0.1.3",
-    "rxjs": "^5.4.0",
-    "zone.js": "^0.7.6"
-  },
   "devDependencies": {
     "@angular/compiler-cli": "^4.0.0",
     "@angular/core": "^4.0.0",
@@ -27,11 +17,11 @@
     "@angular/common": "^4.0.0",
     "@angular/compiler": "^4.0.0",
     "@angular/platform-browser": "^4.0.0",
-    "ng-packagr": "^1.6.0",
+    "ng-packagr": "^3.0.6",
     "reflect-metadata": "^0.1.3",
-    "rxjs": "^5.4.0",
-    "zone.js": "^0.7.6",
-    "typescript": ">=2.1.5 <2.8"
+    "rxjs": "^6.1.0",
+    "zone.js": "^0.8.26",
+    "typescript": "^>=2.1.5 and <2.8"
   },
   "publishConfig": {
     "registry": "https://skimdb.npmjs.com/registry"
diff --git a/samples/client/petstore/typescript-angular-v5/npm/.swagger-codegen/VERSION b/samples/client/petstore/typescript-angular-v5/npm/.swagger-codegen/VERSION
index 5329065c433..d6a8e234502 100644
--- a/samples/client/petstore/typescript-angular-v5/npm/.swagger-codegen/VERSION
+++ b/samples/client/petstore/typescript-angular-v5/npm/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.4.12-SNAPSHOT
+2.4.44
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-angular-v5/npm/package.json b/samples/client/petstore/typescript-angular-v5/npm/package.json
index 3de3a319525..9374b75c117 100644
--- a/samples/client/petstore/typescript-angular-v5/npm/package.json
+++ b/samples/client/petstore/typescript-angular-v5/npm/package.json
@@ -10,16 +10,6 @@
   "scripts": {
     "build": "ng-packagr -p ng-package.json"
   },
-  "peerDependencies": {
-    "@angular/core": "^5.0.0",
-    "@angular/http": "^5.0.0",
-    "@angular/common": "^5.0.0",
-    "@angular/compiler": "^5.0.0",
-    "core-js": "^2.4.0",
-    "reflect-metadata": "^0.1.3",
-    "rxjs": "^5.4.0",
-    "zone.js": "^0.7.6"
-  },
   "devDependencies": {
     "@angular/compiler-cli": "^5.0.0",
     "@angular/core": "^5.0.0",
@@ -27,11 +17,11 @@
     "@angular/common": "^5.0.0",
     "@angular/compiler": "^5.0.0",
     "@angular/platform-browser": "^5.0.0",
-    "ng-packagr": "^2.4.1",
+    "ng-packagr": "^3.0.6",
     "reflect-metadata": "^0.1.3",
-    "rxjs": "^5.4.0",
-    "zone.js": "^0.7.6",
-    "typescript": ">=2.1.5 <2.8"
+    "rxjs": "^6.1.0",
+    "zone.js": "^0.8.26",
+    "typescript": "^>=2.1.5 and <2.8"
   },
   "publishConfig": {
     "registry": "https://skimdb.npmjs.com/registry"
diff --git a/samples/client/petstore/typescript-angular-v5/with-interfaces/.swagger-codegen/VERSION b/samples/client/petstore/typescript-angular-v5/with-interfaces/.swagger-codegen/VERSION
index 8c7754221a4..d6a8e234502 100644
--- a/samples/client/petstore/typescript-angular-v5/with-interfaces/.swagger-codegen/VERSION
+++ b/samples/client/petstore/typescript-angular-v5/with-interfaces/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.4.19-SNAPSHOT
\ No newline at end of file
+2.4.44
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-angular-v5/with-interfaces/api/pet.service.ts b/samples/client/petstore/typescript-angular-v5/with-interfaces/api/pet.service.ts
index 669f4120c21..189537969d6 100644
--- a/samples/client/petstore/typescript-angular-v5/with-interfaces/api/pet.service.ts
+++ b/samples/client/petstore/typescript-angular-v5/with-interfaces/api/pet.service.ts
@@ -29,7 +29,7 @@ import { PetServiceInterface }                            from './pet.serviceInt
 @Injectable()
 export class PetService implements PetServiceInterface {
 
-    protected basePath = 'https://petstore.swagger.io/v2';
+    protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders = new HttpHeaders();
     public configuration = new Configuration();
 
diff --git a/samples/client/petstore/typescript-angular-v5/with-interfaces/api/store.service.ts b/samples/client/petstore/typescript-angular-v5/with-interfaces/api/store.service.ts
index a73f0a1beb6..08649213cfa 100644
--- a/samples/client/petstore/typescript-angular-v5/with-interfaces/api/store.service.ts
+++ b/samples/client/petstore/typescript-angular-v5/with-interfaces/api/store.service.ts
@@ -28,7 +28,7 @@ import { StoreServiceInterface }                            from './store.servic
 @Injectable()
 export class StoreService implements StoreServiceInterface {
 
-    protected basePath = 'https://petstore.swagger.io/v2';
+    protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders = new HttpHeaders();
     public configuration = new Configuration();
 
diff --git a/samples/client/petstore/typescript-angular-v5/with-interfaces/api/user.service.ts b/samples/client/petstore/typescript-angular-v5/with-interfaces/api/user.service.ts
index 068a351a34d..491402e119a 100644
--- a/samples/client/petstore/typescript-angular-v5/with-interfaces/api/user.service.ts
+++ b/samples/client/petstore/typescript-angular-v5/with-interfaces/api/user.service.ts
@@ -28,7 +28,7 @@ import { UserServiceInterface }                            from './user.serviceI
 @Injectable()
 export class UserService implements UserServiceInterface {
 
-    protected basePath = 'https://petstore.swagger.io/v2';
+    protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders = new HttpHeaders();
     public configuration = new Configuration();
 
diff --git a/samples/client/petstore/typescript-angular-v6/npm/.swagger-codegen/VERSION b/samples/client/petstore/typescript-angular-v6/npm/.swagger-codegen/VERSION
index 8c7754221a4..d6a8e234502 100644
--- a/samples/client/petstore/typescript-angular-v6/npm/.swagger-codegen/VERSION
+++ b/samples/client/petstore/typescript-angular-v6/npm/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.4.19-SNAPSHOT
\ No newline at end of file
+2.4.44
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-angular-v6/npm/api/pet.service.ts b/samples/client/petstore/typescript-angular-v6/npm/api/pet.service.ts
index fe9986da63e..b2e086dbc40 100644
--- a/samples/client/petstore/typescript-angular-v6/npm/api/pet.service.ts
+++ b/samples/client/petstore/typescript-angular-v6/npm/api/pet.service.ts
@@ -28,7 +28,7 @@ import { Configuration }                                     from '../configurat
 @Injectable()
 export class PetService {
 
-    protected basePath = 'https://petstore.swagger.io/v2';
+    protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders = new HttpHeaders();
     public configuration = new Configuration();
 
diff --git a/samples/client/petstore/typescript-angular-v6/npm/api/store.service.ts b/samples/client/petstore/typescript-angular-v6/npm/api/store.service.ts
index 7696b040d2b..e7141399dc9 100644
--- a/samples/client/petstore/typescript-angular-v6/npm/api/store.service.ts
+++ b/samples/client/petstore/typescript-angular-v6/npm/api/store.service.ts
@@ -27,7 +27,7 @@ import { Configuration }                                     from '../configurat
 @Injectable()
 export class StoreService {
 
-    protected basePath = 'https://petstore.swagger.io/v2';
+    protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders = new HttpHeaders();
     public configuration = new Configuration();
 
diff --git a/samples/client/petstore/typescript-angular-v6/npm/api/user.service.ts b/samples/client/petstore/typescript-angular-v6/npm/api/user.service.ts
index 52403dbc27b..f80c6132ef8 100644
--- a/samples/client/petstore/typescript-angular-v6/npm/api/user.service.ts
+++ b/samples/client/petstore/typescript-angular-v6/npm/api/user.service.ts
@@ -27,7 +27,7 @@ import { Configuration }                                     from '../configurat
 @Injectable()
 export class UserService {
 
-    protected basePath = 'https://petstore.swagger.io/v2';
+    protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders = new HttpHeaders();
     public configuration = new Configuration();
 
diff --git a/samples/client/petstore/typescript-angular-v6/npm/package.json b/samples/client/petstore/typescript-angular-v6/npm/package.json
index dac5a15a88e..74eac50379e 100644
--- a/samples/client/petstore/typescript-angular-v6/npm/package.json
+++ b/samples/client/petstore/typescript-angular-v6/npm/package.json
@@ -10,16 +10,6 @@
   "scripts": {
     "build": "ng-packagr -p ng-package.json"
   },
-  "peerDependencies": {
-    "@angular/core": "^6.0.0",
-    "@angular/http": "^6.0.0",
-    "@angular/common": "^6.0.0",
-    "@angular/compiler": "^6.0.0",
-    "core-js": "^2.4.0",
-    "reflect-metadata": "^0.1.3",
-    "rxjs": "~6.3.3",
-    "zone.js": "^0.7.6"
-  },
   "devDependencies": {
     "@angular/compiler-cli": "^6.0.0",
     "@angular/core": "^6.0.0",
@@ -27,11 +17,11 @@
     "@angular/common": "^6.0.0",
     "@angular/compiler": "^6.0.0",
     "@angular/platform-browser": "^6.0.0",
-    "ng-packagr": "5.3.0",
+    "ng-packagr": "^3.0.6",
     "reflect-metadata": "^0.1.3",
-    "rxjs": "~6.3.3",
-    "zone.js": "^0.7.6",
-    "typescript": ">=2.1.5 <2.8"
+    "rxjs": "^6.1.0",
+    "zone.js": "^0.8.26",
+    "typescript": "^>=2.7.2 and <2.10.0"
   },
   "publishConfig": {
     "registry": "https://skimdb.npmjs.com/registry"