Merge pull request #163 from xdev-software/develop

v2.2.0
xdev-software · Oct 1, 2024 · 61b44c6 · 61b44c6
2 parents 166f381 + fb3746f
commit 61b44c6
Show file tree

Hide file tree

Showing 13 changed files with 61 additions and 43 deletions.
diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml
@@ -11,7 +11,7 @@ on:
       - '.idea/**'
       - 'assets/**'
   pull_request:
-    types: [opened, synchronize, reopened]
+    branches: [ develop ]
     paths-ignore: 
       - '**.md'
       - '.config/**'

diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
@@ -14,4 +14,4 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.8/apache-maven-3.9.8-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 2.2.0
+
+* Fixed issue with not found migration script (for v2.X)
+* Updated org.springframework.boot.version to v3.3.4
+
 # 2.1.0
 
 * Implemented auto-id-generation for UUIDs.

diff --git a/README.md b/README.md
@@ -55,7 +55,8 @@ instructions** are in the documentation](https://xdev-software.github.io/spring-
 | ``1.0.3/1.0.4``           | ``17`` | ``3.2.3``   | ``1.2.0``    |
 | ``1.0.5-1.0.7``           | ``17`` | ``3.2.5``   | ``1.3.2``    |
 | ``1.0.8-1.0.10``          | ``17`` | ``3.3.1``   | ``1.3.2``    |
-| ``>= 2.0.0``              | ``17`` | ``3.3.2``   | ``1.4.0``    |
+| ``2.0.0-2.1.0``           | ``17`` | ``3.3.2``   | ``1.4.0``    |
+| ``>= 2.2.0``              | ``17`` | ``3.3.4``   | ``1.4.0``    |
 
 ## Demo
 

diff --git a/docs/antora.yml b/docs/antora.yml
@@ -1,14 +1,14 @@
 name: ROOT
 title: Spring-Data-Eclipse-Store
 version: master
-display_version: '2.1.0'
+display_version: '2.2.0'
 start_page: index.adoc
 nav:
   - modules/ROOT/nav.adoc
 asciidoc:
   attributes:
     product-name: 'Spring-Data-Eclipse-Store'
-    display-version: '2.1.0'
-    maven-version: '2.1.0'
+    display-version: '2.2.0'
+    maven-version: '2.2.0'
     page-editable: false
     page-out-of-support: false
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>software.xdev</groupId>
 	<artifactId>spring-data-eclipse-store-root</artifactId>
-	<version>2.2.1-SNAPSHOT</version>
+	<version>2.2.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<organization>
@@ -45,12 +45,12 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-checkstyle-plugin</artifactId>
-						<version>3.4.0</version>
+						<version>3.5.0</version>
 						<dependencies>
 							<dependency>
 								<groupId>com.puppycrawl.tools</groupId>
 								<artifactId>checkstyle</artifactId>
-								<version>10.17.0</version>
+								<version>10.18.2</version>
 							</dependency>
 						</dependencies>
 						<configuration>
@@ -75,7 +75,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-pmd-plugin</artifactId>
-						<version>3.24.0</version>
+						<version>3.25.0</version>
 						<configuration>
 							<includeTests>true</includeTests>
 							<printFailingErrors>true</printFailingErrors>
@@ -93,12 +93,12 @@
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-core</artifactId>
-								<version>7.4.0</version>
+								<version>7.6.0</version>
 							</dependency>
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-java</artifactId>
-								<version>7.4.0</version>
+								<version>7.6.0</version>
 							</dependency>
 						</dependencies>
 					</plugin>
@@ -110,7 +110,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-jxr-plugin</artifactId>
-						<version>3.4.0</version>
+						<version>3.5.0</version>
 					</plugin>
 				</plugins>
 			</reporting>

diff --git a/spring-data-eclipse-store-benchmark/pom.xml b/spring-data-eclipse-store-benchmark/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>software.xdev</groupId>
 		<artifactId>spring-data-eclipse-store-root</artifactId>
-		<version>2.2.1-SNAPSHOT</version>
+		<version>2.2.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>spring-data-eclipse-store-benchmark</artifactId>
@@ -25,7 +25,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-		<org.springframework.boot.version>3.3.2</org.springframework.boot.version>
+		<org.springframework.boot.version>3.3.4</org.springframework.boot.version>
 		<jmh.version>1.37</jmh.version>
 	</properties>
 

diff --git a/spring-data-eclipse-store-demo/pom.xml b/spring-data-eclipse-store-demo/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>software.xdev</groupId>
 		<artifactId>spring-data-eclipse-store-root</artifactId>
-		<version>2.2.1-SNAPSHOT</version>
+		<version>2.2.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>spring-data-eclipse-store-demo</artifactId>
@@ -28,7 +28,7 @@
 
 		<mainClass>software.xdev.spring.data.eclipse.store.demo.complex.ComplexDemoApplication</mainClass>
 
-		<org.springframework.boot.version>3.3.2</org.springframework.boot.version>
+		<org.springframework.boot.version>3.3.4</org.springframework.boot.version>
 	</properties>
 
 	<dependencyManagement>
@@ -113,7 +113,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>3.3.1</version>
+				<version>3.5.0</version>
 				<configuration>
 					<argLine>
 						--add-opens java.base/java.util=ALL-UNNAMED

diff --git a/spring-data-eclipse-store-jpa/pom.xml b/spring-data-eclipse-store-jpa/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>software.xdev</groupId>
 		<artifactId>spring-data-eclipse-store-root</artifactId>
-		<version>2.2.1-SNAPSHOT</version>
+		<version>2.2.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>spring-data-eclipse-store-jpa</artifactId>
@@ -30,7 +30,7 @@
 
 		<mainClass>software.xdev.spring.data.eclipse.store.demo.complex.ComplexDemoApplication</mainClass>
 
-		<org.springframework.boot.version>3.3.2</org.springframework.boot.version>
+		<org.springframework.boot.version>3.3.4</org.springframework.boot.version>
 	</properties>
 
 	<dependencyManagement>

diff --git a/spring-data-eclipse-store/pom.xml b/spring-data-eclipse-store/pom.xml
@@ -51,7 +51,7 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
 		<!-- Should be in sync with org.eclipse.store:integrations-spring-boot3 -->
-		<org.springframework.boot.version>3.3.2</org.springframework.boot.version>
+		<org.springframework.boot.version>3.3.4</org.springframework.boot.version>
 		<org.eclipse.store.version>1.4.0</org.eclipse.store.version>
 		<org.eclipse.serializer.version>1.4.0</org.eclipse.serializer.version>
 	</properties>
@@ -239,15 +239,15 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-project-info-reports-plugin</artifactId>
-					<version>3.6.2</version>
+					<version>3.7.0</version>
 				</plugin>
 			</plugins>
 		</pluginManagement>
 		<plugins>
 			<plugin>
 				<groupId>com.mycila</groupId>
 				<artifactId>license-maven-plugin</artifactId>
-				<version>4.5</version>
+				<version>4.6</version>
 				<configuration>
 					<properties>
 						<email>${project.organization.url}</email>
@@ -288,7 +288,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>3.8.0</version>
+				<version>3.10.0</version>
 				<executions>
 					<execution>
 						<id>attach-javadocs</id>
@@ -306,7 +306,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>3.3.1</version>
+				<version>3.5.0</version>
 				<configuration>
 					<argLine>
 						--add-exports java.base/jdk.internal.misc=ALL-UNNAMED
@@ -357,7 +357,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-gpg-plugin</artifactId>
-						<version>3.2.4</version>
+						<version>3.2.7</version>
 						<executions>
 							<execution>
 								<id>sign-artifacts</id>
@@ -400,12 +400,12 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-checkstyle-plugin</artifactId>
-						<version>3.4.0</version>
+						<version>3.5.0</version>
 						<dependencies>
 							<dependency>
 								<groupId>com.puppycrawl.tools</groupId>
 								<artifactId>checkstyle</artifactId>
-								<version>10.17.0</version>
+								<version>10.18.2</version>
 							</dependency>
 						</dependencies>
 						<configuration>
@@ -430,7 +430,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-pmd-plugin</artifactId>
-						<version>3.24.0</version>
+						<version>3.25.0</version>
 						<configuration>
 							<includeTests>true</includeTests>
 							<printFailingErrors>true</printFailingErrors>
@@ -447,12 +447,12 @@
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-core</artifactId>
-								<version>7.4.0</version>
+								<version>7.6.0</version>
 							</dependency>
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-java</artifactId>
-								<version>7.4.0</version>
+								<version>7.6.0</version>
 							</dependency>
 						</dependencies>
 					</plugin>
@@ -464,7 +464,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-jxr-plugin</artifactId>
-						<version>3.4.0</version>
+						<version>3.5.0</version>
 					</plugin>
 				</plugins>
 			</reporting>

diff --git a/...rc/main/java/software/xdev/spring/data/eclipse/store/repository/EclipseStoreMigrator.java b/...rc/main/java/software/xdev/spring/data/eclipse/store/repository/EclipseStoreMigrator.java
@@ -20,33 +20,33 @@
 import org.eclipse.store.storage.embedded.types.EmbeddedStorageManager;
 
 import software.xdev.micromigration.eclipsestore.MigrationManager;
-import software.xdev.micromigration.migrater.reflection.ReflectiveMigrater;
+import software.xdev.micromigration.migrater.ExplicitMigrater;
 import software.xdev.micromigration.scripts.VersionAgnosticMigrationScript;
 import software.xdev.micromigration.version.MigrationVersion;
 import software.xdev.spring.data.eclipse.store.repository.root.VersionedRoot;
-import software.xdev.spring.data.eclipse.store.repository.root.update.scripts.v2_0_0_InitalizeVersioning;
+import software.xdev.spring.data.eclipse.store.repository.root.update.scripts.v2_0_0_InitializeVersioning;
 
 
 public final class EclipseStoreMigrator
 {
-	public static final Class<?> FIRST_UPDATE_SCRIPT = v2_0_0_InitalizeVersioning.class;
+	public static final VersionAgnosticMigrationScript<?, ?>[] SCRIPTS =
+		new VersionAgnosticMigrationScript[]{
+			new v2_0_0_InitializeVersioning()
+		};
 
 	private EclipseStoreMigrator()
 	{
 	}
 
 	public static void migrate(final VersionedRoot versionedRoot, final EmbeddedStorageManager storageManager)
 	{
-		final ReflectiveMigrater migrater =
-			new ReflectiveMigrater(FIRST_UPDATE_SCRIPT.getPackageName());
-		new MigrationManager(versionedRoot, migrater, storageManager)
-			.migrate(versionedRoot);
+		final ExplicitMigrater migrater = new ExplicitMigrater(SCRIPTS);
+		new MigrationManager(versionedRoot, migrater, storageManager).migrate(versionedRoot);
 	}
 
 	public static MigrationVersion getLatestVersion()
 	{
-		final ReflectiveMigrater migrater =
-			new ReflectiveMigrater(FIRST_UPDATE_SCRIPT.getPackageName());
+		final ExplicitMigrater migrater = new ExplicitMigrater(SCRIPTS);
 		final TreeSet<VersionAgnosticMigrationScript<?, ?>> sortedScripts = migrater.getSortedScripts();
 		return sortedScripts.isEmpty() ? new MigrationVersion(0, 0, 0) : sortedScripts.last().getTargetVersion();
 	}

diff --git a/...re/xdev/spring/data/eclipse/store/repository/root/update/scripts/LoggingUpdateScript.java b/...re/xdev/spring/data/eclipse/store/repository/root/update/scripts/LoggingUpdateScript.java
@@ -24,6 +24,10 @@
 import software.xdev.spring.data.eclipse.store.repository.root.VersionedRoot;
 
 
+/**
+ * <b>All migration scripts must be added to
+ * {@link software.xdev.spring.data.eclipse.store.repository.EclipseStoreMigrator#SCRIPTS}!</b>
+ */
 public abstract class LoggingUpdateScript
 	extends ReflectiveVersionMigrationScript<VersionedRoot, MigrationEmbeddedStorageManager>
 {

diff --git a/...e/scripts/v2_0_0_InitalizeVersioning.java → .../scripts/v2_0_0_InitializeVersioning.java b/...e/scripts/v2_0_0_InitalizeVersioning.java → .../scripts/v2_0_0_InitializeVersioning.java
@@ -21,13 +21,21 @@
 import software.xdev.micromigration.eclipsestore.MigrationEmbeddedStorageManager;
 import software.xdev.micromigration.scripts.Context;
 import software.xdev.spring.data.eclipse.store.repository.root.EntityData;
+import software.xdev.spring.data.eclipse.store.repository.root.RootDataV2;
 import software.xdev.spring.data.eclipse.store.repository.root.VersionedRoot;
 
 
+/**
+ * Copies elements from the old Root({@link software.xdev.spring.data.eclipse.store.repository.Root} to the newer
+ * version of Root({@link RootDataV2}).
+ * <p>
+ * <b>All migration scripts must be added to
+ * {@link software.xdev.spring.data.eclipse.store.repository.EclipseStoreMigrator#SCRIPTS}!</b>
+ */
 @SuppressWarnings("checkstyle:TypeName")
-public class v2_0_0_InitalizeVersioning extends LoggingUpdateScript
+public class v2_0_0_InitializeVersioning extends LoggingUpdateScript
 {
-	private static final Logger LOG = LoggerFactory.getLogger(v2_0_0_InitalizeVersioning.class);
+	private static final Logger LOG = LoggerFactory.getLogger(v2_0_0_InitializeVersioning.class);
 
 	@Override
 	public void loggedMigrate(final Context<VersionedRoot, MigrationEmbeddedStorageManager> context)