Unverified Commit 14f82af8 authored by zhaojun's avatar zhaojun Committed by GitHub
Browse files

Merge pull request #113 from cherrylzhao/dev 

update sharding-orchestration-reg-etcd dependency.
parents 12a239df 52c8ee27

pom.xml

+6 −6
Original line number Diff line number Diff line
@@ -101,14 +101,14 @@ 
                <version>${sharding-sphere.version}</version>

            </dependency>

            <dependency>

                <groupId>org.apache.shardingsphere</groupId>

                <groupId>io.shardingsphere</groupId>

                <artifactId>sharding-transaction-spring</artifactId>

                <version>${project.parent.version}</version>

                <version>${sharding-sphere.spi.impl.version}</version>

            </dependency>

            <dependency>

                <groupId>org.apache.shardingsphere</groupId>

                <groupId>io.shardingsphere</groupId>

                <artifactId>sharding-transaction-spring-boot-starter</artifactId>

                <version>${project.parent.version}</version>

                <version>${sharding-sphere.spi.impl.version}</version>

            </dependency>

            <dependency>

                <groupId>org.apache.shardingsphere</groupId>
@@ -116,9 +116,9 @@ 
                <version>${sharding-sphere.version}</version>

            </dependency>

            <dependency>

                <groupId>org.apache.shardingsphere</groupId>

                <groupId>io.shardingsphere</groupId>

                <artifactId>sharding-orchestration-reg-etcd</artifactId>

                <version>${sharding-sphere.version}</version>

                <version>${sharding-sphere.spi.impl.version}</version>

            </dependency>

    

            <dependency>

sharding-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/pom.xml

+2 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
            <artifactId>sharding-orchestration-reg-zookeeper-curator</artifactId>

        </dependency>

        <!--<dependency>-->

        <!--<groupId>org.apache.shardingsphere</groupId>-->

            <!--<groupId>io.shardingsphere</groupId>-->

            <!--<artifactId>sharding-orchestration-reg-etcd</artifactId>-->

        <!--</dependency>-->

    </dependencies>

sharding-jdbc-example/orchestration-example/orchestration-spring-boot-example/pom.xml

+4 −0
Original line number Diff line number Diff line
@@ -24,6 +24,10 @@ 
            <groupId>org.apache.shardingsphere</groupId>

            <artifactId>sharding-orchestration-reg-zookeeper-curator</artifactId>

        </dependency>

        <!--<dependency>-->

            <!--<groupId>io.shardingsphere</groupId>-->

            <!--<artifactId>sharding-orchestration-reg-etcd</artifactId>-->

        <!--</dependency>-->

        <dependency>

            <groupId>org.springframework.boot</groupId>

            <artifactId>spring-boot-starter-data-jpa</artifactId>

sharding-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application.properties

+3 −3
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ spring.jpa.properties.hibernate.hbm2ddl.auto=create-drop 
spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5Dialect

spring.jpa.properties.hibernate.show_sql=false



#spring.profiles.active=local-zookeeper-sharding-databases-tables

spring.profiles.active=local-zookeeper-master-slave

spring.profiles.active=local-zookeeper-sharding-databases-tables

#spring.profiles.active=local-zookeeper-master-slave



#spring.profiles.active=local-etcd-sharding-databases-tables

#spring.profiles.active=local-etcd-master-slave

sharding-jdbc-example/orchestration-example/orchestration-spring-namespace-example/pom.xml

+4 −0
Original line number Diff line number Diff line
@@ -33,6 +33,10 @@ 
            <groupId>org.apache.shardingsphere</groupId>

            <artifactId>sharding-orchestration-reg-zookeeper-curator</artifactId>

        </dependency>

        <!--<dependency>-->

            <!--<groupId>io.shardingsphere</groupId>-->

            <!--<artifactId>sharding-orchestration-reg-etcd</artifactId>-->

        <!--</dependency>-->



        <dependency>

            <groupId>org.aspectj</groupId>