This is an automated email from the ASF dual-hosted git repository. duhengforever pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/rocketmq-schema-registry.git
commit d496c2e2c1189387bef7f405b99201bfd6b9788c Author: fan <[email protected]> AuthorDate: Thu Jul 28 17:16:33 2022 +0800 [server] modify dependency and configuration to quick start --- common/pom.xml | 5 +- core/pom.xml | 45 ++++++++++-- core/src/main/resources/application.properties | 22 +++--- pom.xml | 85 ++++++---------------- .../pom.xml | 32 +++++--- .../registry/storage/rocketmq/RocketmqClient.java | 0 .../storage/rocketmq/RocketmqStorageClient.java | 0 .../rocketmq/RocketmqStorageClientImpl.java | 0 .../storage/rocketmq/RocketmqStorageFactory.java | 0 .../storage/rocketmq/RocketmqStoragePlugin.java | 0 .../storage/rocketmq/RocketmqStorageService.java | 0 .../storage/rocketmq/RocketmqStorageUtils.java | 0 .../storage/rocketmq/configs/ClientConfig.java | 0 .../rocketmq/configs/RocketmqConfigConstants.java | 2 +- .../storage/rocketmq/configs/ServiceConfig.java | 0 .../registry/storage/rocketmq/package-info.java | 0 ...mq.schema.registry.common.storage.StoragePlugin | 0 .../src/main/resources/rocketmq.properties | 0 {storage-war => war}/pom.xml | 3 +- .../rocketmq/schema/registry/StorageWar.java | 0 20 files changed, 98 insertions(+), 96 deletions(-) diff --git a/common/pom.xml b/common/pom.xml index 51d43f1..5e8883a 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -26,11 +26,12 @@ </parent> <modelVersion>4.0.0</modelVersion> - <packaging>jar</packaging> <artifactId>common</artifactId> - <name>rocketmq-schema-registry-common ${project.version}</name> + <packaging>jar</packaging> + <name>rocketmq-schema-registry-common-${project.version}</name> <description>rocketmq-schema-registry-core</description> + <properties> <maven.compiler.source>8</maven.compiler.source> <maven.compiler.target>8</maven.compiler.target> diff --git a/core/pom.xml b/core/pom.xml index 2d2f203..0b6ae01 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -10,34 +10,42 @@ <packaging>jar</packaging> <artifactId>core</artifactId> - <name>rocketmq-schema-registry-core ${project.version}</name> + <name>rocketmq-schema-registry-core-${project.version}</name> <description>rocketmq-schema-registry-core</description> - <properties> - <java.version>1.8</java.version> - </properties> - <dependencies> <dependency> <groupId>org.apache.rocketmq</groupId> <artifactId>common</artifactId> - <version>0.0.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.rocketmq</groupId> <artifactId>schema-storage-rocketmq</artifactId> - <version>0.0.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> - </dependencies> <build> + <finalName>${project.name}</finalName> + <plugins> <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> <version>${spring-boot.version}</version> + <configuration> + <mainClass>org.apache.rocketmq.schema.registry.core.CoreApplication</mainClass> + <layout>ZIP</layout> + </configuration> + <executions> + <execution> + <goals> + <goal>repackage</goal> + </goals> + </execution> + </executions> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -48,6 +56,27 @@ </configuration> </plugin> </plugins> + + <resources> + <resource> + <directory>src/main/java</directory> + <includes> + <include>**/*.*</include> + </includes> + </resource> + <resource> + <directory>src/main/resources</directory> + <includes> + <include>**/*.*</include> + </includes> + </resource> + <resource> + <directory>../storage-rocketmq/src/main/resources</directory> + <includes> + <include>**/*.*</include> + </includes> + </resource> + </resources> </build> </project> diff --git a/core/src/main/resources/application.properties b/core/src/main/resources/application.properties index a5d7fdd..022e3dc 100644 --- a/core/src/main/resources/application.properties +++ b/core/src/main/resources/application.properties @@ -1,6 +1,6 @@ -spring.profiles.active=dev -spring.application.name=rocketmq-schema-registry +spring.profiles.active = dev +spring.application.name = rocketmq-schema-registry server.port=8080 logging.file.name = log/app.log @@ -11,19 +11,19 @@ schema.dependency.upload-enabled = false #schema.dependency.repository-url #schema.dependency.username #schema.dependency.password -schema.storage.type=rocketmq -schema.storage.config-path=schema-storage-rocketmq/src/main/resources/rocketmq.properties +schema.storage.type = rocketmq +schema.storage.config-path = storage-rocketmq/src/main/resources/rocketmq.properties -springfox.documentation.swagger-ui.enabled=true -management.health.db.enabled=true +springfox.documentation.swagger-ui.enabled = true +management.health.db.enabled = true server.error.include-stacktrace = on_param server.error.include-message = always spring.mvc.pathmatch.matching-strategy = ANT_PATH_MATCHER -spring.main.allow-bean-definition-overriding=true -management.health.elasticsearch.enabled=false -management.endpoints.enabled-by-default=true -management.endpoints.web.exposure.include= health,info -management.endpoints.web.exposure.exclude= httptrace,shutdown \ No newline at end of file +spring.main.allow-bean-definition-overriding = true +management.health.elasticsearch.enabled = false +management.endpoints.enabled-by-default = true +management.endpoints.web.exposure.include = health,info +management.endpoints.web.exposure.exclude = httptrace,shutdown \ No newline at end of file diff --git a/pom.xml b/pom.xml index 0e7d641..425de31 100644 --- a/pom.xml +++ b/pom.xml @@ -13,22 +13,32 @@ <artifactId>rocketmq-schema-registry-all</artifactId> <version>0.0.2-SNAPSHOT</version> <packaging>pom</packaging> - <name>rocketmq-schema-registry</name> + <name>rocketmq-schema-registry-${project.version}</name> <description>rocketmq-schema-registry</description> <modules> <module>common</module> <module>core</module> - <module>schema-storage-rocketmq</module> - <module>storage-war</module> + <module>storage-rocketmq</module> + <module>war</module> </modules> <properties> <java.version>1.8</java.version> + <maven.compiler.source>8</maven.compiler.source> + <maven.compiler.target>8</maven.compiler.target> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <!-- internal package versions --> <spring-boot.version>2.6.7</spring-boot.version> <spring.version>3.2.8-RELEASE</spring.version> + <aspectj.weaver.version>1.9.5</aspectj.weaver.version> + <springfox.version>3.0.0</springfox.version> + <lombok.version>1.18.24</lombok.version> + <google.annotations.version>3.0.1</google.annotations.version> + <google.guava.version>31.1-jre</google.guava.version> + <dozer.version>5.4.0</dozer.version> + <rocksdb.version>7.2.2</rocksdb.version> + <avro.version>1.11.0</avro.version> </properties> <dependencies> @@ -68,104 +78,51 @@ <dependency> <groupId>org.aspectj</groupId> <artifactId>aspectjweaver</artifactId> - <version>1.9.5</version> + <version>${aspectj.weaver.version}</version> </dependency> -<!-- <dependency>--> -<!-- <groupId>org.springframework</groupId>--> -<!-- <artifactId>spring-aspects</artifactId>--> -<!-- <version>${spring.version}</version>--> -<!-- </dependency>--> - -<!-- <dependency>--> -<!-- <groupId>org.springframework</groupId>--> -<!-- <artifactId>spring-orm</artifactId>--> -<!-- <version>${spring.version}</version>--> -<!-- </dependency>--> - -<!-- <dependency>--> -<!-- <groupId>org.springdoc</groupId>--> -<!-- <artifactId>springdoc-openapi-ui</artifactId>--> -<!-- <version>1.6.9</version>--> -<!-- </dependency>--> - <dependency> <groupId>io.springfox</groupId> <artifactId>springfox-boot-starter</artifactId> - <version>3.0.0</version> + <version>${springfox.version}</version> </dependency> <dependency> <groupId>org.projectlombok</groupId> <artifactId>lombok</artifactId> - <version>1.18.24</version> + <version>${lombok.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>com.google.code.findbugs</groupId> <artifactId>annotations</artifactId> - <version>3.0.1</version> + <version>${google.annotations.version}</version> </dependency> <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>31.1-jre</version> + <version>${google.guava.version}</version> </dependency> <dependency> <groupId>net.sf.dozer</groupId> <artifactId>dozer</artifactId> - <version>5.4.0</version> + <version>${dozer.version}</version> </dependency> <dependency> <groupId>org.rocksdb</groupId> <artifactId>rocksdbjni</artifactId> - <version>7.2.2</version> + <version>${rocksdb.version}</version> </dependency> <dependency> <groupId>org.apache.avro</groupId> <artifactId>avro</artifactId> - <version>1.11.0</version> + <version>${avro.version}</version> </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-maven-plugin</artifactId> - <version>${spring-boot.version}</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>8</source> - <target>8</target> - </configuration> - </plugin> - </plugins> - </build> - - <distributionManagement> - <repository> - <id>central</id> - <name>maven-release-virtual</name> - <url> - https://pkgs.d.xiaomi.net/artifactory/maven-release-virtual - </url> - </repository> - <snapshotRepository> - <id>snapshots</id> - <name>maven-snapshot-virtual</name> - <url> - https://pkgs.d.xiaomi.net/artifactory/maven-snapshot-virtual - </url> - </snapshotRepository> - </distributionManagement> - </project> diff --git a/schema-storage-rocketmq/pom.xml b/storage-rocketmq/pom.xml similarity index 70% rename from schema-storage-rocketmq/pom.xml rename to storage-rocketmq/pom.xml index 0b23abe..b933223 100644 --- a/schema-storage-rocketmq/pom.xml +++ b/storage-rocketmq/pom.xml @@ -26,31 +26,45 @@ </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>schema-storage-rocketmq</artifactId> + <artifactId>storage-rocketmq</artifactId> + <name>rocketmq-schema-registry-storage-rocketmq-${project.version}</name> + <packaging>jar</packaging> + + <properties> + <rocketmq.client.version>5.0.0-ALPHA</rocketmq.client.version> + </properties> + <dependencies> <dependency> <groupId>org.apache.rocketmq</groupId> <artifactId>common</artifactId> - <version>0.0.2-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.rocketmq</groupId> <artifactId>rocketmq-client</artifactId> - <version>5.0.0-ALPHA</version> + <version>${rocketmq.client.version}</version> </dependency> <dependency> <groupId>org.apache.rocketmq</groupId> <artifactId>rocketmq-tools</artifactId> - <version>5.0.0-ALPHA</version> + <version>${rocketmq.client.version}</version> </dependency> </dependencies> - <properties> - <maven.compiler.source>8</maven.compiler.source> - <maven.compiler.target>8</maven.compiler.target> - </properties> + <distributionManagement> + <repository> + <id>central</id> + <name>maven-release-virtual</name> + <url></url> + </repository> + <snapshotRepository> + <id>snapshots</id> + <name>maven-snapshot-virtual</name> + <url></url> + </snapshotRepository> + </distributionManagement> </project> \ No newline at end of file diff --git a/schema-storage-rocketmq/src/main/java/org/apache/rocketmq/schema/registry/storage/rocketmq/RocketmqClient.java b/storage-rocketmq/src/main/java/org/apache/rocketmq/schema/registry/storage/rocketmq/RocketmqClient.java similarity index 100% rename from schema-storage-rocketmq/src/main/java/org/apache/rocketmq/schema/registry/storage/rocketmq/RocketmqClient.java rename to storage-rocketmq/src/main/java/org/apache/rocketmq/schema/registry/storage/rocketmq/RocketmqClient.java diff --git a/schema-storage-rocketmq/src/main/java/org/apache/rocketmq/schema/registry/storage/rocketmq/RocketmqStorageClient.java b/storage-rocketmq/src/main/java/org/apache/rocketmq/schema/registry/storage/rocketmq/RocketmqStorageClient.java similarity index 100% rename from schema-storage-rocketmq/src/main/java/org/apache/rocketmq/schema/registry/storage/rocketmq/RocketmqStorageClient.java rename to storage-rocketmq/src/main/java/org/apache/rocketmq/schema/registry/storage/rocketmq/RocketmqStorageClient.java diff --git a/schema-storage-rocketmq/src/main/java/org/apache/rocketmq/schema/registry/storage/rocketmq/RocketmqStorageClientImpl.java b/storage-rocketmq/src/main/java/org/apache/rocketmq/schema/registry/storage/rocketmq/RocketmqStorageClientImpl.java similarity index 100% rename from schema-storage-rocketmq/src/main/java/org/apache/rocketmq/schema/registry/storage/rocketmq/RocketmqStorageClientImpl.java rename to storage-rocketmq/src/main/java/org/apache/rocketmq/schema/registry/storage/rocketmq/RocketmqStorageClientImpl.java diff --git a/schema-storage-rocketmq/src/main/java/org/apache/rocketmq/schema/registry/storage/rocketmq/RocketmqStorageFactory.java b/storage-rocketmq/src/main/java/org/apache/rocketmq/schema/registry/storage/rocketmq/RocketmqStorageFactory.java similarity index 100% rename from schema-storage-rocketmq/src/main/java/org/apache/rocketmq/schema/registry/storage/rocketmq/RocketmqStorageFactory.java rename to storage-rocketmq/src/main/java/org/apache/rocketmq/schema/registry/storage/rocketmq/RocketmqStorageFactory.java diff --git a/schema-storage-rocketmq/src/main/java/org/apache/rocketmq/schema/registry/storage/rocketmq/RocketmqStoragePlugin.java b/storage-rocketmq/src/main/java/org/apache/rocketmq/schema/registry/storage/rocketmq/RocketmqStoragePlugin.java similarity index 100% rename from schema-storage-rocketmq/src/main/java/org/apache/rocketmq/schema/registry/storage/rocketmq/RocketmqStoragePlugin.java rename to storage-rocketmq/src/main/java/org/apache/rocketmq/schema/registry/storage/rocketmq/RocketmqStoragePlugin.java diff --git a/schema-storage-rocketmq/src/main/java/org/apache/rocketmq/schema/registry/storage/rocketmq/RocketmqStorageService.java b/storage-rocketmq/src/main/java/org/apache/rocketmq/schema/registry/storage/rocketmq/RocketmqStorageService.java similarity index 100% rename from schema-storage-rocketmq/src/main/java/org/apache/rocketmq/schema/registry/storage/rocketmq/RocketmqStorageService.java rename to storage-rocketmq/src/main/java/org/apache/rocketmq/schema/registry/storage/rocketmq/RocketmqStorageService.java diff --git a/schema-storage-rocketmq/src/main/java/org/apache/rocketmq/schema/registry/storage/rocketmq/RocketmqStorageUtils.java b/storage-rocketmq/src/main/java/org/apache/rocketmq/schema/registry/storage/rocketmq/RocketmqStorageUtils.java similarity index 100% rename from schema-storage-rocketmq/src/main/java/org/apache/rocketmq/schema/registry/storage/rocketmq/RocketmqStorageUtils.java rename to storage-rocketmq/src/main/java/org/apache/rocketmq/schema/registry/storage/rocketmq/RocketmqStorageUtils.java diff --git a/schema-storage-rocketmq/src/main/java/org/apache/rocketmq/schema/registry/storage/rocketmq/configs/ClientConfig.java b/storage-rocketmq/src/main/java/org/apache/rocketmq/schema/registry/storage/rocketmq/configs/ClientConfig.java similarity index 100% rename from schema-storage-rocketmq/src/main/java/org/apache/rocketmq/schema/registry/storage/rocketmq/configs/ClientConfig.java rename to storage-rocketmq/src/main/java/org/apache/rocketmq/schema/registry/storage/rocketmq/configs/ClientConfig.java diff --git a/schema-storage-rocketmq/src/main/java/org/apache/rocketmq/schema/registry/storage/rocketmq/configs/RocketmqConfigConstants.java b/storage-rocketmq/src/main/java/org/apache/rocketmq/schema/registry/storage/rocketmq/configs/RocketmqConfigConstants.java similarity index 98% rename from schema-storage-rocketmq/src/main/java/org/apache/rocketmq/schema/registry/storage/rocketmq/configs/RocketmqConfigConstants.java rename to storage-rocketmq/src/main/java/org/apache/rocketmq/schema/registry/storage/rocketmq/configs/RocketmqConfigConstants.java index 31e6744..4ec11b2 100644 --- a/schema-storage-rocketmq/src/main/java/org/apache/rocketmq/schema/registry/storage/rocketmq/configs/RocketmqConfigConstants.java +++ b/storage-rocketmq/src/main/java/org/apache/rocketmq/schema/registry/storage/rocketmq/configs/RocketmqConfigConstants.java @@ -32,7 +32,7 @@ public class RocketmqConfigConstants { public static final String STORAGE_ROCKETMQ_CONSUMER_GROUP_DEFAULT = "default"; public static final String STORAGE_ROCKETMQ_NAMESRV = "storage.rocketmq.namesrv"; - public static final String STORAGE_ROCKETMQ_NAMESRV_DEFAULT = "localhost:9876"; + public static final String STORAGE_ROCKETMQ_NAMESRV_DEFAULT = "http://10.231.54.148:9876";; public static final String STORAGE_ROCKETMQ_TOPIC = "storage.rocketmq.topic"; public static final String STORAGE_ROCKETMQ_TOPIC_DEFAULT = "RMQ_SYS_schema_registry_storage"; diff --git a/schema-storage-rocketmq/src/main/java/org/apache/rocketmq/schema/registry/storage/rocketmq/configs/ServiceConfig.java b/storage-rocketmq/src/main/java/org/apache/rocketmq/schema/registry/storage/rocketmq/configs/ServiceConfig.java similarity index 100% rename from schema-storage-rocketmq/src/main/java/org/apache/rocketmq/schema/registry/storage/rocketmq/configs/ServiceConfig.java rename to storage-rocketmq/src/main/java/org/apache/rocketmq/schema/registry/storage/rocketmq/configs/ServiceConfig.java diff --git a/schema-storage-rocketmq/src/main/java/org/apache/rocketmq/schema/registry/storage/rocketmq/package-info.java b/storage-rocketmq/src/main/java/org/apache/rocketmq/schema/registry/storage/rocketmq/package-info.java similarity index 100% rename from schema-storage-rocketmq/src/main/java/org/apache/rocketmq/schema/registry/storage/rocketmq/package-info.java rename to storage-rocketmq/src/main/java/org/apache/rocketmq/schema/registry/storage/rocketmq/package-info.java diff --git a/schema-storage-rocketmq/src/main/resources/META-INF/services/org.apache.rocketmq.schema.registry.common.storage.StoragePlugin b/storage-rocketmq/src/main/resources/META-INF/services/org.apache.rocketmq.schema.registry.common.storage.StoragePlugin similarity index 100% rename from schema-storage-rocketmq/src/main/resources/META-INF/services/org.apache.rocketmq.schema.registry.common.storage.StoragePlugin rename to storage-rocketmq/src/main/resources/META-INF/services/org.apache.rocketmq.schema.registry.common.storage.StoragePlugin diff --git a/schema-storage-rocketmq/src/main/resources/rocketmq.properties b/storage-rocketmq/src/main/resources/rocketmq.properties similarity index 100% rename from schema-storage-rocketmq/src/main/resources/rocketmq.properties rename to storage-rocketmq/src/main/resources/rocketmq.properties diff --git a/storage-war/pom.xml b/war/pom.xml similarity index 94% rename from storage-war/pom.xml rename to war/pom.xml index d8be831..cb7b4cb 100644 --- a/storage-war/pom.xml +++ b/war/pom.xml @@ -26,7 +26,8 @@ </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>storage-war</artifactId> + <artifactId>war</artifactId> + <name>rocketmq-schema-registry-war-${project.version}</name> <properties> <maven.compiler.source>8</maven.compiler.source> diff --git a/storage-war/src/main/java/org/apache/rocketmq/schema/registry/StorageWar.java b/war/src/main/java/org/apache/rocketmq/schema/registry/StorageWar.java similarity index 100% rename from storage-war/src/main/java/org/apache/rocketmq/schema/registry/StorageWar.java rename to war/src/main/java/org/apache/rocketmq/schema/registry/StorageWar.java
