rework spring-cache dependencies

jhipster · Mar 21, 2024 · ff2e00e · ff2e00e
1 parent cf13259
commit ff2e00e
Show file tree

Hide file tree

Showing 9 changed files with 408 additions and 329 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -220,6 +220,17 @@ updates:
       - 'theme: java'
       - 'skip-changelog'
 
+  - package-ecosystem: 'gradle'
+    directory: '/generators/spring-cache/resources/'
+    schedule:
+      interval: 'daily'
+      time: '08:30'
+    open-pull-requests-limit: 5
+    labels:
+      - 'theme: dependencies'
+      - 'theme: cache'
+      - 'skip-changelog'
+
   - package-ecosystem: 'github-actions'
     directory: '/'
     schedule:

diff --git a/generators/app/__snapshots__/generator.spec.ts.snap b/generators/app/__snapshots__/generator.spec.ts.snap
@@ -514,6 +514,8 @@ exports[`generator - app with default config should match snapshot 1`] = `
     "spotless-maven-plugin": "'SPOTLESS-MAVEN-PLUGIN-VERSION'",
     "spring-boot": "'SPRING-BOOT-VERSION'",
     "typesafe": "'TYPESAFE-VERSION'",
+    "xmemcached": "'XMEMCACHED-VERSION'",
+    "xmemcached-provider": "'XMEMCACHED-PROVIDER-VERSION'",
   },
   "javaPackageSrcDir": "src/main/java/com/mycompany/myapp/",
   "javaPackageTestDir": "src/test/java/com/mycompany/myapp/",
@@ -1046,8 +1048,6 @@ exports[`generator - app with gateway should match snapshot 1`] = `
     "gradle-liquibase": "'GRADLE-LIQUIBASE-VERSION'",
     "gradle-modernizer-plugin": "'GRADLE-MODERNIZER-PLUGIN-VERSION'",
     "gradle-sonarqube": "'GRADLE-SONARQUBE-VERSION'",
-    "hazelcast-hibernate53": "'HAZELCAST-HIBERNATE-53-VERSION'",
-    "hazelcast-spring": "'HAZELCAST-SPRING-VERSION'",
     "jackson-databind-nullable": "'JACKSON-DATABIND-NULLABLE-VERSION'",
     "jacoco-maven-plugin": "'JACOCO-MAVEN-PLUGIN-VERSION'",
     "jhipster-dependabot": "'JHIPSTER-DEPENDABOT-VERSION'",
@@ -1077,7 +1077,6 @@ exports[`generator - app with gateway should match snapshot 1`] = `
     "spotless-gradle-plugin": "'SPOTLESS-GRADLE-PLUGIN-VERSION'",
     "spotless-maven-plugin": "'SPOTLESS-MAVEN-PLUGIN-VERSION'",
     "spring-boot": "'SPRING-BOOT-VERSION'",
-    "typesafe": "'TYPESAFE-VERSION'",
   },
   "javaPackageSrcDir": "src/main/java/com/mycompany/myapp/",
   "javaPackageTestDir": "src/test/java/com/mycompany/myapp/",
@@ -1642,6 +1641,8 @@ exports[`generator - app with microservice should match snapshot 1`] = `
     "spotless-maven-plugin": "'SPOTLESS-MAVEN-PLUGIN-VERSION'",
     "spring-boot": "'SPRING-BOOT-VERSION'",
     "typesafe": "'TYPESAFE-VERSION'",
+    "xmemcached": "'XMEMCACHED-VERSION'",
+    "xmemcached-provider": "'XMEMCACHED-PROVIDER-VERSION'",
   },
   "javaPackageSrcDir": "src/main/java/com/mycompany/myapp/",
   "javaPackageTestDir": "src/test/java/com/mycompany/myapp/",

diff --git a/generators/java/types.d.ts b/generators/java/types.d.ts
@@ -23,8 +23,8 @@ export type JavaArtifactVersion = RequireOneOrNone<{ version: string; versionRef
 export type JavaDependency = JavaArtifact & JavaArtifactVersion;
 
 export type JavaDefinition = {
-  versions: JavaDependencyVersion[];
-  dependencies: JavaDependency[];
+  versions?: JavaDependencyVersion[];
+  dependencies?: JavaDependency[];
 };
 
 export type JavaNeedleOptions = GradleNeedleOptions;

diff --git a/generators/liquibase/incremental-liquibase.spec.ts b/generators/liquibase/incremental-liquibase.spec.ts
@@ -100,7 +100,7 @@ One{anotherEnt} to @OnDelete("SET NULL") @OnUpdate("CASCADE") Another,
 }`;
 
 const generatorPath = join(__dirname, '../server/index.js');
-const mockedGenerators = ['jhipster:common', 'jhipster:gradle', 'jhipster:maven'];
+const mockedGenerators = ['jhipster:common'];
 
 describe('generator - app - --incremental-changelog', function () {
   this.timeout(45000);

diff --git a/generators/server/resources/pom.xml b/generators/server/resources/pom.xml
@@ -12,13 +12,10 @@
         <blockhound-junit-platform.version>1.0.8.RELEASE</blockhound-junit-platform.version>
         <commons-beanutils.version>1.9.4</commons-beanutils.version>
         <gatling.version>3.10.4</gatling.version>
-        <hazelcast-hibernate53.version>5.1.0</hazelcast-hibernate53.version>
-        <hazelcast-spring.version>5.3.6</hazelcast-spring.version>
         <jackson-databind-nullable.version>0.2.6</jackson-databind-nullable.version>
         <mapstruct.version>1.5.5.Final</mapstruct.version>
         <micrometer-context-propagation.version>1.1.1</micrometer-context-propagation.version>
         <picocli.version>4.7.5</picocli.version>
-        <typesafe.version>1.4.3</typesafe.version>
 
         <!-- Plugin versions -->
         <checkstyle.version>10.14.2</checkstyle.version>
@@ -56,26 +53,11 @@
               <artifactId>commons-beanutils</artifactId>
               <version>${commons-beanutils.version}</version>
             </dependency>
-            <dependency>
-              <groupId>com.hazelcast</groupId>
-              <artifactId>hazelcast-hibernate53</artifactId>
-              <version>${hazelcast-hibernate53.version}</version>
-            </dependency>
-            <dependency>
-              <groupId>com.hazelcast</groupId>
-              <artifactId>hazelcast-spring</artifactId>
-              <version>${hazelcast-spring.version}</version>
-            </dependency>
             <dependency>
               <groupId>com.tngtech.archunit</groupId>
               <artifactId>archunit-junit5-api</artifactId>
               <version>${archunit-junit5.version}</version>
             </dependency>
-            <dependency>
-              <groupId>com.typesafe</groupId>
-              <artifactId>config</artifactId>
-              <version>${typesafe.version}</version>
-            </dependency>
             <dependency>
               <groupId>io.gatling.highcharts</groupId>
               <artifactId>gatling-charts-highcharts</artifactId>