This is an automated email from the ASF dual-hosted git repository.
zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 1d0bde4 Independently generated modules and add the project version
(#15981)
1d0bde4 is described below
commit 1d0bde4b6382b4dfcacdcf7e655fc7f4270480e6
Author: Guocheng Tang <[email protected]>
AuthorDate: Fri Mar 11 12:43:06 2022 +0800
Independently generated modules and add the project version (#15981)
* Independently generated modules and add the project version
* update pom version
---
.../shardingsphere-example-generator/pom.xml | 4 ++++
.../example/generator/ExampleGeneratorFactory.java | 2 ++
.../src/main/resources/data-model/data-model.yaml | 13 +++++++++--
.../src/main/resources/template/jdbc/pom.ftl | 25 +++++++++++++++-------
4 files changed, 34 insertions(+), 10 deletions(-)
diff --git
a/examples/shardingsphere-sample/shardingsphere-example-generator/pom.xml
b/examples/shardingsphere-sample/shardingsphere-example-generator/pom.xml
index 6f3a123..bbd191e 100644
--- a/examples/shardingsphere-sample/shardingsphere-example-generator/pom.xml
+++ b/examples/shardingsphere-sample/shardingsphere-example-generator/pom.xml
@@ -29,6 +29,10 @@
<dependencies>
<dependency>
+ <groupId>org.apache.shardingsphere</groupId>
+ <artifactId>shardingsphere-infra-common</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
</dependency>
diff --git
a/examples/shardingsphere-sample/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/ExampleGeneratorFactory.java
b/examples/shardingsphere-sample/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/ExampleGeneratorFactory.java
index d04e074..1e7d0a8 100644
---
a/examples/shardingsphere-sample/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/ExampleGeneratorFactory.java
+++
b/examples/shardingsphere-sample/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/ExampleGeneratorFactory.java
@@ -19,6 +19,7 @@ package org.apache.shardingsphere.example.generator;
import freemarker.template.Configuration;
import freemarker.template.TemplateException;
+import org.apache.shardingsphere.infra.autogen.version.ShardingSphereVersion;
import org.yaml.snakeyaml.Yaml;
import java.io.File;
@@ -59,6 +60,7 @@ public final class ExampleGeneratorFactory {
try (InputStream input =
ExampleGeneratorFactory.class.getResourceAsStream(DATA_MODEL_PATH)) {
Map<String, String> dataModel = new Yaml().loadAs(input,
Map.class);
String product = dataModel.get("product");
+ dataModel.put("shardingsphereVersion",
ShardingSphereVersion.VERSION);
for (ExampleGenerator each :
ServiceLoader.load(ExampleGenerator.class)) {
if (product.equals(each.getType())) {
each.generate(templateConfig, dataModel);
diff --git
a/examples/shardingsphere-sample/shardingsphere-example-generator/src/main/resources/data-model/data-model.yaml
b/examples/shardingsphere-sample/shardingsphere-example-generator/src/main/resources/data-model/data-model.yaml
index 02ae672..3e35664 100644
---
a/examples/shardingsphere-sample/shardingsphere-example-generator/src/main/resources/data-model/data-model.yaml
+++
b/examples/shardingsphere-sample/shardingsphere-example-generator/src/main/resources/data-model/data-model.yaml
@@ -15,11 +15,20 @@
# limitations under the License.
#
+# support: jdbc、proxy
product: jdbc
+
+# support: memory、cluster-zooKeeper、cluster-etcd、standalone-file
mode: memory
+
+# support: local
transaction: local
-features: sharding,readwrite-splitting,encrypt
-frameworks: jdbc,spring-boot-starter-jdbc
+
+# support: sharding、readwrite-splitting、encrypt、db-discovery
+features: sharding,readwrite-splitting,encrypt,shadow,db-discovery
+
+#
support：jdbc、spring-boot-starter-jdbc、spring-boot-starter-jpa、spring-boot-starter-mybatis、spring-namespace-jpa、spring-namespace-mybatis
+frameworks:
jdbc,spring-boot-starter-jdbc,spring-boot-starter-jpa,spring-boot-starter-mybatis,spring-namespace-jpa,spring-namespace-mybatis
host: localhost
port: 3306
diff --git
a/examples/shardingsphere-sample/shardingsphere-example-generator/src/main/resources/template/jdbc/pom.ftl
b/examples/shardingsphere-sample/shardingsphere-example-generator/src/main/resources/template/jdbc/pom.ftl
index 9f88fcd..f16674c 100644
---
a/examples/shardingsphere-sample/shardingsphere-example-generator/src/main/resources/template/jdbc/pom.ftl
+++
b/examples/shardingsphere-sample/shardingsphere-example-generator/src/main/resources/template/jdbc/pom.ftl
@@ -20,55 +20,58 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.shardingsphere.example</groupId>
- <artifactId>shardingsphere-example</artifactId>
- <version>5.1.1-SNAPSHOT</version>
- </parent>
+
+ <groupId>org.apache.shardingsphere.example</groupId>
<artifactId>${feature?replace(',',
'-')}--${framework}--${mode}--${transaction}</artifactId>
<name>${r'${project.artifactId}'}</name>
+ <version>${shardingsphereVersion}</version>
<dependencies>
<#if framework=="jdbc">
<dependency>
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-jdbc-core</artifactId>
- <version>5.1.1-SNAPSHOT</version>
+ <version>${r'${project.version}'}</version>
</dependency>
</#if>
<#if framework?contains("spring-namespace")>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-jdbc-core-spring-namespace</artifactId>
- <version>5.1.1-SNAPSHOT</version>
+ <version>${r'${project.version}'}</version>
</dependency>
<#elseif framework?contains("spring-boot-starter")>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-jdbc-core-spring-boot-starter</artifactId>
- <version>5.1.1-SNAPSHOT</version>
+ <version>${r'${project.version}'}</version>
</dependency>
</#if>
<#if framework?contains("jpa")>
<dependency>
<groupId>org.hibernate.javax.persistence</groupId>
<artifactId>hibernate-jpa-2.1-api</artifactId>
+ <version>1.0.0.Final</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
+ <version>5.4.24.Final</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
+ <version>5.4.24.Final</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
+ <version>5.2.15.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
+ <version>5.2.15.RELEASE</version>
</dependency>
<#elseif framework=="spring-boot-starter-jdbc">
<dependency>
@@ -85,28 +88,34 @@
<dependency>
<groupId>org.mybatis.spring.boot</groupId>
<artifactId>mybatis-spring-boot-starter</artifactId>
+ <version>2.1.3</version>
</dependency>
<#elseif framework=="spring-namespace-jdbc">
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
+ <version>5.2.15.RELEASE</version>
</dependency>
<#elseif framework=="spring-namespace-mybatis">
<dependency>
<groupId>org.mybatis</groupId>
<artifactId>mybatis</artifactId>
+ <version>3.5.9</version>
</dependency>
<dependency>
<groupId>org.mybatis</groupId>
<artifactId>mybatis-spring</artifactId>
+ <version>2.0.5</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
+ <version>5.2.15.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
+ <version>5.2.15.RELEASE</version>
</dependency>
</#if>
</dependencies>
