From 55dc83eba0e86055fd294671505b96080d3a3b0d Mon Sep 17 00:00:00 2001 From: "hbn.king" Date: Tue, 26 Mar 2024 11:11:46 +0800 Subject: [PATCH] remove transactionManager and release 0.9.19 --- mars-core/pom.xml | 2 +- mars-springboot/pom.xml | 2 +- .../com/whaleal/mars/config/MarsAutoConfiguration.java | 7 ++++--- mars-test/pom.xml | 2 +- mars-test/src/test/resources/application.yml | 2 +- pom.xml | 2 +- 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/mars-core/pom.xml b/mars-core/pom.xml index e898509..eb455da 100644 --- a/mars-core/pom.xml +++ b/mars-core/pom.xml @@ -5,7 +5,7 @@ mars com.whaleal.mars - 0.9.18 + 0.9.19 4.0.0 diff --git a/mars-springboot/pom.xml b/mars-springboot/pom.xml index 3d397d0..40622c0 100644 --- a/mars-springboot/pom.xml +++ b/mars-springboot/pom.xml @@ -5,7 +5,7 @@ com.whaleal.mars mars - 0.9.18 + 0.9.19 4.0.0 diff --git a/mars-springboot/src/main/java/com/whaleal/mars/config/MarsAutoConfiguration.java b/mars-springboot/src/main/java/com/whaleal/mars/config/MarsAutoConfiguration.java index 6c237a9..64c661a 100644 --- a/mars-springboot/src/main/java/com/whaleal/mars/config/MarsAutoConfiguration.java +++ b/mars-springboot/src/main/java/com/whaleal/mars/config/MarsAutoConfiguration.java @@ -34,7 +34,7 @@ import com.mongodb.client.MongoClient; import com.whaleal.mars.codecs.MongoMappingContext; import com.whaleal.mars.codecs.pojo.annotations.Entity; -import com.whaleal.mars.config.transaction.MongoTransactionManager; + import com.whaleal.mars.core.Mars; import org.springframework.beans.factory.ObjectProvider; import org.springframework.boot.autoconfigure.AutoConfigureBefore; @@ -77,10 +77,11 @@ @ConditionalOnMissingBean(Mars.class) public class MarsAutoConfiguration { - @Bean + + /* @Bean MongoTransactionManager transactionManager( Mars dbFactory) { return new MongoTransactionManager(dbFactory); - } + }*/ //生成mars对象,交给spring管理 @Bean diff --git a/mars-test/pom.xml b/mars-test/pom.xml index 2cacacd..b88f11f 100644 --- a/mars-test/pom.xml +++ b/mars-test/pom.xml @@ -5,7 +5,7 @@ com.whaleal.mars mars - 0.9.18 + 0.9.19 4.0.0 diff --git a/mars-test/src/test/resources/application.yml b/mars-test/src/test/resources/application.yml index d246663..5dc28ea 100644 --- a/mars-test/src/test/resources/application.yml +++ b/mars-test/src/test/resources/application.yml @@ -1,4 +1,4 @@ spring: data: mongodb: - uri: mongodb://localhost:6001,localhost:6002,localhost:6003/wh + uri: mongodb://localhost:6001,localhost:6002,localhost:6003/wh \ No newline at end of file diff --git a/pom.xml b/pom.xml index 1a5c30c..8f934e8 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ com.whaleal.mars mars pom - 0.9.18 + 0.9.19 Mars MongoDB ORM Framework [Mars] - Java Object Document Mapper for MongoDB