update to 3.0.0 + fixes

vertigo-io · Nov 20, 2020 · 5306923 · 5306923
1 parent 3799ffc
commit 5306923
Show file tree

Hide file tree

Showing 24 changed files with 30 additions and 30 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,21 +6,21 @@
 	<parent>
 		<groupId>io.vertigo</groupId>
 		<artifactId>vertigo-parent</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>3.0.0</version>
 	</parent>
 
 	<artifactId>vertigo-samples</artifactId>
 	<name>vertigo-samples</name>
 	<packaging>pom</packaging>
-	<version>3.0.0-SNAPSHOT</version>
+	<version>3.0.0</version>
 
 	<properties>
 		<maven.compiler.source>11</maven.compiler.source>
 		<maven.compiler.target>11</maven.compiler.target>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<maven.test.failure.ignore>true</maven.test.failure.ignore>
 		<maven.test.error.ignore>true</maven.test.error.ignore>
-		<vertigo.version>3.0.0-SNAPSHOT</vertigo.version>
+		<vertigo.version>3.0.0</vertigo.version>
 	</properties>
 
 	<modules>

diff --git a/sample-account/pom.xml b/sample-account/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>io.vertigo</groupId>
 		<artifactId>vertigo-samples</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>3.0.0</version>
 	</parent>
 
 	<artifactId>vertigo-sample-account</artifactId>

diff --git a/sample-aop-modules/01-sample-gutenberg-corrige/pom.xml b/sample-aop-modules/01-sample-gutenberg-corrige/pom.xml
@@ -5,7 +5,7 @@
   <parent>
 		<groupId>io.vertigo</groupId>
 		<artifactId>sample-aop-modules</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>3.0.0</version>
 	</parent>
 
   <artifactId>vertigo-sample-gutenberg-corrige</artifactId>

diff --git a/sample-aop-modules/01-sample-gutenberg/pom.xml b/sample-aop-modules/01-sample-gutenberg/pom.xml
@@ -5,7 +5,7 @@
   <parent>
 		<groupId>io.vertigo</groupId>
 		<artifactId>sample-aop-modules</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>3.0.0</version>
 	</parent>
 
   <artifactId>vertigo-sample-gutenberg-exo</artifactId>

diff --git a/sample-aop-modules/02-sample-ifttt/pom.xml b/sample-aop-modules/02-sample-ifttt/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>io.vertigo</groupId>
 		<artifactId>sample-aop-modules</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>3.0.0</version>
 	</parent>
 
   	<artifactId>vertigo-sample-ifttt-exo</artifactId>

diff --git a/sample-aop-modules/02-sample-mail/pom.xml b/sample-aop-modules/02-sample-mail/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>io.vertigo</groupId>
 		<artifactId>sample-aop-modules</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>3.0.0</version>
 	</parent>
 
   	<artifactId>vertigo-sample-mail-exo</artifactId>

diff --git a/sample-aop-modules/02-sample-notifications-corrige/pom.xml b/sample-aop-modules/02-sample-notifications-corrige/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>io.vertigo</groupId>
 		<artifactId>sample-aop-modules</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>3.0.0</version>
 	</parent>
 
   	<artifactId>vertigo-sample-notifications-corrige</artifactId>

diff --git a/sample-aop-modules/02-sample-twitter/pom.xml b/sample-aop-modules/02-sample-twitter/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>io.vertigo</groupId>
 		<artifactId>sample-aop-modules</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>3.0.0</version>
 	</parent>
 
   	<artifactId>vertigo-sample-twitter-exo</artifactId>

diff --git a/sample-aop-modules/pom.xml b/sample-aop-modules/pom.xml
@@ -6,13 +6,13 @@
 	<parent>
 		<groupId>io.vertigo</groupId>
 		<artifactId>vertigo-samples</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>3.0.0</version>
 	</parent>
 
 	<artifactId>sample-aop-modules</artifactId>
 	<name>sample-aop-modules</name>
 	<packaging>pom</packaging>
-	<version>3.0.0-SNAPSHOT</version>
+	<version>3.0.0</version>
 
 	<modules>
 		<module>01-sample-gutenberg</module>

diff --git a/sample-component/pom.xml b/sample-component/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.vertigo</groupId>
     <artifactId>vertigo-samples</artifactId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>vertigo-sample-component</artifactId>

