diff --git a/.mvn/maven.config b/.mvn/maven.config new file mode 100644 index 0000000..6cc0b5c --- /dev/null +++ b/.mvn/maven.config @@ -0,0 +1 @@ +-Drevision=2.0.0-SNAPSHOT \ No newline at end of file diff --git a/kbase-stack-base/pom.xml b/kbase-stack-base/pom.xml index 82ff56b..9cbc72f 100644 --- a/kbase-stack-base/pom.xml +++ b/kbase-stack-base/pom.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> kbase-heap - com.eastrobot - 0.0.1-SNAPSHOT + com.ibothub.heap + ${revision} 4.0.0 diff --git a/kbase-stack-base/src/main/java/com/ibothub/heap/base/exception/GlobalExceptionHandler.java b/kbase-stack-base/src/main/java/com/ibothub/heap/base/exception/GlobalExceptionHandler.java index 07f6c20..83bf6a0 100644 --- a/kbase-stack-base/src/main/java/com/ibothub/heap/base/exception/GlobalExceptionHandler.java +++ b/kbase-stack-base/src/main/java/com/ibothub/heap/base/exception/GlobalExceptionHandler.java @@ -11,8 +11,8 @@ import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.RestControllerAdvice; -import javax.servlet.http.HttpServletRequest; -import javax.validation.ValidationException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.ValidationException; /** * 全局异常捕获 diff --git a/kbase-stack-base/src/main/java/com/ibothub/heap/base/exception/NotFoundException.java b/kbase-stack-base/src/main/java/com/ibothub/heap/base/exception/NotFoundException.java index d354db6..68d919b 100644 --- a/kbase-stack-base/src/main/java/com/ibothub/heap/base/exception/NotFoundException.java +++ b/kbase-stack-base/src/main/java/com/ibothub/heap/base/exception/NotFoundException.java @@ -11,7 +11,7 @@ */ @RestController public class NotFoundException implements ErrorController { - @Override + public String getErrorPath() { return "/error"; } diff --git a/kbase-stack-database/kbase-stack-derby/pom.xml b/kbase-stack-database/kbase-stack-derby/pom.xml index 58255a9..25b2ec6 100644 --- a/kbase-stack-database/kbase-stack-derby/pom.xml +++ b/kbase-stack-database/kbase-stack-derby/pom.xml @@ -3,14 +3,20 @@ 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"> - kbase-heap - com.eastrobot - 0.0.1-SNAPSHOT + kbase-stack-database + com.ibothub.heap + ${revision} 4.0.0 kbase-stack-derby + + 21 + 21 + UTF-8 + + diff --git a/kbase-stack-database/kbase-stack-derby/src/test/java/com/eastrobot/heap/derby/DerbyUtilsTests.java b/kbase-stack-database/kbase-stack-derby/src/test/java/com/eastrobot/heap/derby/DerbyUtilsTests.java index d7d5f6c..ce58894 100644 --- a/kbase-stack-database/kbase-stack-derby/src/test/java/com/eastrobot/heap/derby/DerbyUtilsTests.java +++ b/kbase-stack-database/kbase-stack-derby/src/test/java/com/eastrobot/heap/derby/DerbyUtilsTests.java @@ -11,7 +11,7 @@ import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.test.context.junit4.SpringRunner; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.io.PrintWriter; import java.net.InetAddress; import java.sql.SQLException; diff --git a/kbase-stack-database/kbase-stack-flyway/pom.xml b/kbase-stack-database/kbase-stack-flyway/pom.xml index 607d8b0..3405a11 100644 --- a/kbase-stack-database/kbase-stack-flyway/pom.xml +++ b/kbase-stack-database/kbase-stack-flyway/pom.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> kbase-stack-database - com.eastrobot - 0.0.1-SNAPSHOT + com.ibothub.heap + ${revision} 4.0.0 @@ -18,7 +18,7 @@ - com.eastrobot + com.ibothub.heap kbase-stack-base ${project.version} @@ -29,8 +29,8 @@ - mysql - mysql-connector-java + com.mysql + mysql-connector-j diff --git a/kbase-stack-database/kbase-stack-sqlite/pom.xml b/kbase-stack-database/kbase-stack-sqlite/pom.xml index 35afc5f..621c913 100644 --- a/kbase-stack-database/kbase-stack-sqlite/pom.xml +++ b/kbase-stack-database/kbase-stack-sqlite/pom.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> kbase-stack-database - com.eastrobot - 0.0.1-SNAPSHOT + com.ibothub.heap + ${revision} 4.0.0 diff --git a/kbase-stack-database/kbase-stack-sqlite/src/test/java/com/ibothub/heap/sqlite/service/ProductServiceTests.java b/kbase-stack-database/kbase-stack-sqlite/src/test/java/com/ibothub/heap/sqlite/service/ProductServiceTests.java index cc9118f..eea3192 100644 --- a/kbase-stack-database/kbase-stack-sqlite/src/test/java/com/ibothub/heap/sqlite/service/ProductServiceTests.java +++ b/kbase-stack-database/kbase-stack-sqlite/src/test/java/com/ibothub/heap/sqlite/service/ProductServiceTests.java @@ -5,7 +5,7 @@ import com.ibothub.heap.sqlite.dao.ProductRepository; import com.ibothub.heap.sqlite.listener.ProductListener; import com.ibothub.heap.sqlite.model.entity.Product; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/kbase-stack-database/pom.xml b/kbase-stack-database/pom.xml index 992d473..85c2699 100644 --- a/kbase-stack-database/pom.xml +++ b/kbase-stack-database/pom.xml @@ -4,10 +4,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> kbase-heap - com.eastrobot - 0.0.1-SNAPSHOT + com.ibothub.heap + ${revision} 4.0.0 + ${revision} pom diff --git a/kbase-stack-elastic/pom.xml b/kbase-stack-elastic/pom.xml index fcc834a..9d03d7b 100644 --- a/kbase-stack-elastic/pom.xml +++ b/kbase-stack-elastic/pom.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> kbase-heap - com.eastrobot - 0.0.1-SNAPSHOT + com.ibothub.heap + ${revision} 4.0.0 diff --git a/kbase-stack-elastic/src/main/java/com/eastrobot/heap/elastic/config/ElasticConfig.java b/kbase-stack-elastic/src/main/java/com/eastrobot/heap/elastic/config/ElasticConfig.java index d768b00..8e5c0d2 100644 --- a/kbase-stack-elastic/src/main/java/com/eastrobot/heap/elastic/config/ElasticConfig.java +++ b/kbase-stack-elastic/src/main/java/com/eastrobot/heap/elastic/config/ElasticConfig.java @@ -3,6 +3,10 @@ */ package com.eastrobot.heap.elastic.config; +import java.security.KeyManagementException; +import java.security.KeyStoreException; +import java.security.NoSuchAlgorithmException; +import javax.net.ssl.SSLContext; import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.apache.http.HttpHost; @@ -15,21 +19,12 @@ import org.apache.http.ssl.SSLContextBuilder; import org.apache.http.ssl.SSLContexts; import org.elasticsearch.client.RestClient; -import org.elasticsearch.client.RestClientBuilder; -import org.elasticsearch.client.RestHighLevelClient; -import org.springframework.boot.autoconfigure.data.elasticsearch.ReactiveElasticsearchRestClientProperties; +import org.elasticsearch.client.RestClientBuilder.HttpClientConfigCallback; +import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.context.ApplicationContext; +import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.data.elasticsearch.config.AbstractElasticsearchConfiguration; -import org.springframework.util.StringUtils; - -import javax.annotation.Resource; -import javax.net.ssl.SSLContext; -import java.security.KeyManagementException; -import java.security.KeyStoreException; -import java.security.NoSuchAlgorithmException; /** * @author eko.zhan @@ -39,9 +34,9 @@ @Data @Configuration @ConfigurationProperties(prefix = "spring.data.elasticsearch.client.reactive") -@EnableConfigurationProperties(ReactiveElasticsearchRestClientProperties.class) +@EnableConfigurationProperties @Slf4j -public class ElasticConfig extends AbstractElasticsearchConfiguration { +public class ElasticConfig { /** * https or http @@ -51,45 +46,27 @@ public class ElasticConfig extends AbstractElasticsearchConfiguration { private int maxConnTotal = 128; private int maxRetryTimeout = 60000; - @Resource - ReactiveElasticsearchRestClientProperties properties; + @Value("${spring.data.elasticsearch.client.reactive.username}") + private String username; + @Value("${spring.data.elasticsearch.client.reactive.password}") + private String password; - @SuppressWarnings("NullableProblems") - @Override - public RestHighLevelClient elasticsearchClient() { - RestClientBuilder builder = RestClient.builder(properties.getEndpoints() - .stream() - .map(endpoint -> HTTPS + "://" + endpoint) - .map(HttpHost::create) - .toArray(HttpHost[]::new)); + @Bean + public RestClient restClient() { + final CredentialsProvider credentialsProvider = new BasicCredentialsProvider(); + credentialsProvider.setCredentials(AuthScope.ANY, new UsernamePasswordCredentials(username, password)); - // elastic http 连接池设置 - builder.setHttpClientConfigCallback(httpClientBuilder -> { - setSSLContext(httpClientBuilder); - setCredentialsProvider(httpClientBuilder, properties); - return httpClientBuilder.setMaxConnPerRoute(maxConnPerRoute).setMaxConnTotal(maxConnTotal); - }) - .setRequestConfigCallback(requestConfigBuilder -> requestConfigBuilder.setConnectTimeout((int)properties.getConnectionTimeout().toMillis()) - .setSocketTimeout((int)properties.getSocketTimeout().toMillis())); + HttpHost host = new HttpHost("localhost", 9200); - return new RestHighLevelClient(builder); - } + return RestClient.builder(host) + .setHttpClientConfigCallback(new HttpClientConfigCallback() { - /** - * 设置 elastic basic 登录验证 - * @param builder - * @param properties - */ - private void setCredentialsProvider(HttpAsyncClientBuilder builder, ReactiveElasticsearchRestClientProperties properties) { - if (StringUtils.isEmpty(properties.getUsername()) || StringUtils.isEmpty(properties.getPassword())) { - log.warn("elastic 没有 用户名({})或者密码({})", properties.getUsername(), properties.getPassword()); - } else { - // 配置 用户名密码认证 - CredentialsProvider provider = new BasicCredentialsProvider(); - UsernamePasswordCredentials credentials = new UsernamePasswordCredentials(properties.getUsername(), properties.getPassword()); - provider.setCredentials(AuthScope.ANY, credentials); - builder.setDefaultCredentialsProvider(provider); - } + @Override + public HttpAsyncClientBuilder customizeHttpClient(HttpAsyncClientBuilder httpClientBuilder) { + httpClientBuilder.disableAuthCaching(); + return httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider); + } + }).build(); } /** diff --git a/kbase-stack-elastic/src/main/java/com/eastrobot/heap/elastic/entity/Notice.java b/kbase-stack-elastic/src/main/java/com/eastrobot/heap/elastic/entity/Notice.java index c6f6df4..e91a3eb 100644 --- a/kbase-stack-elastic/src/main/java/com/eastrobot/heap/elastic/entity/Notice.java +++ b/kbase-stack-elastic/src/main/java/com/eastrobot/heap/elastic/entity/Notice.java @@ -21,7 +21,7 @@ @Setter @Builder @Accessors(chain = true) -@Document(indexName="notice", type="_doc") +@Document(indexName="notice") @ToString @AllArgsConstructor @NoArgsConstructor diff --git a/kbase-stack-elastic/src/test/java/com/eastrobot/heap/elastic/client/DocBatchTests.java b/kbase-stack-elastic/src/test/java/com/eastrobot/heap/elastic/client/DocBatchTests.java index c45fd66..813435a 100644 --- a/kbase-stack-elastic/src/test/java/com/eastrobot/heap/elastic/client/DocBatchTests.java +++ b/kbase-stack-elastic/src/test/java/com/eastrobot/heap/elastic/client/DocBatchTests.java @@ -17,7 +17,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.io.IOException; /** diff --git a/kbase-stack-elastic/src/test/java/com/eastrobot/heap/elastic/client/DocQueryTests.java b/kbase-stack-elastic/src/test/java/com/eastrobot/heap/elastic/client/DocQueryTests.java index b613025..2f40076 100644 --- a/kbase-stack-elastic/src/test/java/com/eastrobot/heap/elastic/client/DocQueryTests.java +++ b/kbase-stack-elastic/src/test/java/com/eastrobot/heap/elastic/client/DocQueryTests.java @@ -19,7 +19,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.io.IOException; /** diff --git a/kbase-stack-elastic/src/test/java/com/eastrobot/heap/elastic/client/DocTests.java b/kbase-stack-elastic/src/test/java/com/eastrobot/heap/elastic/client/DocTests.java index 3798424..ed76887 100644 --- a/kbase-stack-elastic/src/test/java/com/eastrobot/heap/elastic/client/DocTests.java +++ b/kbase-stack-elastic/src/test/java/com/eastrobot/heap/elastic/client/DocTests.java @@ -24,7 +24,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.io.IOException; /** diff --git a/kbase-stack-elastic/src/test/java/com/eastrobot/heap/elastic/client/IndexTests.java b/kbase-stack-elastic/src/test/java/com/eastrobot/heap/elastic/client/IndexTests.java index fca1641..274c81b 100644 --- a/kbase-stack-elastic/src/test/java/com/eastrobot/heap/elastic/client/IndexTests.java +++ b/kbase-stack-elastic/src/test/java/com/eastrobot/heap/elastic/client/IndexTests.java @@ -13,7 +13,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.io.IOException; import java.util.Arrays; diff --git a/kbase-stack-elastic/src/test/java/com/eastrobot/heap/elastic/dao/NoticeRepositoryTests.java b/kbase-stack-elastic/src/test/java/com/eastrobot/heap/elastic/dao/NoticeRepositoryTests.java index d52805d..649a318 100644 --- a/kbase-stack-elastic/src/test/java/com/eastrobot/heap/elastic/dao/NoticeRepositoryTests.java +++ b/kbase-stack-elastic/src/test/java/com/eastrobot/heap/elastic/dao/NoticeRepositoryTests.java @@ -25,7 +25,7 @@ import org.springframework.test.context.junit4.SpringRunner; import org.springframework.util.ResourceUtils; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.io.File; import java.io.IOException; import java.nio.charset.StandardCharsets; diff --git a/kbase-stack-elastic/src/test/java/com/eastrobot/heap/elastic/service/IndexServiceTests.java b/kbase-stack-elastic/src/test/java/com/eastrobot/heap/elastic/service/IndexServiceTests.java index 19f8bf0..3f1fd57 100644 --- a/kbase-stack-elastic/src/test/java/com/eastrobot/heap/elastic/service/IndexServiceTests.java +++ b/kbase-stack-elastic/src/test/java/com/eastrobot/heap/elastic/service/IndexServiceTests.java @@ -25,7 +25,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.io.IOException; import java.util.Calendar; import java.util.logging.Level; diff --git a/kbase-stack-flowable/kbase-stack-flowable-alpha/pom.xml b/kbase-stack-flowable/kbase-stack-flowable-alpha/pom.xml index 5044062..e8e7c33 100644 --- a/kbase-stack-flowable/kbase-stack-flowable-alpha/pom.xml +++ b/kbase-stack-flowable/kbase-stack-flowable-alpha/pom.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> kbase-stack-flowable - com.eastrobot - 0.0.1-SNAPSHOT + com.ibothub.heap + ${revision} 4.0.0 @@ -14,7 +14,7 @@ - com.eastrobot + com.ibothub.heap kbase-stack-flowable-base ${project.version} diff --git a/kbase-stack-flowable/kbase-stack-flowable-alpha/src/main/java/com/ibothub/heap/flowable/web/controller/ExpenseController.java b/kbase-stack-flowable/kbase-stack-flowable-alpha/src/main/java/com/ibothub/heap/flowable/web/controller/ExpenseController.java index 4d22d60..f0ec7e3 100644 --- a/kbase-stack-flowable/kbase-stack-flowable-alpha/src/main/java/com/ibothub/heap/flowable/web/controller/ExpenseController.java +++ b/kbase-stack-flowable/kbase-stack-flowable-alpha/src/main/java/com/ibothub/heap/flowable/web/controller/ExpenseController.java @@ -26,7 +26,7 @@ import org.flowable.task.api.Task; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/kbase-stack-flowable/kbase-stack-flowable-alpha/src/test/java/com/ibothub/heap/flowable/service/ProcessDefinitionServiceTests.java b/kbase-stack-flowable/kbase-stack-flowable-alpha/src/test/java/com/ibothub/heap/flowable/service/ProcessDefinitionServiceTests.java index 5075185..37486eb 100644 --- a/kbase-stack-flowable/kbase-stack-flowable-alpha/src/test/java/com/ibothub/heap/flowable/service/ProcessDefinitionServiceTests.java +++ b/kbase-stack-flowable/kbase-stack-flowable-alpha/src/test/java/com/ibothub/heap/flowable/service/ProcessDefinitionServiceTests.java @@ -9,7 +9,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.List; /** diff --git a/kbase-stack-flowable/kbase-stack-flowable-alpha/src/test/java/com/ibothub/heap/flowable/service/RepositoryServiceTests.java b/kbase-stack-flowable/kbase-stack-flowable-alpha/src/test/java/com/ibothub/heap/flowable/service/RepositoryServiceTests.java index 6961f72..a8da83d 100644 --- a/kbase-stack-flowable/kbase-stack-flowable-alpha/src/test/java/com/ibothub/heap/flowable/service/RepositoryServiceTests.java +++ b/kbase-stack-flowable/kbase-stack-flowable-alpha/src/test/java/com/ibothub/heap/flowable/service/RepositoryServiceTests.java @@ -10,7 +10,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; -import javax.annotation.Resource; +import jakarta.annotation.Resource; /** * @author eko.zhan diff --git a/kbase-stack-flowable/kbase-stack-flowable-alpha/src/test/java/com/ibothub/heap/flowable/service/TaskServiceTests.java b/kbase-stack-flowable/kbase-stack-flowable-alpha/src/test/java/com/ibothub/heap/flowable/service/TaskServiceTests.java index 932d134..07960c7 100644 --- a/kbase-stack-flowable/kbase-stack-flowable-alpha/src/test/java/com/ibothub/heap/flowable/service/TaskServiceTests.java +++ b/kbase-stack-flowable/kbase-stack-flowable-alpha/src/test/java/com/ibothub/heap/flowable/service/TaskServiceTests.java @@ -10,7 +10,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; -import javax.annotation.Resource; +import jakarta.annotation.Resource; /** * @author eko.zhan diff --git a/kbase-stack-flowable/kbase-stack-flowable-base/pom.xml b/kbase-stack-flowable/kbase-stack-flowable-base/pom.xml index 5d080c6..98203d1 100644 --- a/kbase-stack-flowable/kbase-stack-flowable-base/pom.xml +++ b/kbase-stack-flowable/kbase-stack-flowable-base/pom.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> kbase-stack-flowable - com.eastrobot - 0.0.1-SNAPSHOT + com.ibothub.heap + ${revision} 4.0.0 @@ -13,11 +13,41 @@ - com.eastrobot + com.ibothub.heap kbase-stack-base ${project.version} + + + + org.apache.maven.plugins + maven-compiler-plugin + + 21 + 21 + + + + org.projectlombok + lombok + ${lombok.version} + + + org.mapstruct + mapstruct-processor + ${org.mapstruct.version} + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + \ No newline at end of file diff --git a/kbase-stack-flowable/kbase-stack-flowable-base/src/main/java/com/ibothub/heap/flowable/service/HistoricProcessInstanceQualifier.java b/kbase-stack-flowable/kbase-stack-flowable-base/src/main/java/com/ibothub/heap/flowable/service/HistoricProcessInstanceQualifier.java index e1f1ea4..c8220dc 100644 --- a/kbase-stack-flowable/kbase-stack-flowable-base/src/main/java/com/ibothub/heap/flowable/service/HistoricProcessInstanceQualifier.java +++ b/kbase-stack-flowable/kbase-stack-flowable-base/src/main/java/com/ibothub/heap/flowable/service/HistoricProcessInstanceQualifier.java @@ -5,7 +5,7 @@ import org.mapstruct.Named; import org.springframework.stereotype.Component; -import javax.annotation.Resource; +import jakarta.annotation.Resource; /** * @author eko.zhan diff --git a/kbase-stack-flowable/kbase-stack-flowable-base/src/main/java/com/ibothub/heap/flowable/service/impl/BeanConverterContextImpl.java b/kbase-stack-flowable/kbase-stack-flowable-base/src/main/java/com/ibothub/heap/flowable/service/impl/BeanConverterContextImpl.java index 86fd7b8..267ecce 100644 --- a/kbase-stack-flowable/kbase-stack-flowable-base/src/main/java/com/ibothub/heap/flowable/service/impl/BeanConverterContextImpl.java +++ b/kbase-stack-flowable/kbase-stack-flowable-base/src/main/java/com/ibothub/heap/flowable/service/impl/BeanConverterContextImpl.java @@ -7,7 +7,7 @@ import org.flowable.engine.history.HistoricProcessInstance; import org.springframework.stereotype.Component; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.List; /** diff --git a/kbase-stack-flowable/kbase-stack-flowable-ui/pom.xml b/kbase-stack-flowable/kbase-stack-flowable-ui/pom.xml index 431a250..17398c6 100644 --- a/kbase-stack-flowable/kbase-stack-flowable-ui/pom.xml +++ b/kbase-stack-flowable/kbase-stack-flowable-ui/pom.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> kbase-stack-flowable - com.eastrobot - 0.0.1-SNAPSHOT + com.ibothub.heap + ${revision} 4.0.0 @@ -24,7 +24,7 @@ - com.eastrobot + com.ibothub.heap kbase-stack-flowable-base ${project.version} diff --git a/kbase-stack-flowable/kbase-stack-flowable-ui/src/main/java/com/ibothub/heap/flowable/web/controller/FlowableController.java b/kbase-stack-flowable/kbase-stack-flowable-ui/src/main/java/com/ibothub/heap/flowable/web/controller/FlowableController.java index c65279e..1278471 100644 --- a/kbase-stack-flowable/kbase-stack-flowable-ui/src/main/java/com/ibothub/heap/flowable/web/controller/FlowableController.java +++ b/kbase-stack-flowable/kbase-stack-flowable-ui/src/main/java/com/ibothub/heap/flowable/web/controller/FlowableController.java @@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/kbase-stack-flowable/kbase-stack-flowable-ui/src/test/java/com/ibothub/heap/flowable/service/ModelServiceTests.java b/kbase-stack-flowable/kbase-stack-flowable-ui/src/test/java/com/ibothub/heap/flowable/service/ModelServiceTests.java index ffedb73..81b5dfb 100644 --- a/kbase-stack-flowable/kbase-stack-flowable-ui/src/test/java/com/ibothub/heap/flowable/service/ModelServiceTests.java +++ b/kbase-stack-flowable/kbase-stack-flowable-ui/src/test/java/com/ibothub/heap/flowable/service/ModelServiceTests.java @@ -14,7 +14,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.List; diff --git a/kbase-stack-flowable/kbase-stack-flowable-ui/src/test/java/com/ibothub/heap/flowable/service/TaskServiceTests.java b/kbase-stack-flowable/kbase-stack-flowable-ui/src/test/java/com/ibothub/heap/flowable/service/TaskServiceTests.java index 91ef8ff..644fe9b 100644 --- a/kbase-stack-flowable/kbase-stack-flowable-ui/src/test/java/com/ibothub/heap/flowable/service/TaskServiceTests.java +++ b/kbase-stack-flowable/kbase-stack-flowable-ui/src/test/java/com/ibothub/heap/flowable/service/TaskServiceTests.java @@ -22,7 +22,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.io.*; import java.util.List; import java.util.Map; diff --git a/kbase-stack-flowable/pom.xml b/kbase-stack-flowable/pom.xml index f7bacf2..f81ee73 100644 --- a/kbase-stack-flowable/pom.xml +++ b/kbase-stack-flowable/pom.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> kbase-heap - com.eastrobot - 0.0.1-SNAPSHOT + com.ibothub.heap + ${revision} pom @@ -35,8 +35,8 @@ - mysql - mysql-connector-java + com.mysql + mysql-connector-j diff --git a/kbase-stack-jvm/pom.xml b/kbase-stack-jvm/pom.xml index 423ac88..859028c 100644 --- a/kbase-stack-jvm/pom.xml +++ b/kbase-stack-jvm/pom.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> kbase-heap - com.eastrobot - 0.0.1-SNAPSHOT + com.ibothub.heap + ${revision} 4.0.0 diff --git a/kbase-stack-kafka/kbase-stack-kafka-alpha/pom.xml b/kbase-stack-kafka/kbase-stack-kafka-alpha/pom.xml index bc6ccc2..a5c8bd7 100644 --- a/kbase-stack-kafka/kbase-stack-kafka-alpha/pom.xml +++ b/kbase-stack-kafka/kbase-stack-kafka-alpha/pom.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> kbase-stack-kafka - com.eastrobot - 0.0.1-SNAPSHOT + com.ibothub.heap + ${revision} 4.0.0 diff --git a/kbase-stack-kafka/kbase-stack-kafka-alpha/src/main/java/com/ibothub/heap/kafka/pipeline/producer/UserProducer.java b/kbase-stack-kafka/kbase-stack-kafka-alpha/src/main/java/com/ibothub/heap/kafka/pipeline/producer/UserProducer.java index ba7bbb8..85b0ed0 100644 --- a/kbase-stack-kafka/kbase-stack-kafka-alpha/src/main/java/com/ibothub/heap/kafka/pipeline/producer/UserProducer.java +++ b/kbase-stack-kafka/kbase-stack-kafka-alpha/src/main/java/com/ibothub/heap/kafka/pipeline/producer/UserProducer.java @@ -5,7 +5,7 @@ import org.springframework.kafka.core.KafkaTemplate; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; /** * @author eko.zhan diff --git a/kbase-stack-kafka/kbase-stack-kafka-alpha/src/test/java/com/ibothub/heap/kafka/pipeline/UserProducerTests.java b/kbase-stack-kafka/kbase-stack-kafka-alpha/src/test/java/com/ibothub/heap/kafka/pipeline/UserProducerTests.java index e100da3..5c5e9f6 100644 --- a/kbase-stack-kafka/kbase-stack-kafka-alpha/src/test/java/com/ibothub/heap/kafka/pipeline/UserProducerTests.java +++ b/kbase-stack-kafka/kbase-stack-kafka-alpha/src/test/java/com/ibothub/heap/kafka/pipeline/UserProducerTests.java @@ -7,7 +7,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; -import javax.annotation.Resource; +import jakarta.annotation.Resource; /** * @author eko.zhan diff --git a/kbase-stack-kafka/kbase-stack-kafka-beta/pom.xml b/kbase-stack-kafka/kbase-stack-kafka-beta/pom.xml index cdf0be1..18e5f24 100644 --- a/kbase-stack-kafka/kbase-stack-kafka-beta/pom.xml +++ b/kbase-stack-kafka/kbase-stack-kafka-beta/pom.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> kbase-stack-kafka - com.eastrobot - 0.0.1-SNAPSHOT + com.ibothub.heap + ${revision} 4.0.0 diff --git a/kbase-stack-kafka/pom.xml b/kbase-stack-kafka/pom.xml index a23837b..0e62337 100644 --- a/kbase-stack-kafka/pom.xml +++ b/kbase-stack-kafka/pom.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> kbase-heap - com.eastrobot - 0.0.1-SNAPSHOT + com.ibothub.heap + ${revision} 4.0.0 pom diff --git a/kbase-stack-mapstruct/pom.xml b/kbase-stack-mapstruct/pom.xml index 740ae2a..28ccd89 100644 --- a/kbase-stack-mapstruct/pom.xml +++ b/kbase-stack-mapstruct/pom.xml @@ -4,17 +4,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> kbase-heap - com.eastrobot - 0.0.1-SNAPSHOT + com.ibothub.heap + ${revision} 4.0.0 kbase-stack-mapstruct - - 1.3.0.Final - - org.springframework.boot @@ -42,21 +38,21 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.1 - 1.8 - 1.8 + 21 + 21 - - org.mapstruct - mapstruct-processor - ${org.mapstruct.version} - + org.projectlombok lombok ${lombok.version} + + org.mapstruct + mapstruct-processor + ${org.mapstruct.version} + diff --git "a/kbase-stack-mapstruct/src/main/java/com/ibotstat/heap/mapstruct/E03_\345\256\236\346\210\230/E02_\345\205\245\345\217\202\345\207\272\345\217\202/vo/req/DeptReq.java" "b/kbase-stack-mapstruct/src/main/java/com/ibotstat/heap/mapstruct/E03_\345\256\236\346\210\230/E02_\345\205\245\345\217\202\345\207\272\345\217\202/vo/req/DeptReq.java" index a34d47b..14f24f9 100644 --- "a/kbase-stack-mapstruct/src/main/java/com/ibotstat/heap/mapstruct/E03_\345\256\236\346\210\230/E02_\345\205\245\345\217\202\345\207\272\345\217\202/vo/req/DeptReq.java" +++ "b/kbase-stack-mapstruct/src/main/java/com/ibotstat/heap/mapstruct/E03_\345\256\236\346\210\230/E02_\345\205\245\345\217\202\345\207\272\345\217\202/vo/req/DeptReq.java" @@ -3,7 +3,7 @@ import com.ibotstat.heap.mapstruct.E03_实战.E01_继承.common.BaseVO; import lombok.*; -import javax.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotEmpty; /** * @author eko.zhan diff --git "a/kbase-stack-mapstruct/src/test/java/com/ibotstat/heap/mapstruct/E02_\350\277\233\351\230\266/E05_\347\234\237\347\232\204\345\276\210\345\277\253/DozerTests.java" "b/kbase-stack-mapstruct/src/test/java/com/ibotstat/heap/mapstruct/E02_\350\277\233\351\230\266/E05_\347\234\237\347\232\204\345\276\210\345\277\253/DozerTests.java" index 34c6c22..a02b60d 100644 --- "a/kbase-stack-mapstruct/src/test/java/com/ibotstat/heap/mapstruct/E02_\350\277\233\351\230\266/E05_\347\234\237\347\232\204\345\276\210\345\277\253/DozerTests.java" +++ "b/kbase-stack-mapstruct/src/test/java/com/ibotstat/heap/mapstruct/E02_\350\277\233\351\230\266/E05_\347\234\237\347\232\204\345\276\210\345\277\253/DozerTests.java" @@ -8,7 +8,7 @@ import org.springframework.test.context.junit4.SpringRunner; import org.springframework.util.StopWatch; -import javax.annotation.Resource; +import jakarta.annotation.Resource; /** * @author eko.zhan diff --git "a/kbase-stack-mapstruct/src/test/java/com/ibotstat/heap/mapstruct/E03_\345\256\236\346\210\230/E03_Boot\351\233\206\346\210\220/BootBeanMapperTests.java" "b/kbase-stack-mapstruct/src/test/java/com/ibotstat/heap/mapstruct/E03_\345\256\236\346\210\230/E03_Boot\351\233\206\346\210\220/BootBeanMapperTests.java" index a3929b5..6ae7ed4 100644 --- "a/kbase-stack-mapstruct/src/test/java/com/ibotstat/heap/mapstruct/E03_\345\256\236\346\210\230/E03_Boot\351\233\206\346\210\220/BootBeanMapperTests.java" +++ "b/kbase-stack-mapstruct/src/test/java/com/ibotstat/heap/mapstruct/E03_\345\256\236\346\210\230/E03_Boot\351\233\206\346\210\220/BootBeanMapperTests.java" @@ -12,7 +12,7 @@ import org.springframework.test.context.junit4.SpringRunner; import org.springframework.util.StopWatch; -import javax.annotation.Resource; +import jakarta.annotation.Resource; /** * @author eko.zhan diff --git "a/kbase-stack-mapstruct/src/test/java/com/ibotstat/heap/mapstruct/E03_\345\256\236\346\210\230/E03_Boot\351\233\206\346\210\220/UserBeanMapperTests.java" "b/kbase-stack-mapstruct/src/test/java/com/ibotstat/heap/mapstruct/E03_\345\256\236\346\210\230/E03_Boot\351\233\206\346\210\220/UserBeanMapperTests.java" index dd5a9ea..272127a 100644 --- "a/kbase-stack-mapstruct/src/test/java/com/ibotstat/heap/mapstruct/E03_\345\256\236\346\210\230/E03_Boot\351\233\206\346\210\220/UserBeanMapperTests.java" +++ "b/kbase-stack-mapstruct/src/test/java/com/ibotstat/heap/mapstruct/E03_\345\256\236\346\210\230/E03_Boot\351\233\206\346\210\220/UserBeanMapperTests.java" @@ -9,7 +9,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; -import javax.annotation.Resource; +import jakarta.annotation.Resource; /** * @author eko.zhan diff --git a/kbase-stack-minio/pom.xml b/kbase-stack-minio/pom.xml index 92b0f36..1c31b3d 100644 --- a/kbase-stack-minio/pom.xml +++ b/kbase-stack-minio/pom.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> kbase-heap - com.eastrobot - 0.0.1-SNAPSHOT + com.ibothub.heap + ${revision} 4.0.0 @@ -22,7 +22,7 @@ - com.eastrobot + com.ibothub.heap kbase-stack-base ${project.version} diff --git a/kbase-stack-minio/src/main/java/com/ibothub/heap/minio/config/MinioConfig.java b/kbase-stack-minio/src/main/java/com/ibothub/heap/minio/config/MinioConfig.java index 608c07e..0f2546a 100644 --- a/kbase-stack-minio/src/main/java/com/ibothub/heap/minio/config/MinioConfig.java +++ b/kbase-stack-minio/src/main/java/com/ibothub/heap/minio/config/MinioConfig.java @@ -10,7 +10,7 @@ import software.amazon.awssdk.regions.Region; import software.amazon.awssdk.services.s3.S3Client; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.net.URI; import java.net.URISyntaxException; diff --git a/kbase-stack-minio/src/main/java/com/ibothub/heap/minio/service/impl/MinioServiceImpl.java b/kbase-stack-minio/src/main/java/com/ibothub/heap/minio/service/impl/MinioServiceImpl.java index 2ffeaf7..4529181 100644 --- a/kbase-stack-minio/src/main/java/com/ibothub/heap/minio/service/impl/MinioServiceImpl.java +++ b/kbase-stack-minio/src/main/java/com/ibothub/heap/minio/service/impl/MinioServiceImpl.java @@ -16,7 +16,7 @@ import software.amazon.awssdk.services.s3.S3Client; import software.amazon.awssdk.services.s3.model.*; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.io.File; import java.io.IOException; import java.nio.charset.StandardCharsets; diff --git a/kbase-stack-minio/src/main/java/com/ibothub/heap/minio/web/controller/MinioController.java b/kbase-stack-minio/src/main/java/com/ibothub/heap/minio/web/controller/MinioController.java index a5970ac..2fd609c 100644 --- a/kbase-stack-minio/src/main/java/com/ibothub/heap/minio/web/controller/MinioController.java +++ b/kbase-stack-minio/src/main/java/com/ibothub/heap/minio/web/controller/MinioController.java @@ -8,7 +8,7 @@ import org.springframework.web.multipart.MultipartFile; import software.amazon.awssdk.services.s3.model.Bucket; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.io.IOException; import java.util.List; diff --git a/kbase-stack-minio/src/test/java/com/ibothub/heap/minio/service/MinioClientTests.java b/kbase-stack-minio/src/test/java/com/ibothub/heap/minio/service/MinioClientTests.java index 4a7cdb8..fb73bff 100644 --- a/kbase-stack-minio/src/test/java/com/ibothub/heap/minio/service/MinioClientTests.java +++ b/kbase-stack-minio/src/test/java/com/ibothub/heap/minio/service/MinioClientTests.java @@ -9,7 +9,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.io.IOException; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; diff --git a/kbase-stack-minio/src/test/java/com/ibothub/heap/minio/service/S3ClientTests.java b/kbase-stack-minio/src/test/java/com/ibothub/heap/minio/service/S3ClientTests.java index 569f680..7c88dec 100644 --- a/kbase-stack-minio/src/test/java/com/ibothub/heap/minio/service/S3ClientTests.java +++ b/kbase-stack-minio/src/test/java/com/ibothub/heap/minio/service/S3ClientTests.java @@ -9,7 +9,7 @@ import software.amazon.awssdk.services.s3.S3Client; import software.amazon.awssdk.services.s3.model.*; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.io.File; import java.io.IOException; import java.time.Instant; diff --git a/kbase-stack-mongo/pom.xml b/kbase-stack-mongo/pom.xml index 6069927..a40ae59 100644 --- a/kbase-stack-mongo/pom.xml +++ b/kbase-stack-mongo/pom.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> kbase-heap - com.eastrobot - 0.0.1-SNAPSHOT + com.ibothub.heap + ${revision} 4.0.0 diff --git a/kbase-stack-mongo/src/main/java/com/ibothub/heap/stack/mongo/config/MongoConfig.java b/kbase-stack-mongo/src/main/java/com/ibothub/heap/stack/mongo/config/MongoConfig.java index d6e128f..4b22688 100644 --- a/kbase-stack-mongo/src/main/java/com/ibothub/heap/stack/mongo/config/MongoConfig.java +++ b/kbase-stack-mongo/src/main/java/com/ibothub/heap/stack/mongo/config/MongoConfig.java @@ -6,7 +6,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.data.mongodb.core.MongoTemplate; -import javax.annotation.Resource; +import jakarta.annotation.Resource; /** * @author eko.zhan diff --git a/kbase-stack-mongo/src/main/java/com/ibothub/heap/stack/mongo/service/impl/BaiduMapServiceImpl.java b/kbase-stack-mongo/src/main/java/com/ibothub/heap/stack/mongo/service/impl/BaiduMapServiceImpl.java index b043afa..f88249d 100644 --- a/kbase-stack-mongo/src/main/java/com/ibothub/heap/stack/mongo/service/impl/BaiduMapServiceImpl.java +++ b/kbase-stack-mongo/src/main/java/com/ibothub/heap/stack/mongo/service/impl/BaiduMapServiceImpl.java @@ -13,7 +13,7 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import okhttp3.Call; import okhttp3.OkHttpClient; import okhttp3.Request; diff --git a/kbase-stack-mongo/src/main/java/com/ibothub/heap/stack/mongo/service/impl/CameraServiceImpl.java b/kbase-stack-mongo/src/main/java/com/ibothub/heap/stack/mongo/service/impl/CameraServiceImpl.java index 5a9aac4..17403f6 100644 --- a/kbase-stack-mongo/src/main/java/com/ibothub/heap/stack/mongo/service/impl/CameraServiceImpl.java +++ b/kbase-stack-mongo/src/main/java/com/ibothub/heap/stack/mongo/service/impl/CameraServiceImpl.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.Objects; import java.util.stream.Collectors; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.gavaghan.geodesy.GlobalCoordinates; import org.springframework.data.geo.Distance; import org.springframework.data.geo.GeoResult; diff --git a/kbase-stack-mongo/src/test/java/com/ibothub/heap/stack/mongo/dao/CameraRepositoryTests.java b/kbase-stack-mongo/src/test/java/com/ibothub/heap/stack/mongo/dao/CameraRepositoryTests.java index 7cd48f4..b90b906 100644 --- a/kbase-stack-mongo/src/test/java/com/ibothub/heap/stack/mongo/dao/CameraRepositoryTests.java +++ b/kbase-stack-mongo/src/test/java/com/ibothub/heap/stack/mongo/dao/CameraRepositoryTests.java @@ -2,7 +2,7 @@ import com.ibothub.heap.stack.mongo.model.entity.Camera; import com.ibothub.heap.stack.mongo.model.vo.CameraLocation; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.boot.test.context.SpringBootTest; diff --git a/kbase-stack-mongo/src/test/java/com/ibothub/heap/stack/mongo/dao/GridFsTemplateTests.java b/kbase-stack-mongo/src/test/java/com/ibothub/heap/stack/mongo/dao/GridFsTemplateTests.java index f12ab99..67ba54e 100644 --- a/kbase-stack-mongo/src/test/java/com/ibothub/heap/stack/mongo/dao/GridFsTemplateTests.java +++ b/kbase-stack-mongo/src/test/java/com/ibothub/heap/stack/mongo/dao/GridFsTemplateTests.java @@ -15,7 +15,7 @@ import org.springframework.test.context.junit4.SpringRunner; import org.springframework.util.ResourceUtils; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.io.*; import java.nio.charset.StandardCharsets; diff --git a/kbase-stack-mongo/src/test/java/com/ibothub/heap/stack/mongo/dao/UserRepositoryTests.java b/kbase-stack-mongo/src/test/java/com/ibothub/heap/stack/mongo/dao/UserRepositoryTests.java index 6510a5f..1e12c98 100644 --- a/kbase-stack-mongo/src/test/java/com/ibothub/heap/stack/mongo/dao/UserRepositoryTests.java +++ b/kbase-stack-mongo/src/test/java/com/ibothub/heap/stack/mongo/dao/UserRepositoryTests.java @@ -14,7 +14,7 @@ import org.springframework.data.mongodb.core.query.Query; import org.springframework.test.context.junit4.SpringRunner; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.time.LocalDate; import java.util.List; diff --git a/kbase-stack-mongo/src/test/java/com/ibothub/heap/stack/mongo/service/BaiduMapServiceTests.java b/kbase-stack-mongo/src/test/java/com/ibothub/heap/stack/mongo/service/BaiduMapServiceTests.java index 795d99c..3c407c5 100644 --- a/kbase-stack-mongo/src/test/java/com/ibothub/heap/stack/mongo/service/BaiduMapServiceTests.java +++ b/kbase-stack-mongo/src/test/java/com/ibothub/heap/stack/mongo/service/BaiduMapServiceTests.java @@ -4,7 +4,7 @@ import com.ibothub.heap.stack.mongo.util.PolygonUtil; import java.io.IOException; import java.util.List; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.gavaghan.geodesy.GlobalCoordinates; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/kbase-stack-mongo/src/test/java/com/ibothub/heap/stack/mongo/service/CameraServiceTests.java b/kbase-stack-mongo/src/test/java/com/ibothub/heap/stack/mongo/service/CameraServiceTests.java index 3e8909c..19577de 100644 --- a/kbase-stack-mongo/src/test/java/com/ibothub/heap/stack/mongo/service/CameraServiceTests.java +++ b/kbase-stack-mongo/src/test/java/com/ibothub/heap/stack/mongo/service/CameraServiceTests.java @@ -2,7 +2,7 @@ import com.ibothub.heap.stack.mongo.model.entity.Camera; import java.util.List; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.boot.test.context.SpringBootTest; diff --git a/kbase-stack-mq/pom.xml b/kbase-stack-mq/pom.xml index 3ab428b..f287973 100644 --- a/kbase-stack-mq/pom.xml +++ b/kbase-stack-mq/pom.xml @@ -4,13 +4,16 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> kbase-heap - com.eastrobot - 0.0.1-SNAPSHOT + com.ibothub.heap + ${revision} ../pom.xml 4.0.0 kbase-stack-mq + + 21 + diff --git "a/kbase-stack-mq/src/main/java/com/eastrobot/heap/mq/E06_Boot\351\233\206\346\210\220/config/RabbitConfig.java" "b/kbase-stack-mq/src/main/java/com/eastrobot/heap/mq/E06_Boot\351\233\206\346\210\220/config/RabbitConfig.java" index 91ce4db..eccce18 100644 --- "a/kbase-stack-mq/src/main/java/com/eastrobot/heap/mq/E06_Boot\351\233\206\346\210\220/config/RabbitConfig.java" +++ "b/kbase-stack-mq/src/main/java/com/eastrobot/heap/mq/E06_Boot\351\233\206\346\210\220/config/RabbitConfig.java" @@ -13,7 +13,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.nio.charset.StandardCharsets; /** @@ -71,7 +71,7 @@ public RabbitTemplate rabbitTemplate(){ // 若使用confirm-callback或return-callback，必须要配置publisherConfirms或publisherReturns为true // 每个rabbitTemplate只能有一个confirm-callback和return-callback，如果这里配置了，那么写生产者的时候不能再写confirm-callback和return-callback // 使用return-callback时必须设置mandatory为true，或者在配置中设置mandatory-expression的值为true - connectionFactory.setPublisherConfirms(true); +// connectionFactory.setPublisherConfirms(true); connectionFactory.setPublisherReturns(true); RabbitTemplate rabbitTemplate = new RabbitTemplate(connectionFactory); rabbitTemplate.setMandatory(true); @@ -86,7 +86,7 @@ public RabbitTemplate rabbitTemplate(){ public void confirm(CorrelationData correlationData, boolean ack, String cause) { String message = ""; if (correlationData!=null){ - message = new String(correlationData.getReturnedMessage().getBody(), StandardCharsets.UTF_8); + message = new String(correlationData.getReturned().getMessage().getBody(), StandardCharsets.UTF_8); } if(ack){ log.info("消息发送成功: correlationData({}),ack({}),cause({})", message, ack, cause); @@ -95,10 +95,10 @@ public void confirm(CorrelationData correlationData, boolean ack, String cause) } } }); - rabbitTemplate.setReturnCallback(new RabbitTemplate.ReturnCallback() { + rabbitTemplate.setReturnsCallback(new RabbitTemplate.ReturnsCallback() { @Override - public void returnedMessage(Message message, int replyCode, String replyText, String exchange, String routingKey) { - log.info("消息丢失: exchange({}),route({}),replyCode({}),replyText({}),message:{}",exchange,routingKey,replyCode,replyText,message); + public void returnedMessage(ReturnedMessage returned) { + log.info("消息丢失: {}", returned.toString()); } }); return rabbitTemplate; diff --git "a/kbase-stack-mq/src/main/java/com/eastrobot/heap/mq/E06_Boot\351\233\206\346\210\220/service/MyProducer.java" "b/kbase-stack-mq/src/main/java/com/eastrobot/heap/mq/E06_Boot\351\233\206\346\210\220/service/MyProducer.java" index dc32f93..b113634 100644 --- "a/kbase-stack-mq/src/main/java/com/eastrobot/heap/mq/E06_Boot\351\233\206\346\210\220/service/MyProducer.java" +++ "b/kbase-stack-mq/src/main/java/com/eastrobot/heap/mq/E06_Boot\351\233\206\346\210\220/service/MyProducer.java" @@ -7,7 +7,7 @@ import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; /** * @author eko.zhan diff --git "a/kbase-stack-mq/src/main/java/com/eastrobot/heap/mq/E06_Boot\351\233\206\346\210\220/web/RabbitController.java" "b/kbase-stack-mq/src/main/java/com/eastrobot/heap/mq/E06_Boot\351\233\206\346\210\220/web/RabbitController.java" index b30638d..2cffd32 100644 --- "a/kbase-stack-mq/src/main/java/com/eastrobot/heap/mq/E06_Boot\351\233\206\346\210\220/web/RabbitController.java" +++ "b/kbase-stack-mq/src/main/java/com/eastrobot/heap/mq/E06_Boot\351\233\206\346\210\220/web/RabbitController.java" @@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import javax.annotation.Resource; +import jakarta.annotation.Resource; /** * http://localhost:8080/rabbit/send diff --git a/kbase-stack-prac/pom.xml b/kbase-stack-prac/pom.xml index ecf5e46..9d756ec 100644 --- a/kbase-stack-prac/pom.xml +++ b/kbase-stack-prac/pom.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> kbase-heap - com.eastrobot - 0.0.1-SNAPSHOT + com.ibothub.heap + ${revision} 4.0.0 diff --git a/kbase-stack-proxy/pom.xml b/kbase-stack-proxy/pom.xml index f476d8b..e8472ca 100644 --- a/kbase-stack-proxy/pom.xml +++ b/kbase-stack-proxy/pom.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> kbase-heap - com.eastrobot - 0.0.1-SNAPSHOT + com.ibothub.heap + ${revision} 4.0.0 diff --git a/kbase-stack-redis/kbase-stack-redis-crud/pom.xml b/kbase-stack-redis/kbase-stack-redis-crud/pom.xml index 73965d9..8308a32 100644 --- a/kbase-stack-redis/kbase-stack-redis-crud/pom.xml +++ b/kbase-stack-redis/kbase-stack-redis-crud/pom.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> kbase-stack-redis - com.eastrobot - 0.0.1-SNAPSHOT + com.ibothub.heap + ${revision} 4.0.0 diff --git a/kbase-stack-redis/kbase-stack-redis-crud/src/main/java/com/ibothub/heap/redis/config/RedisConfig.java b/kbase-stack-redis/kbase-stack-redis-crud/src/main/java/com/ibothub/heap/redis/config/RedisConfig.java index 2bf0b3a..f537cd2 100644 --- a/kbase-stack-redis/kbase-stack-redis-crud/src/main/java/com/ibothub/heap/redis/config/RedisConfig.java +++ b/kbase-stack-redis/kbase-stack-redis-crud/src/main/java/com/ibothub/heap/redis/config/RedisConfig.java @@ -20,7 +20,7 @@ import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer; import org.springframework.data.redis.serializer.StringRedisSerializer; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.Arrays; import java.util.Objects; diff --git a/kbase-stack-redis/kbase-stack-redis-crud/src/main/java/com/ibothub/heap/redis/web/controller/UserController.java b/kbase-stack-redis/kbase-stack-redis-crud/src/main/java/com/ibothub/heap/redis/web/controller/UserController.java index a81144f..4e90f3c 100644 --- a/kbase-stack-redis/kbase-stack-redis-crud/src/main/java/com/ibothub/heap/redis/web/controller/UserController.java +++ b/kbase-stack-redis/kbase-stack-redis-crud/src/main/java/com/ibothub/heap/redis/web/controller/UserController.java @@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import javax.annotation.Resource; +import jakarta.annotation.Resource; /** * @author eko.zhan diff --git a/kbase-stack-redis/kbase-stack-redis-crud/src/test/java/com/ibothub/heap/redis/RedisApplicationTests.java b/kbase-stack-redis/kbase-stack-redis-crud/src/test/java/com/ibothub/heap/redis/RedisApplicationTests.java index e8df0d0..445ca40 100644 --- a/kbase-stack-redis/kbase-stack-redis-crud/src/test/java/com/ibothub/heap/redis/RedisApplicationTests.java +++ b/kbase-stack-redis/kbase-stack-redis-crud/src/test/java/com/ibothub/heap/redis/RedisApplicationTests.java @@ -11,7 +11,7 @@ import org.springframework.data.redis.core.ValueOperations; import org.springframework.test.context.junit4.SpringRunner; -import javax.annotation.Resource; +import jakarta.annotation.Resource; /** * @author eko.zhan diff --git a/kbase-stack-redis/kbase-stack-redis-crud/src/test/java/com/ibothub/heap/redis/RedisStringTests.java b/kbase-stack-redis/kbase-stack-redis-crud/src/test/java/com/ibothub/heap/redis/RedisStringTests.java index 0a9ba9f..29def8c 100644 --- a/kbase-stack-redis/kbase-stack-redis-crud/src/test/java/com/ibothub/heap/redis/RedisStringTests.java +++ b/kbase-stack-redis/kbase-stack-redis-crud/src/test/java/com/ibothub/heap/redis/RedisStringTests.java @@ -10,7 +10,7 @@ import org.springframework.data.redis.core.RedisTemplate; import org.springframework.test.context.junit4.SpringRunner; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.concurrent.TimeUnit; /** diff --git a/kbase-stack-redis/pom.xml b/kbase-stack-redis/pom.xml index 189bb56..e5d773d 100644 --- a/kbase-stack-redis/pom.xml +++ b/kbase-stack-redis/pom.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> kbase-heap - com.eastrobot - 0.0.1-SNAPSHOT + com.ibothub.heap + ${revision} ../pom.xml 4.0.0 diff --git a/kbase-stack-screw/pom.xml b/kbase-stack-screw/pom.xml index 94ceb6c..d8a6170 100644 --- a/kbase-stack-screw/pom.xml +++ b/kbase-stack-screw/pom.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> kbase-heap - com.eastrobot - 0.0.1-SNAPSHOT + com.ibothub.heap + ${revision} 4.0.0 @@ -18,7 +18,7 @@ - com.eastrobot + com.ibothub.heap kbase-stack-base ${project.version} @@ -30,8 +30,8 @@ - mysql - mysql-connector-java + com.mysql + mysql-connector-j diff --git a/kbase-stack-screw/src/main/java/com/ibothub/heap/screw/model/vo/req/DriverReq.java b/kbase-stack-screw/src/main/java/com/ibothub/heap/screw/model/vo/req/DriverReq.java index 3355cd0..b6e3ba7 100644 --- a/kbase-stack-screw/src/main/java/com/ibothub/heap/screw/model/vo/req/DriverReq.java +++ b/kbase-stack-screw/src/main/java/com/ibothub/heap/screw/model/vo/req/DriverReq.java @@ -3,7 +3,7 @@ import lombok.Data; import org.apache.commons.lang.StringUtils; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; /** * @author eko.zhan diff --git a/kbase-stack-screw/src/main/java/com/ibothub/heap/screw/web/controller/ScrewController.java b/kbase-stack-screw/src/main/java/com/ibothub/heap/screw/web/controller/ScrewController.java index 49d44e2..e884eea 100644 --- a/kbase-stack-screw/src/main/java/com/ibothub/heap/screw/web/controller/ScrewController.java +++ b/kbase-stack-screw/src/main/java/com/ibothub/heap/screw/web/controller/ScrewController.java @@ -11,7 +11,7 @@ import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; diff --git a/kbase-stack-shiro/kbase-stack-shiro-alpha/pom.xml b/kbase-stack-shiro/kbase-stack-shiro-alpha/pom.xml index 0fbbb65..19c72a0 100644 --- a/kbase-stack-shiro/kbase-stack-shiro-alpha/pom.xml +++ b/kbase-stack-shiro/kbase-stack-shiro-alpha/pom.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> kbase-stack-shiro - com.eastrobot - 0.0.1-SNAPSHOT + com.ibothub.heap + ${revision} 4.0.0 diff --git a/kbase-stack-shiro/kbase-stack-shiro-boot/pom.xml b/kbase-stack-shiro/kbase-stack-shiro-boot/pom.xml index 585f74f..7e65fa8 100644 --- a/kbase-stack-shiro/kbase-stack-shiro-boot/pom.xml +++ b/kbase-stack-shiro/kbase-stack-shiro-boot/pom.xml @@ -4,23 +4,23 @@ 4.0.0 kbase-stack-shiro - com.eastrobot - 0.0.1-SNAPSHOT + com.ibothub.heap + ${revision} com.ibothub.shiro kbase-stack-shiro-boot - 0.0.1-SNAPSHOT + ${revision} kbase-stack-shiro-boot Demo project for Spring Boot - 1.8 + 21 - com.eastrobot + com.ibothub.heap kbase-stack-base ${project.version} @@ -61,10 +61,12 @@ spring-boot-starter-data-redis + - mysql - mysql-connector-java + com.mysql + mysql-connector-j + com.baomidou diff --git a/kbase-stack-shiro/kbase-stack-shiro-boot/src/main/java/com/ibothub/heap/shiro/realm/KbsRealm.java b/kbase-stack-shiro/kbase-stack-shiro-boot/src/main/java/com/ibothub/heap/shiro/realm/KbsRealm.java index 3f84f02..d5401d3 100644 --- a/kbase-stack-shiro/kbase-stack-shiro-boot/src/main/java/com/ibothub/heap/shiro/realm/KbsRealm.java +++ b/kbase-stack-shiro/kbase-stack-shiro-boot/src/main/java/com/ibothub/heap/shiro/realm/KbsRealm.java @@ -15,7 +15,7 @@ import org.apache.shiro.subject.PrincipalCollection; import org.springframework.beans.factory.annotation.Value; -import javax.annotation.Resource; +import jakarta.annotation.Resource; /** * 自定义 realm，将认证/授权数据的读取方法转为数据库实现 diff --git a/kbase-stack-shiro/kbase-stack-shiro-boot/src/main/java/com/ibothub/heap/shiro/service/impl/PermServiceImpl.java b/kbase-stack-shiro/kbase-stack-shiro-boot/src/main/java/com/ibothub/heap/shiro/service/impl/PermServiceImpl.java index e2271f1..194a464 100644 --- a/kbase-stack-shiro/kbase-stack-shiro-boot/src/main/java/com/ibothub/heap/shiro/service/impl/PermServiceImpl.java +++ b/kbase-stack-shiro/kbase-stack-shiro-boot/src/main/java/com/ibothub/heap/shiro/service/impl/PermServiceImpl.java @@ -9,7 +9,7 @@ import com.ibothub.heap.shiro.service.PermService; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.List; /** diff --git a/kbase-stack-shiro/kbase-stack-shiro-boot/src/main/java/com/ibothub/heap/shiro/service/impl/RoleServiceImpl.java b/kbase-stack-shiro/kbase-stack-shiro-boot/src/main/java/com/ibothub/heap/shiro/service/impl/RoleServiceImpl.java index c376d9e..55895c6 100644 --- a/kbase-stack-shiro/kbase-stack-shiro-boot/src/main/java/com/ibothub/heap/shiro/service/impl/RoleServiceImpl.java +++ b/kbase-stack-shiro/kbase-stack-shiro-boot/src/main/java/com/ibothub/heap/shiro/service/impl/RoleServiceImpl.java @@ -11,7 +11,7 @@ import com.ibothub.heap.shiro.service.UserService; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.List; /** diff --git a/kbase-stack-shiro/kbase-stack-shiro-boot/src/main/java/com/ibothub/heap/shiro/service/impl/UserServiceImpl.java b/kbase-stack-shiro/kbase-stack-shiro-boot/src/main/java/com/ibothub/heap/shiro/service/impl/UserServiceImpl.java index ad3e38b..9cc5d16 100644 --- a/kbase-stack-shiro/kbase-stack-shiro-boot/src/main/java/com/ibothub/heap/shiro/service/impl/UserServiceImpl.java +++ b/kbase-stack-shiro/kbase-stack-shiro-boot/src/main/java/com/ibothub/heap/shiro/service/impl/UserServiceImpl.java @@ -13,7 +13,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.List; import java.util.Map; diff --git a/kbase-stack-shiro/kbase-stack-shiro-boot/src/main/java/com/ibothub/heap/shiro/web/controller/UserController.java b/kbase-stack-shiro/kbase-stack-shiro-boot/src/main/java/com/ibothub/heap/shiro/web/controller/UserController.java index 50df625..1d1ce2a 100644 --- a/kbase-stack-shiro/kbase-stack-shiro-boot/src/main/java/com/ibothub/heap/shiro/web/controller/UserController.java +++ b/kbase-stack-shiro/kbase-stack-shiro-boot/src/main/java/com/ibothub/heap/shiro/web/controller/UserController.java @@ -10,7 +10,7 @@ import org.apache.shiro.authz.annotation.RequiresRoles; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.List; /** diff --git a/kbase-stack-shiro/kbase-stack-shiro-boot/src/test/java/com/ibothub/heap/shiro/dao/UserRepositoryTests.java b/kbase-stack-shiro/kbase-stack-shiro-boot/src/test/java/com/ibothub/heap/shiro/dao/UserRepositoryTests.java index 3338c90..3352892 100644 --- a/kbase-stack-shiro/kbase-stack-shiro-boot/src/test/java/com/ibothub/heap/shiro/dao/UserRepositoryTests.java +++ b/kbase-stack-shiro/kbase-stack-shiro-boot/src/test/java/com/ibothub/heap/shiro/dao/UserRepositoryTests.java @@ -18,7 +18,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.Arrays; import java.util.List; import java.util.Map; diff --git a/kbase-stack-shiro/kbase-stack-shiro-boot/src/test/java/com/ibothub/heap/shiro/service/PermServiceTests.java b/kbase-stack-shiro/kbase-stack-shiro-boot/src/test/java/com/ibothub/heap/shiro/service/PermServiceTests.java index bb5844e..924813e 100644 --- a/kbase-stack-shiro/kbase-stack-shiro-boot/src/test/java/com/ibothub/heap/shiro/service/PermServiceTests.java +++ b/kbase-stack-shiro/kbase-stack-shiro-boot/src/test/java/com/ibothub/heap/shiro/service/PermServiceTests.java @@ -11,7 +11,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.List; /** diff --git a/kbase-stack-shiro/kbase-stack-shiro-boot/src/test/java/com/ibothub/heap/shiro/service/RoleServiceTests.java b/kbase-stack-shiro/kbase-stack-shiro-boot/src/test/java/com/ibothub/heap/shiro/service/RoleServiceTests.java index 853587b..60a06a9 100644 --- a/kbase-stack-shiro/kbase-stack-shiro-boot/src/test/java/com/ibothub/heap/shiro/service/RoleServiceTests.java +++ b/kbase-stack-shiro/kbase-stack-shiro-boot/src/test/java/com/ibothub/heap/shiro/service/RoleServiceTests.java @@ -10,7 +10,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.util.List; /** diff --git a/kbase-stack-shiro/pom.xml b/kbase-stack-shiro/pom.xml index 6b5b790..3c1492f 100644 --- a/kbase-stack-shiro/pom.xml +++ b/kbase-stack-shiro/pom.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> kbase-heap - com.eastrobot - 0.0.1-SNAPSHOT + com.ibothub.heap + ${revision} 4.0.0 pom diff --git a/kbase-stack-sse/pom.xml b/kbase-stack-sse/pom.xml index 88f89d2..e194079 100644 --- a/kbase-stack-sse/pom.xml +++ b/kbase-stack-sse/pom.xml @@ -4,9 +4,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.eastrobot + com.ibothub.heap kbase-heap - 0.0.1-SNAPSHOT + ${revision} kbase-stack-sse diff --git a/kbase-stack-thread/pom.xml b/kbase-stack-thread/pom.xml index ee2d9db..078dece 100644 --- a/kbase-stack-thread/pom.xml +++ b/kbase-stack-thread/pom.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> kbase-heap - com.eastrobot - 0.0.1-SNAPSHOT + com.ibothub.heap + ${revision} 4.0.0 diff --git a/kbase-stack-xxl/kbase-stack-xxl-alpha/pom.xml b/kbase-stack-xxl/kbase-stack-xxl-alpha/pom.xml index e1c85d6..fffe96b 100644 --- a/kbase-stack-xxl/kbase-stack-xxl-alpha/pom.xml +++ b/kbase-stack-xxl/kbase-stack-xxl-alpha/pom.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> kbase-stack-xxl - com.eastrobot - 0.0.1-SNAPSHOT + com.ibothub.heap + ${revision} 4.0.0 diff --git a/kbase-stack-xxl/pom.xml b/kbase-stack-xxl/pom.xml index 018ff65..7cc3088 100644 --- a/kbase-stack-xxl/pom.xml +++ b/kbase-stack-xxl/pom.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> kbase-heap - com.eastrobot - 0.0.1-SNAPSHOT + com.ibothub.heap + ${revision} 4.0.0 pom @@ -22,7 +22,7 @@ - com.eastrobot + com.ibothub.heap kbase-stack-base ${project.version} diff --git a/pom.xml b/pom.xml index 071cbff..7d7eaf8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,10 +1,12 @@ - + + 4.0.0 - com.eastrobot + com.ibothub.heap kbase-heap - 0.0.1-SNAPSHOT + ${revision} + kbase-stack-mq kbase-stack-proxy @@ -33,25 +35,28 @@ org.springframework.boot spring-boot-starter-parent - 2.3.10.RELEASE + 3.4.0 - 1.8 + 21 + 21 UTF-8 - 10.14.2.0 - 1.18.6 - 32.0.0-jre - 2.8.9 - 1.7.26 - 1.2.83 - 4.13.1 - 8.0.28 + 21 + 1.6.0 + 10.17.1.0 + 1.18.36 + 33.3.1-jre + 2.11.0 + 2.0.16 + 2.0.53 + 9.1.0 2.10.0 3.10 1.9.4 - 1.3.0.Final + 1.6.3 + 1.6.3 3.4.0 true @@ -59,8 +64,8 @@ - mysql - mysql-connector-java + com.mysql + mysql-connector-j ${mysql.version} @@ -178,8 +183,17 @@ org.springframework.boot spring-boot-maven-plugin + + + org.codehaus.mojo + flatten-maven-plugin + ${flatten-maven-plugin.version} + + true + resolveCiFriendliesOnly + + -