Merge pull request #410 from mshima/allopen

drop allopen plugin options
jhipster · Jul 30, 2024 · 34c99dc · 34c99dc
2 parents e75bcf3 + 5220966
commit 34c99dc
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 36 deletions.
diff --git a/generators/kotlin/__snapshots__/generator.spec.js.snap b/generators/kotlin/__snapshots__/generator.spec.js.snap
@@ -24,12 +24,6 @@ exports[`SubGenerator kotlin of kotlin JHipster blueprint > gradle > should matc
       "pluginName": "kotlin-jpa",
       "version.ref": "kotlin",
     },
-    {
-      "addToBuild": true,
-      "id": "org.jetbrains.kotlin.plugin.allopen",
-      "pluginName": "kotlin-allopen",
-      "version.ref": "kotlin",
-    },
   ],
   "addGradleDependencyCatalogPlugins": [
     [
@@ -244,12 +238,7 @@ exports[`SubGenerator kotlin of kotlin JHipster blueprint > maven > should match
                                             <plugin>spring</plugin>
                                             <plugin>jpa</plugin>
                                             <plugin>all-open</plugin>
-                                        </compilerPlugins><pluginOptions>
-                                            <!-- Each annotation is placed on its own line -->
-                                            <option>all-open:annotation=javax.persistence.Entity</option>
-                                            <option>all-open:annotation=javax.persistence.MappedSuperclass</option>
-                                            <option>all-open:annotation=javax.persistence.Embeddable</option>
-                                        </pluginOptions>
+                                        </compilerPlugins>
                                     </configuration>
                                     <dependencies>
                                         <dependency>

diff --git a/generators/kotlin/generator.js b/generators/kotlin/generator.js
@@ -120,12 +120,6 @@ export default class extends BaseApplicationGenerator {
                                 'version.ref': 'kotlin',
                                 addToBuild: true,
                             });
-                            source.addGradleDependencyCatalogPlugin({
-                                pluginName: 'kotlin-allopen',
-                                id: 'org.jetbrains.kotlin.plugin.allopen',
-                                'version.ref': 'kotlin',
-                                addToBuild: true,
-                            });
                         }
                     }
                 }
@@ -302,16 +296,7 @@ export default class extends BaseApplicationGenerator {
                                             <plugin>all-open</plugin>`
                                                     : ''
                                             }
-                                        </compilerPlugins>${
-                                            application.databaseTypeSql
-                                                ? `<pluginOptions>
-                                            <!-- Each annotation is placed on its own line -->
-                                            <option>all-open:annotation=javax.persistence.Entity</option>
-                                            <option>all-open:annotation=javax.persistence.MappedSuperclass</option>
-                                            <option>all-open:annotation=javax.persistence.Embeddable</option>
-                                        </pluginOptions>`
-                                                : ''
-                                        }
+                                        </compilerPlugins>
                                     </configuration>
                                     <dependencies>
                                         <dependency>

diff --git a/generators/kotlin/templates/gradle/kotlin.gradle.ejs b/generators/kotlin/templates/gradle/kotlin.gradle.ejs
@@ -45,14 +45,6 @@ kapt {
     correctErrorTypes true
 }
 
-<%_ if (databaseTypeSql) { _%>
-allOpen {
-    annotation("javax.persistence.Entity")
-    annotation("javax.persistence.MappedSuperclass")
-    annotation("javax.persistence.Embeddable")
-}
-
-<%_ } _%>
 [compileKotlin, compileTestKotlin]*.with {
     kotlinOptions {
         jvmTarget = "<%= javaVersion %>"