diff --git a/sample-config/pom.xml b/sample-config/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>io.vertigo</groupId>
 		<artifactId>vertigo-samples</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>3.0.0</version>
 	</parent>
 
 	<artifactId>vertigo-sample-config</artifactId>

diff --git a/sample-crystal-full/pom.xml b/sample-crystal-full/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>io.vertigo</groupId>
 		<artifactId>vertigo-samples</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>3.0.0</version>
 	</parent>
 
 	<artifactId>vertigo-sample-crystal-full</artifactId>

diff --git a/sample-crystal-full/src/main/java/io/vertigo/samples/crystal/config/SampleConfigBuilder.java b/sample-crystal-full/src/main/java/io/vertigo/samples/crystal/config/SampleConfigBuilder.java
@@ -42,7 +42,7 @@ public static NodeConfigBuilder createNodeConfigBuilder(final boolean withSearch
 						.withC3p0(
 								Param.of("dataBaseClass", H2DataBase.class.getName()),
 								Param.of("jdbcDriver", org.h2.Driver.class.getName()),
-								Param.of("jdbcUrl", "jdbc:h2:D:/atelier/database/formation_loaded"))
+								Param.of("jdbcUrl", "jdbc:h2:C:/atelier/database/formation_loaded"))
 						.build())
 				.addModule(new DataModelFeatures().build())
 				.addModule(new DataStoreFeatures()
@@ -55,7 +55,7 @@ public static NodeConfigBuilder createNodeConfigBuilder(final boolean withSearch
 		if (withSearch) {
 			nodeConfigBuilder
 					.addModule(new ElasticSearchFeatures()
-							.withEmbeddedServer(Param.of("home", "D:/atelier/search"))//usage d'url impropre
+							.withEmbeddedServer(Param.of("home", "C:/atelier/search"))//usage d'url impropre
 							.withRestHL(Param.of("servers.names", "localhost:9200"))
 							.build())
 					.addModule(new DataFactoryFeatures()

diff --git a/...crystal-full/src/main/java/io/vertigo/samples/crystal/config/SampleCrystalSmartTypes.java b/...crystal-full/src/main/java/io/vertigo/samples/crystal/config/SampleCrystalSmartTypes.java
@@ -38,7 +38,7 @@ public enum SampleCrystalSmartTypes {
 	@Formatter(clazz = FormatterDefault.class)
 	@Constraint(clazz = ConstraintStringLength.class, arg = "500", msg = "")
 	@SmartTypeProperty(property = "storeType", value = "VARCHAR(500)")
-	@SmartTypeProperty(property = "indexType", value = "text_fr_not_tokenized")
+	@SmartTypeProperty(property = "indexType", value = "text_fr:sortable")
 	LabelLongSort,
 
 	@SmartTypeDefinition(String.class)

diff --git a/sample-crystal/pom.xml b/sample-crystal/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>io.vertigo</groupId>
 		<artifactId>vertigo-samples</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>3.0.0</version>
 	</parent>
 
 	<artifactId>vertigo-sample-crystal</artifactId>

diff --git a/sample-crystal/src/main/java/io/vertigo/samples/crystal/config/SampleConfigBuilder.java b/sample-crystal/src/main/java/io/vertigo/samples/crystal/config/SampleConfigBuilder.java
@@ -40,7 +40,7 @@ public static NodeConfigBuilder createNodeConfigBuilder(final boolean withSearch
 						.withC3p0(
 								Param.of("dataBaseClass", H2DataBase.class.getName()),
 								Param.of("jdbcDriver", org.h2.Driver.class.getName()),
-								Param.of("jdbcUrl", "jdbc:h2:D:/atelier/database/formation_loaded"))
+								Param.of("jdbcUrl", "jdbc:h2:C:/atelier/database/formation_loaded"))
 						.build())
 				.addModule(new DataModelFeatures().build())
 				.addModule(new DataStoreFeatures()
@@ -52,7 +52,7 @@ public static NodeConfigBuilder createNodeConfigBuilder(final boolean withSearch
 		if (withSearch) {
 			nodeConfigBuilder
 					.addModule(new ElasticSearchFeatures()
-							.withEmbeddedServer(Param.of("home", "D:/atelier/search"))//usage d'url impropre
+							.withEmbeddedServer(Param.of("home", "C:/atelier/search"))//usage d'url impropre
 							.withRestHL(Param.of("servers.names", "localhost:9200"))
 							.build())
 					.addModule(new DataFactoryFeatures()

diff --git a/sample-crystal/src/main/java/io/vertigo/samples/crystal/config/SampleCrystalSmartTypes.java b/sample-crystal/src/main/java/io/vertigo/samples/crystal/config/SampleCrystalSmartTypes.java
@@ -38,7 +38,7 @@ public enum SampleCrystalSmartTypes {
 	@Formatter(clazz = FormatterDefault.class)
 	@Constraint(clazz = ConstraintStringLength.class, arg = "500", msg = "")
 	@SmartTypeProperty(property = "storeType", value = "VARCHAR(500)")
-	@SmartTypeProperty(property = "indexType", value = "text_fr_not_tokenized")
+	@SmartTypeProperty(property = "indexType", value = "text_fr:sortable")
 	LabelLongSort,
 
 	@SmartTypeDefinition(String.class)

diff --git a/sample-dao-full/pom.xml b/sample-dao-full/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>io.vertigo</groupId>
 		<artifactId>vertigo-samples</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>3.0.0</version>
 	</parent>
 
 	<artifactId>vertigo-sample-dao-full</artifactId>

diff --git a/sample-dao-full/src/main/java/io/vertigo/samples/dao/config/SampleConfigBuilder.java b/sample-dao-full/src/main/java/io/vertigo/samples/dao/config/SampleConfigBuilder.java
@@ -41,12 +41,12 @@ public static NodeConfigBuilder createNodeConfigBuilderWithoutCrebase() {
 								.withC3p0(
 										Param.of("dataBaseClass", H2DataBase.class.getName()),
 										Param.of("jdbcDriver", org.h2.Driver.class.getName()),
-										Param.of("jdbcUrl", "jdbc:h2:D:/atelier/database/formation_loaded"))
+										Param.of("jdbcUrl", "jdbc:h2:C:/atelier/database/formation_loaded"))
 								.withC3p0(
 										Param.of("name", "mine"),
 										Param.of("dataBaseClass", H2DataBase.class.getName()),
 										Param.of("jdbcDriver", org.h2.Driver.class.getName()),
-										Param.of("jdbcUrl", "jdbc:h2:D:/atelier/database/formation_mine"))
+										Param.of("jdbcUrl", "jdbc:h2:C:/atelier/database/formation_mine"))
 								.build())
 						.addModule(new DataModelFeatures().build())
 						.addModule(new DataStoreFeatures()

diff --git a/sample-dao/pom.xml b/sample-dao/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>io.vertigo</groupId>
 		<artifactId>vertigo-samples</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>3.0.0</version>
 	</parent>
 
 	<artifactId>vertigo-sample-dao</artifactId>

diff --git a/sample-dao/src/main/java/io/vertigo/samples/dao/config/SampleConfigBuilder.java b/sample-dao/src/main/java/io/vertigo/samples/dao/config/SampleConfigBuilder.java
@@ -38,7 +38,7 @@ public static NodeConfigBuilder createNodeConfigBuilderCore() {
 						.withC3p0(
 								Param.of("dataBaseClass", H2DataBase.class.getName()),
 								Param.of("jdbcDriver", org.h2.Driver.class.getName()),
-								Param.of("jdbcUrl", "jdbc:h2:D:/atelier/database/formation_loaded"))
+								Param.of("jdbcUrl", "jdbc:h2:C:/atelier/database/formation_loaded"))
 						.build())
 				.addModule(new DataModelFeatures().build())
 				.addModule(new DataStoreFeatures()

diff --git a/sample-hello-world/pom.xml b/sample-hello-world/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>io.vertigo</groupId>
 		<artifactId>vertigo-samples</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>3.0.0</version>
 	</parent>
 
 	<artifactId>vertigo-sample-hello-world</artifactId>

diff --git a/sample-notifications/pom.xml b/sample-notifications/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>io.vertigo</groupId>
 		<artifactId>vertigo-samples</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>3.0.0</version>
 	</parent>
 
   	<artifactId>vertigo-sample-notifications</artifactId>

diff --git a/sample-quarto/pom.xml b/sample-quarto/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>io.vertigo</groupId>
 		<artifactId>vertigo-samples</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>3.0.0</version>
 	</parent>
 
 	<artifactId>vertigo-sample-quarto</artifactId>