Merge remote-tracking branch 'upstream/main' into spring-boot-v3

Author: mshima

.blueprint/cli/commands.mjs

@@ -4,7 +4,7 @@
  * This file is part of the JHipster project, see https://www.jhipster.tech/
  * for more information.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *

.blueprint/generate-sample/command.mjs

@@ -4,7 +4,7 @@
  * This file is part of the JHipster project, see https://www.jhipster.tech/
  * for more information.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *

.blueprint/synchronize/command.js

@@ -4,7 +4,7 @@
  * This file is part of the JHipster project, see https://www.jhipster.tech/
  * for more information.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *

.blueprint/synchronize/generator.js

@@ -4,7 +4,7 @@
  * This file is part of the JHipster project, see https://www.jhipster.tech/
  * for more information.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *
@@ -50,13 +50,17 @@ export default class SynchronizeGenerator extends BaseGenerator {
                                 .replaceAll(';\n', '\n')
                                 .replaceAll('\nimport static ', '\nimport ')
                                 .replaceAll('public class ', 'class ')
+                                .replaceAll('public abstract class ', 'abstract class ')
+                                .replaceAll('new ', '')
+                                .replaceAll('::class', '::class.java')
                                 .replaceAll('.class', '::class')
                                 .replaceAll(/ (?:extends|implements) (\w+)/g, ' : $1')
                                 .replaceAll(/ (?:extends|implements) /g, ' : ')
                                 .replaceAll(/@Override\n(\s*)/g, 'override ')
                                 .replaceAll(/\n( {4})(private |)?(?:final )?(\w+) (\w+)(\n| = )/g, '\n$1$2lateinit var $4: $3$5')
                                 .replaceAll(/private static final (\w+) /g, 'private val ')
                                 .replaceAll(/(?:public |protected )?(\w+) (\w+)\((.*)\) {/g, 'fun $2($3): $1 {')
+                                .replaceAll(' {}\n', '\n')
                                 .replaceAll(': void', ''),
                         );
                     }),

.blueprint/synchronize/index.js

@@ -4,7 +4,7 @@
  * This file is part of the JHipster project, see https://www.jhipster.tech/
  * for more information.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *

.github/workflows/copyright-update.yml

@@ -29,7 +29,7 @@ jobs:
                   grep -rlZE "Copyright ([0-9]+)-$CURRENT_YEAR" . | xargs -0 sed -i -E "s/Copyright ([0-9]+)-$CURRENT_YEAR/Copyright \1-$NEW_YEAR/g"
             # Create PR
             - name: Create Pull Request
-              uses: peter-evans/create-pull-request@v6
+              uses: peter-evans/create-pull-request@v7
               with:
                   token: ${{ secrets.GITHUB_TOKEN }}
                   commit-message: 'Update copyright headers'

.github/workflows/release-drafter.yml

@@ -11,6 +11,6 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             # Drafts your next Release notes as Pull Requests are merged into "master"
-            - uses: release-drafter/release-drafter@v5
+            - uses: release-drafter/release-drafter@v6
               env:
                   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

LICENSE

@@ -191,7 +191,7 @@
 
     Copyright [yyyy] [name of copyright owner]
 
-    Licensed under the Apache License, Version 2.0 (the "License");
+    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
 

cli/logo.mjs

@@ -4,7 +4,7 @@
  * This file is part of the JHipster project, see https://www.jhipster.tech/
  * for more information.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * 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
  *

generators/detekt/templates/gradle/detekt.gradle.ejs

@@ -4,11 +4,11 @@
  This file is part of the JHipster project, see https://www.jhipster.tech/
  for more information.
 
- Licensed under the Apache License, Version 2.0 (the "License");
+ Licensed under the Apache License, Version 2.0 (the "License")
  you may not use this file except in compliance with the License.
  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+      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,