Skip to content

GitLab

Commit b52112ed authored by 徐帆's avatar 徐帆
Browse files

Merge branch 'develop' of... 

Merge branch 'develop' of ssh://open-gitlab.going-link.com:2289/operation-srm/saas-pom into dev-24168

# Conflicts:
#	srm-workflow.xml
parents 05870a2a 0d08c3f1
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing with 159 additions and 44 deletions
srm-basic-platform.xml
View file @ b52112ed
......@@ -16,6 +16,11 @@
</dependency>
<dependency>
<groupId>org.srm</groupId>
<artifactId>srm-basic-platform-uniqlo</artifactId>
<version>dev-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.srm.boot</groupId>
<artifactId>srm-boot-scanner</artifactId>
<version>dev-SNAPSHOT</version>
</dependency>
......
srm-catalogue-interface.xml
View file @ b52112ed
......@@ -10,7 +10,7 @@
<version>1.4.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.srm</groupId>
<groupId>org.srm.boot</groupId>
<artifactId>srm-boot-scanner</artifactId>
<version>dev-SNAPSHOT</version>
</dependency>
......
srm-catalogue.xml
View file @ b52112ed
......@@ -40,7 +40,7 @@
<version>1.4.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.srm</groupId>
<groupId>org.srm.boot</groupId>
<artifactId>srm-boot-scanner</artifactId>
<version>dev-SNAPSHOT</version>
</dependency>
......
srm-config.xml
View file @ b52112ed
<dependencies>
</dependencies>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?><dependencies>
<dependency>
<groupId>org.srm.boot</groupId>
<artifactId>srm-boot-scanner</artifactId>
<version>dev-SNAPSHOT</version>
</dependency>
</dependencies>
srm-file.xml
View file @ b52112ed
<dependencies>
</dependencies>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?><dependencies>
<dependency>
<groupId>org.srm.boot</groupId>
<artifactId>srm-boot-scanner</artifactId>
<version>dev-SNAPSHOT</version>
</dependency>
</dependencies>
srm-gateway.xml
View file @ b52112ed
<dependencies>
</dependencies>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?><dependencies>
</dependencies>
srm-iam.xml
View file @ b52112ed
......@@ -6,17 +6,22 @@
</dependency>
<dependency>
<groupId>org.srm</groupId>
<artifactId>srm-boot-scanner</artifactId>
<artifactId>srm-iam-xtep</artifactId>
<version>dev-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.srm</groupId>
<artifactId>srm-iam-xtep</artifactId>
<artifactId>srm-iam-yonda</artifactId>
<version>dev-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.srm.boot</groupId>
<artifactId>srm-boot-scanner</artifactId>
<version>dev-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.srm</groupId>
<artifactId>srm-iam-yonda</artifactId>
<artifactId>srm-iam-gjsc</artifactId>
<version>dev-SNAPSHOT</version>
</dependency>
</dependencies>
......
srm-iface-receiver.xml
View file @ b52112ed
<dependencies>
</dependencies>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?><dependencies>
<dependency>
<groupId>org.srm.boot</groupId>
<artifactId>srm-boot-scanner</artifactId>
<version>dev-SNAPSHOT</version>
</dependency>
</dependencies>
srm-import.xml
View file @ b52112ed
<dependencies>
</dependencies>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?><dependencies>
<dependency>
<groupId>org.srm.boot</groupId>
<artifactId>srm-boot-scanner</artifactId>
<version>dev-SNAPSHOT</version>
</dependency>
</dependencies>
srm-interface-config.xml
View file @ b52112ed
<dependencies>
<dependency>
<groupId>org.srm</groupId>
<artifactId>srm-boot-scanner</artifactId>
<version>dev-SNAPSHOT</version>
</dependency>
</dependencies>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?><dependencies>
<dependency>
<groupId>org.srm.boot</groupId>
<artifactId>srm-boot-scanner</artifactId>
<version>dev-SNAPSHOT</version>
</dependency>
</dependencies>
srm-interface.xml
View file @ b52112ed
......@@ -87,7 +87,7 @@
<dependency>
<groupId>org.srm</groupId>
<artifactId>srm-interface-panasonic</artifactId>
<version>1.4.0-SNAPSHOT</version>
<version>dev-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.srm</groupId>
......@@ -149,11 +149,6 @@
<artifactId>srm-interface-ddmc</artifactId>
<version>dev-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.srm</groupId>
<artifactId>srm-boot-scanner</artifactId>
<version>dev-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.srm</groupId>
<artifactId>srm-interface-sd</artifactId>
......@@ -179,5 +174,25 @@
<artifactId>srm-interface-redstar</artifactId>
<version>dev-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.srm</groupId>
<artifactId>srm-interface-mesac</artifactId>
<version>dev-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.srm</groupId>
<artifactId>srm-interface-bjcy</artifactId>
<version>dev-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.srm</groupId>
<artifactId>srm-interface-sumec</artifactId>
<version>dev-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.srm.boot</groupId>
<artifactId>srm-boot-scanner</artifactId>
<version>dev-SNAPSHOT</version>
</dependency>
</dependencies>
srm-log.xml
View file @ b52112ed
<dependencies>
</dependencies>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?><dependencies>
<dependency>
<groupId>org.srm.boot</groupId>
<artifactId>srm-boot-scanner</artifactId>
<version>dev-SNAPSHOT</version>
</dependency>
</dependencies>
srm-mall.xml
View file @ b52112ed
<?xml version="1.0" encoding="UTF-8"?><dependencies>
<dependency>
<groupId>org.srm</groupId>
<artifactId>srm-boot-scanner</artifactId>
<artifactId>srm-mall-redstar</artifactId>
<version>dev-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.srm</groupId>
<artifactId>srm-mall-redstar</artifactId>
<artifactId>srm-mall-yonda</artifactId>
<version>dev-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.srm</groupId>
<artifactId>srm-mall-panasonic</artifactId>
<version>dev-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.srm.boot</groupId>
<artifactId>srm-boot-scanner</artifactId>
<version>dev-SNAPSHOT</version>
</dependency>
</dependencies>
......
srm-mdm.xml
View file @ b52112ed
......@@ -37,7 +37,7 @@
<dependency>
<groupId>org.srm</groupId>
<artifactId>srm-mdm-hyte</artifactId>
<version>1.4.0-SNAPSHOT</version>
<version>dev-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.srm</groupId>
......@@ -71,12 +71,22 @@
</dependency>
<dependency>
<groupId>org.srm</groupId>
<artifactId>srm-mdm-lsrt</artifactId>
<version>dev-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.srm.boot</groupId>
<artifactId>srm-boot-scanner</artifactId>
<version>dev-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.srm</groupId>
<artifactId>srm-mdm-lsrt</artifactId>
<artifactId>srm-mdm-markor</artifactId>
<version>dev-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.srm</groupId>
<artifactId>srm-mdm-uniqlo</artifactId>
<version>dev-SNAPSHOT</version>
</dependency>
</dependencies>
......
srm-message.xml
View file @ b52112ed
<dependencies>
</dependencies>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?><dependencies>
<dependency>
<groupId>org.srm.boot</groupId>
<artifactId>srm-boot-scanner</artifactId>
<version>dev-SNAPSHOT</version>
</dependency>
</dependencies>
srm-monitor.xml
View file @ b52112ed
<dependencies>
</dependencies>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?><dependencies>
<dependency>
<groupId>org.srm.boot</groupId>
<artifactId>srm-boot-scanner</artifactId>
<version>dev-SNAPSHOT</version>
</dependency>
</dependencies>
srm-oauth.xml
View file @ b52112ed
......@@ -5,7 +5,7 @@
<version>1.4.17.RELEASE</version>
</dependency>
<dependency>
<groupId>org.srm</groupId>
<groupId>org.srm.boot</groupId>
<artifactId>srm-boot-scanner</artifactId>
<version>dev-SNAPSHOT</version>
</dependency>
......
srm-platform.xml
View file @ b52112ed
......@@ -19,11 +19,6 @@
<artifactId>srm-platform-hexing</artifactId>
<version>dev-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.srm</groupId>
<artifactId>srm-boot-scanner</artifactId>
<version>1.5.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.srm</groupId>
<artifactId>srm-platform-hytera</artifactId>
......@@ -39,5 +34,25 @@
<artifactId>srm-platform-bita</artifactId>
<version>1.5.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.srm</groupId>
<artifactId>srm-platform-kinglal</artifactId>
<version>dev-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.srm</groupId>
<artifactId>srm-platform-ddmc</artifactId>
<version>dev-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.srm.boot</groupId>
<artifactId>srm-boot-scanner</artifactId>
<version>dev-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.srm</groupId>
<artifactId>srm-platform-xjtlu</artifactId>
<version>dev-SNAPSHOT</version>
</dependency>
</dependencies>
srm-pur-contract-mgr.xml
View file @ b52112ed
......@@ -4,5 +4,10 @@
<artifactId>srm-pur-contract-mgr-hytera</artifactId>
<version>1.4.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.srm.boot</groupId>
<artifactId>srm-boot-scanner</artifactId>
<version>dev-SNAPSHOT</version>
</dependency>
</dependencies>
srm-pur-cooperation-srm.xml
View file @ b52112ed
......@@ -4,5 +4,10 @@
<artifactId>srm-pur-cooperation-srm-hytera</artifactId>
<version>1.4.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.srm.boot</groupId>
<artifactId>srm-boot-scanner</artifactId>
<version>dev-SNAPSHOT</version>
</dependency>
</dependencies>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Menu

Help