diff options
| -rw-r--r-- | msb-core/apiroute/apiroute-service/dependency-reduced-pom.xml | 3 | ||||
| -rw-r--r-- | msb-core/apiroute/apiroute-service/pom.xml | 25 | ||||
| -rw-r--r-- | msb-core/apiroute/apiroute-standalone/pom.xml | 35 | ||||
| -rw-r--r-- | msb-core/apiroute/pom.xml | 17 | ||||
| -rw-r--r-- | msb-core/distributions/pom.xml | 17 | ||||
| -rw-r--r-- | msb-core/distributions/standalone/pom.xml | 119 | ||||
| -rw-r--r-- | msb-core/openresty-ext/pom.xml | 29 | ||||
| -rw-r--r-- | msb-core/openresty/pom.xml | 17 | ||||
| -rw-r--r-- | msb-core/pom.xml | 15 | ||||
| -rw-r--r-- | msb-core/redis-ext/pom.xml | 29 | ||||
| -rw-r--r-- | msb-core/redis/pom.xml | 17 | ||||
| -rw-r--r-- | msb-parent/msbparent-lite/pom.xml | 45 | ||||
| -rw-r--r-- | msb-parent/msbparent/pom.xml | 33 | ||||
| -rw-r--r-- | msb-parent/pom.xml | 15 | ||||
| -rw-r--r-- | pom.xml | 17 |
15 files changed, 200 insertions, 233 deletions
diff --git a/msb-core/apiroute/apiroute-service/dependency-reduced-pom.xml b/msb-core/apiroute/apiroute-service/dependency-reduced-pom.xml index 5f5c609..de1fbab 100644 --- a/msb-core/apiroute/apiroute-service/dependency-reduced-pom.xml +++ b/msb-core/apiroute/apiroute-service/dependency-reduced-pom.xml @@ -2,11 +2,10 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>apiroute-parent</artifactId>
- <groupId>org.openo.msb.msb-core.apiroute</groupId>
+ <groupId>org.openo.common-services.microservice-bus</groupId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.openo.msb.msb-core.apiroute</groupId>
<artifactId>apiroute-service</artifactId>
<name>openo/msb/msb-core/apiroute/apiroute-service</name>
<version>1.0.0-SNAPSHOT</version>
diff --git a/msb-core/apiroute/apiroute-service/pom.xml b/msb-core/apiroute/apiroute-service/pom.xml index 0bddd98..54f8daf 100644 --- a/msb-core/apiroute/apiroute-service/pom.xml +++ b/msb-core/apiroute/apiroute-service/pom.xml @@ -1,33 +1,32 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE) - + Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - + --> <project xmlns="http://maven.apache.org/POM/4.0.0" 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"> <parent> - <groupId>org.openo.msb.msb-core.apiroute</groupId> + <groupId>org.openo.common-services.microservice-bus</groupId> <artifactId>apiroute-parent</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.openo.msb.msb-core.apiroute</groupId> <artifactId>apiroute-service</artifactId> <name>openo/msb/msb-core/apiroute/apiroute-service</name> <packaging>jar</packaging> <version>1.0.0-SNAPSHOT</version> - + <dependencies> <dependency> @@ -41,7 +40,7 @@ <dependency> <groupId>io.dropwizard</groupId> <artifactId>dropwizard-client</artifactId> - </dependency> + </dependency> <dependency> <groupId>io.swagger</groupId> <artifactId>swagger-jersey2-jaxrs</artifactId> @@ -66,7 +65,7 @@ <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> - </dependency> + </dependency> </dependencies> <build> <plugins> @@ -125,7 +124,7 @@ <phase>package</phase> <goals> <goal>copy-dependencies</goal> - </goals> + </goals> <configuration> <artifactItems> <artifactItem> @@ -133,10 +132,10 @@ <artifactId>dropwizard-core</artifactId> <version>${dropwizard.version}</version> <overWrite>true</overWrite> - </artifactItem> + </artifactItem> </artifactItems> </configuration> - </execution> + </execution> </executions> </plugin--> <plugin> diff --git a/msb-core/apiroute/apiroute-standalone/pom.xml b/msb-core/apiroute/apiroute-standalone/pom.xml index 46e59ae..eaf892d 100644 --- a/msb-core/apiroute/apiroute-standalone/pom.xml +++ b/msb-core/apiroute/apiroute-standalone/pom.xml @@ -1,28 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE) - + Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - + --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> - <groupId>org.openo.msb.msb-core.apiroute</groupId> + <groupId>org.openo.common-services.microservice-bus</groupId> <artifactId>apiroute-parent</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.openo.msb.msb-core.apiroute</groupId> <artifactId>apiroute-standalone</artifactId> <name>openo/msb/msb-core/apiroute/apiroute-standalone</name> <packaging>pom</packaging> @@ -35,20 +34,20 @@ <dependencies> <dependency> - <groupId>org.openo.msb.msb-core.apiroute</groupId> + <groupId>org.openo.common-services.microservice-bus</groupId> <artifactId>apiroute-service</artifactId> <version>${project.version}</version> <optional>true</optional> </dependency> - </dependencies> + </dependencies> <build> - - <plugins> + + <plugins> <plugin> <artifactId>maven-resources-plugin</artifactId> <executions> <execution> - <id>copy-resources</id> + <id>copy-resources</id> <phase>process-resources</phase> <goals> <goal>copy-resources</goal> @@ -56,14 +55,14 @@ <configuration> <outputDirectory>${outputdir}</outputDirectory> <includeEmptyDirs>true</includeEmptyDirs> - <resources> + <resources> <resource> <directory>src/assembly/resource/</directory> <filtering>false</filtering> <includes> <include>**/*</include> </includes> - </resource> + </resource> </resources> <overwrite>true</overwrite> </configuration> @@ -74,7 +73,7 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> <version>2.8</version> - <executions> + <executions> <execution> <id>copy-jar</id> <goals> @@ -84,19 +83,19 @@ <configuration> <artifactItems> <artifactItem> - <groupId>org.openo.msb.msb-core.apiroute</groupId> + <groupId>org.openo.common-services.microservice-bus</groupId> <artifactId>apiroute-service</artifactId> <type>jar</type> <overWrite>true</overWrite> <outputDirectory>${outputdir}/apiroute/</outputDirectory> <destFileName>apiroute-service.jar</destFileName> - </artifactItem> + </artifactItem> </artifactItems> </configuration> </execution> </executions> </plugin> - + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> diff --git a/msb-core/apiroute/pom.xml b/msb-core/apiroute/pom.xml index 055b6bd..dfc9b1f 100644 --- a/msb-core/apiroute/pom.xml +++ b/msb-core/apiroute/pom.xml @@ -1,36 +1,35 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE) - + Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - + --> <project xmlns="http://maven.apache.org/POM/4.0.0" 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"> <parent> - <groupId>org.openo.msb.msb-core</groupId> + <groupId>org.openo.common-services.microservice-bus</groupId> <artifactId>msb-core-parent</artifactId> <version>1.0.0-SNAPSHOT</version> - </parent> + </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.openo.msb.msb-core.apiroute</groupId> <artifactId>apiroute-parent</artifactId> <name>openo/msb/msb-core/apiroute</name> <packaging>pom</packaging> <version>1.0.0-SNAPSHOT</version> - + <modules> <module>apiroute-service</module> <module>apiroute-standalone</module> </modules> - + </project> diff --git a/msb-core/distributions/pom.xml b/msb-core/distributions/pom.xml index c899f71..e732e6d 100644 --- a/msb-core/distributions/pom.xml +++ b/msb-core/distributions/pom.xml @@ -1,33 +1,32 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE) - + Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - + --> <project xmlns="http://maven.apache.org/POM/4.0.0" 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"> <parent> - <groupId>org.openo.msb.msb-core</groupId> + <groupId>org.openo.common-services.microservice-bus</groupId> <artifactId>msb-core-parent</artifactId> <version>1.0.0-SNAPSHOT</version> - </parent> + </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.openo.msb.msb-core</groupId> <artifactId>distributions-parent</artifactId> <name>openo/msb/msb-core/distributions-parent</name> <packaging>pom</packaging> <version>1.0.0-SNAPSHOT</version> - + <modules> <module>standalone</module> </modules> @@ -36,5 +35,5 @@ <version.output>target/version</version.output> <dockerFileDir>src/main/docker</dockerFileDir> </properties> - + </project> diff --git a/msb-core/distributions/standalone/pom.xml b/msb-core/distributions/standalone/pom.xml index 3d2de6b..a2b9a5c 100644 --- a/msb-core/distributions/standalone/pom.xml +++ b/msb-core/distributions/standalone/pom.xml @@ -1,28 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE) - + Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - + --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> - <groupId>org.openo.msb.msb-core</groupId> + <groupId>org.openo.common-services.microservice-bus</groupId> <artifactId>distributions-parent</artifactId> <version>1.0.0-SNAPSHOT</version> - </parent> + </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.openo.msb.msb-core.distributions</groupId> <artifactId>msb-core-standalone</artifactId> <name>openo/msb/msb-core/distributions/standalone</name> <packaging>pom</packaging> @@ -38,15 +37,15 @@ <dependencies> <dependency> - <groupId>org.openo.msb.msb-core.apiroute</groupId> + <groupId>org.openo.common-services.microservice-bus</groupId> <artifactId>apiroute-standalone</artifactId> <version>${project.version}</version> <type>zip</type> <optional>true</optional> </dependency> - + <dependency> - <groupId>org.openo.msb.msb-core</groupId> + <groupId>org.openo.common-services.microservice-bus</groupId> <artifactId>redis</artifactId> <type>zip</type> <classifier>win64</classifier> @@ -54,7 +53,7 @@ <optional>true</optional> </dependency> <dependency> - <groupId>org.openo.msb.msb-core</groupId> + <groupId>org.openo.common-services.microservice-bus</groupId> <artifactId>redis</artifactId> <type>tar.gz</type> <classifier>linux64</classifier> @@ -62,7 +61,7 @@ <optional>true</optional> </dependency> <dependency> - <groupId>org.openo.msb.msb-core</groupId> + <groupId>org.openo.common-services.microservice-bus</groupId> <artifactId>redis-ext</artifactId> <type>zip</type> <version>${project.version}</version> @@ -70,7 +69,7 @@ </dependency> <dependency> - <groupId>org.openo.msb.msb-core</groupId> + <groupId>org.openo.common-services.microservice-bus</groupId> <artifactId>openresty</artifactId> <type>zip</type> <classifier>win64</classifier> @@ -78,7 +77,7 @@ <optional>true</optional> </dependency> <dependency> - <groupId>org.openo.msb.msb-core</groupId> + <groupId>org.openo.common-services.microservice-bus</groupId> <artifactId>openresty</artifactId> <type>tar.gz</type> <classifier>linux64</classifier> @@ -87,7 +86,7 @@ </dependency> <dependency> - <groupId>org.openo.msb.msb-core</groupId> + <groupId>org.openo.common-services.microservice-bus</groupId> <artifactId>openresty-ext</artifactId> <type>zip</type> <version>${project.version}</version> @@ -95,36 +94,36 @@ </dependency> - </dependencies> + </dependencies> <build> - - <plugins> + + <plugins> <plugin> <artifactId>maven-resources-plugin</artifactId> <executions> <execution> - <id>copy-resources-dockerfile</id> + <id>copy-resources-dockerfile</id> <phase>prepare-package</phase> <goals> <goal>copy-resources</goal> </goals> - <configuration> + <configuration> <outputDirectory>${version.output}</outputDirectory> <includeEmptyDirs>true</includeEmptyDirs> - <resources> + <resources> <resource> <directory>${dockerFileDir}</directory> <filtering>false</filtering> <includes> <include>**/*</include> </includes> - </resource> + </resource> </resources> <overwrite>true</overwrite> </configuration> - </execution> + </execution> <execution> - <id>copy-msb-resources-${linux64id}</id> + <id>copy-msb-resources-${linux64id}</id> <phase>prepare-package</phase> <goals> <goal>copy-resources</goal> @@ -132,7 +131,7 @@ <configuration> <outputDirectory>${linux64outputdir}</outputDirectory> <includeEmptyDirs>true</includeEmptyDirs> - <resources> + <resources> <resource> <directory>src/assembly/resource/</directory> <filtering>false</filtering> @@ -142,14 +141,14 @@ <excludes> <exclude>**/*.bat</exclude> </excludes> - </resource> + </resource> </resources> <overwrite>true</overwrite> </configuration> </execution> - + <execution> - <id>copy-msb-resources-${win64id}</id> + <id>copy-msb-resources-${win64id}</id> <phase>prepare-package</phase> <goals> <goal>copy-resources</goal> @@ -157,7 +156,7 @@ <configuration> <outputDirectory>${win64outputdir}</outputDirectory> <includeEmptyDirs>true</includeEmptyDirs> - <resources> + <resources> <resource> <directory>src/assembly/resource/</directory> <filtering>false</filtering> @@ -167,14 +166,14 @@ <excludes> <exclude>**/*.sh</exclude> </excludes> - </resource> + </resource> </resources> <overwrite>true</overwrite> </configuration> </execution> </executions> </plugin> - + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> @@ -188,32 +187,32 @@ <configuration> <artifactItems> <artifactItem> - <groupId>org.openo.msb.msb-core.apiroute</groupId> + <groupId>org.openo.common-services.microservice-bus</groupId> <artifactId>apiroute-standalone</artifactId> <type>zip</type> - </artifactItem> + </artifactItem> <artifactItem> - <groupId>org.openo.msb.msb-core</groupId> + <groupId>org.openo.common-services.microservice-bus</groupId> <artifactId>redis</artifactId> <type>tar.gz</type> - <classifier>linux64</classifier> - </artifactItem> + <classifier>linux64</classifier> + </artifactItem> <artifactItem> - <groupId>org.openo.msb.msb-core</groupId> + <groupId>org.openo.common-services.microservice-bus</groupId> <artifactId>redis-ext</artifactId> - <type>zip</type> - </artifactItem> + <type>zip</type> + </artifactItem> <artifactItem> - <groupId>org.openo.msb.msb-core</groupId> + <groupId>org.openo.common-services.microservice-bus</groupId> <artifactId>openresty</artifactId> <type>tar.gz</type> - <classifier>linux64</classifier> - </artifactItem> + <classifier>linux64</classifier> + </artifactItem> <artifactItem> - <groupId>org.openo.msb.msb-core</groupId> + <groupId>org.openo.common-services.microservice-bus</groupId> <artifactId>openresty-ext</artifactId> - <type>zip</type> - </artifactItem> + <type>zip</type> + </artifactItem> </artifactItems> <excludes>**/*.bat,*.cmd</excludes> <outputDirectory>${linux64outputdir}</outputDirectory> @@ -231,32 +230,32 @@ <configuration> <artifactItems> <artifactItem> - <groupId>org.openo.msb.msb-core.apiroute</groupId> + <groupId>org.openo.common-services.microservice-bus</groupId> <artifactId>apiroute-standalone</artifactId> <type>zip</type> - </artifactItem> + </artifactItem> <artifactItem> - <groupId>org.openo.msb.msb-core</groupId> + <groupId>org.openo.common-services.microservice-bus</groupId> <artifactId>redis</artifactId> <type>zip</type> - <classifier>win64</classifier> - </artifactItem> + <classifier>win64</classifier> + </artifactItem> <artifactItem> - <groupId>org.openo.msb.msb-core</groupId> + <groupId>org.openo.common-services.microservice-bus</groupId> <artifactId>redis-ext</artifactId> - <type>zip</type> - </artifactItem> + <type>zip</type> + </artifactItem> <artifactItem> - <groupId>org.openo.msb.msb-core</groupId> + <groupId>org.openo.common-services.microservice-bus</groupId> <artifactId>openresty</artifactId> <type>zip</type> - <classifier>win64</classifier> - </artifactItem> + <classifier>win64</classifier> + </artifactItem> <artifactItem> - <groupId>org.openo.msb.msb-core</groupId> + <groupId>org.openo.common-services.microservice-bus</groupId> <artifactId>openresty-ext</artifactId> - <type>zip</type> - </artifactItem> + <type>zip</type> + </artifactItem> </artifactItems> <excludes>*.sh,*/*.sh,*/*/*.sh</excludes> <outputDirectory>${win64outputdir}</outputDirectory> @@ -267,7 +266,7 @@ </execution> </executions> </plugin> - + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> diff --git a/msb-core/openresty-ext/pom.xml b/msb-core/openresty-ext/pom.xml index b5aee8c..1db2516 100644 --- a/msb-core/openresty-ext/pom.xml +++ b/msb-core/openresty-ext/pom.xml @@ -1,32 +1,31 @@ <?xml version="1.0" encoding="UTF-8"?>
<!--
-
+
Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
-
+
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-
+
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" 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">
<parent>
- <groupId>org.openo.msb.msb-core</groupId>
+ <groupId>org.openo.common-services.microservice-bus</groupId>
<artifactId>msb-core-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
- </parent>
+ </parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.openo.msb.msb-core</groupId>
<artifactId>openresty-ext</artifactId>
<version>1.0.0-SNAPSHOT</version>
<name>openo/msb/msb-core/openresty-ext</name>
@@ -38,7 +37,7 @@ </properties>
<build>
- <plugins>
+ <plugins>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<configuration>
@@ -46,25 +45,25 @@ </configuration>
<executions>
<execution>
- <id>copy-resources</id>
+ <id>copy-resources</id>
<phase>process-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${outputdir}</outputDirectory>
- <resources>
+ <resources>
<resource>
<directory>src/assembly/resources/</directory>
<filtering>false</filtering>
<includes>
<include>**/*</include>
</includes>
- </resource>
+ </resource>
</resources>
<overwrite>true</overwrite>
</configuration>
- </execution>
+ </execution>
</executions>
</plugin>
@@ -92,6 +91,6 @@ </plugins>
</build>
-
-</project>
\ No newline at end of file +
+</project>
diff --git a/msb-core/openresty/pom.xml b/msb-core/openresty/pom.xml index 69765f0..550ee33 100644 --- a/msb-core/openresty/pom.xml +++ b/msb-core/openresty/pom.xml @@ -1,32 +1,31 @@ <?xml version="1.0" encoding="UTF-8"?>
<!--
-
+
Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
-
+
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-
+
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" 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">
<parent>
- <groupId>org.openo.msb.msb-core</groupId>
+ <groupId>org.openo.common-services.microservice-bus</groupId>
<artifactId>msb-core-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
- </parent>
+ </parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.openo.msb.msb-core</groupId>
<artifactId>openresty</artifactId>
<version>1.0.0-SNAPSHOT</version>
<name>openo/msb/msb-core/openresty</name>
@@ -79,4 +78,4 @@ </plugins>
</build>
-</project>
\ No newline at end of file +</project>
diff --git a/msb-core/pom.xml b/msb-core/pom.xml index ef170cb..7bf0168 100644 --- a/msb-core/pom.xml +++ b/msb-core/pom.xml @@ -1,30 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
-
+
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-
+
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" 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">
<parent>
- <groupId>org.openo.msb</groupId>
+ <groupId>org.openo.common-services.microservice-bus</groupId>
<artifactId>msb-core-root</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
-
+
<modelVersion>4.0.0</modelVersion>
- <groupId>org.openo.msb.msb-core</groupId>
<artifactId>msb-core-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<name>openo/msb/msb-core-parent</name>
@@ -38,4 +37,4 @@ <module>distributions</module>
</modules>
-</project>
\ No newline at end of file +</project>
diff --git a/msb-core/redis-ext/pom.xml b/msb-core/redis-ext/pom.xml index 907b690..96bf309 100644 --- a/msb-core/redis-ext/pom.xml +++ b/msb-core/redis-ext/pom.xml @@ -1,32 +1,31 @@ <?xml version="1.0" encoding="UTF-8"?>
<!--
-
+
Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
-
+
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-
+
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" 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">
<parent>
- <groupId>org.openo.msb.msb-core</groupId>
+ <groupId>org.openo.common-services.microservice-bus</groupId>
<artifactId>msb-core-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
- </parent>
+ </parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.openo.msb.msb-core</groupId>
<artifactId>redis-ext</artifactId>
<version>1.0.0-SNAPSHOT</version>
<name>openo/msb/msb-core/redis-ext</name>
@@ -38,7 +37,7 @@ </properties>
<build>
- <plugins>
+ <plugins>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<configuration>
@@ -46,25 +45,25 @@ </configuration>
<executions>
<execution>
- <id>copy-resources</id>
+ <id>copy-resources</id>
<phase>process-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${outputdir}</outputDirectory>
- <resources>
+ <resources>
<resource>
<directory>src/assembly/resources/</directory>
<filtering>false</filtering>
<includes>
<include>**/*</include>
</includes>
- </resource>
+ </resource>
</resources>
<overwrite>true</overwrite>
</configuration>
- </execution>
+ </execution>
</executions>
</plugin>
@@ -92,6 +91,6 @@ </plugins>
</build>
-
-</project>
\ No newline at end of file +
+</project>
diff --git a/msb-core/redis/pom.xml b/msb-core/redis/pom.xml index 5c3930e..d6d3959 100644 --- a/msb-core/redis/pom.xml +++ b/msb-core/redis/pom.xml @@ -1,32 +1,31 @@ <?xml version="1.0" encoding="UTF-8"?>
<!--
-
+
Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
-
+
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-
+
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" 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">
<parent>
- <groupId>org.openo.msb.msb-core</groupId>
+ <groupId>org.openo.common-services.microservice-bus</groupId>
<artifactId>msb-core-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
- </parent>
+ </parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.openo.msb.msb-core</groupId>
<artifactId>redis</artifactId>
<version>1.0.0-SNAPSHOT</version>
<name>openo/msb/msb-core/redis</name>
@@ -79,4 +78,4 @@ </plugins>
</build>
-</project>
\ No newline at end of file +</project>
diff --git a/msb-parent/msbparent-lite/pom.xml b/msb-parent/msbparent-lite/pom.xml index 341de3d..7d16422 100644 --- a/msb-parent/msbparent-lite/pom.xml +++ b/msb-parent/msbparent-lite/pom.xml @@ -1,19 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE) - + Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - + --> <project xmlns="http://maven.apache.org/POM/4.0.0" 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"> <modelVersion>4.0.0</modelVersion> @@ -26,17 +26,13 @@ </parent> - <groupId>org.openo.msb</groupId> + <groupId>org.openo.common-services.microservice-bus</groupId> <artifactId>msbparent-lite</artifactId> - <version>1.0.0</version> + <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> - <name>msbparent-lite</name> + <name>msbparent-lite</name> <properties> - - <nexus.repository.release>dav:http://nexus.open-o.com/repos/content/repositories/releases</nexus.repository.release> - <nexus.repository.snapshot>dav:http://nexus.open-o.com/repos/content/repositories/snapshots</nexus.repository.snapshot> - <stream>latest</stream><!-- CI should pass in -Dstream={stream} --> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> @@ -47,7 +43,7 @@ <maven.compiler.source>1.7</maven.compiler.source> <maven.compiler.target>1.7</maven.compiler.target> <java.version.source>${maven.compiler.source}</java.version.source> - <java.version.target>${maven.compiler.target}</java.version.target> + <java.version.target>${maven.compiler.target}</java.version.target> <!-- Maven plugin versions, in the 'canonical' format --> @@ -65,23 +61,8 @@ <checkstyle.version>2.16</checkstyle.version> <compiler.version>${maven.compile.plugin.version}</compiler.version> <enforcer.version>1.4</enforcer.version> - - - </properties> - <distributionManagement> - <repository> - <id>releases</id> - <url>${nexus.repository.release}</url> - </repository> - <snapshotRepository> - <id>snapshots</id> - <url>${nexus.repository.snapshot}</url> - </snapshotRepository> - </distributionManagement> - - <build> <extensions> <extension> @@ -152,7 +133,7 @@ <artifactId>maven-antrun-plugin</artifactId> <version>${maven.antrun.plugin.version}</version> </plugin> - + <plugin> <artifactId>maven-clean-plugin</artifactId> <version>${maven.clean.plugin.version}</version> @@ -209,7 +190,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <version>2.10</version> + <version>2.10</version> </plugin> <plugin> @@ -245,11 +226,11 @@ <redirectTestOutputToFile>true</redirectTestOutputToFile> </configuration> </plugin> - + </plugins> </pluginManagement> - </build> - + </build> + </project> diff --git a/msb-parent/msbparent/pom.xml b/msb-parent/msbparent/pom.xml index 4f03c5e..61e0079 100644 --- a/msb-parent/msbparent/pom.xml +++ b/msb-parent/msbparent/pom.xml @@ -1,34 +1,33 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE) - + Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - + --> <project xmlns="http://maven.apache.org/POM/4.0.0" 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"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.openo.msb</groupId> + <groupId>org.openo.common-services.microservice-bus</groupId> <artifactId>msbparent-lite</artifactId> - <version>1.0.0</version> + <version>1.0.0-SNAPSHOT</version> <relativePath>../msbparent-lite</relativePath> </parent> - <groupId>org.openo.msb</groupId> <artifactId>msbparent</artifactId> <packaging>pom</packaging> - <name>msbparent</name> + <name>msbparent</name> <scm> @@ -42,7 +41,7 @@ <properties> <!-- Supporting Libraries --> <dropwizard.version>0.8.0</dropwizard.version> - <swagger.version>1.5.3</swagger.version> + <swagger.version>1.5.3</swagger.version> <jedis.version>2.7.3</jedis.version> <lombok.version>1.16.4</lombok.version> <json-lib.version>2.4</json-lib.version> @@ -77,7 +76,7 @@ <groupId>io.dropwizard</groupId> <artifactId>dropwizard-client</artifactId> <version>${dropwizard.version}</version> - </dependency> + </dependency> <dependency> <groupId>io.swagger</groupId> @@ -90,17 +89,17 @@ <groupId>redis.clients</groupId> <artifactId>jedis</artifactId> <version>${jedis.version}</version> - </dependency> + </dependency> <dependency> <groupId>org.projectlombok</groupId> <artifactId>lombok</artifactId> <version>${lombok.version}</version> </dependency> - <dependency> - <groupId>net.sf.json-lib</groupId> - <artifactId>json-lib</artifactId> - <version>${json-lib.version}</version> - </dependency> + <dependency> + <groupId>net.sf.json-lib</groupId> + <artifactId>json-lib</artifactId> + <version>${json-lib.version}</version> + </dependency> </dependencies> </dependencyManagement> @@ -172,5 +171,5 @@ </plugin> </plugins> </build> - + </project> diff --git a/msb-parent/pom.xml b/msb-parent/pom.xml index d4bedff..e07c915 100644 --- a/msb-parent/pom.xml +++ b/msb-parent/pom.xml @@ -1,34 +1,33 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE) - + Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - + --> <project xmlns="http://maven.apache.org/POM/4.0.0" 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"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.openo.msb</groupId> + <groupId>org.openo.common-services.microservice-bus</groupId> <artifactId>msbparent-lite</artifactId> - <version>1.0.0</version> + <version>1.0.0-SNAPSHOT</version> <relativePath>msbparent-lite</relativePath> </parent> -<groupId>org.openo.msb</groupId> <artifactId>msbparent-aggregator</artifactId> <version>1.0.0</version> -<name>msbparent-aggregator</name> +<name>msbparent-aggregator</name> <packaging>pom</packaging> @@ -1,19 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
-
+
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-
+
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" 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">
@@ -21,14 +21,13 @@ <modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.openo.msb</groupId>
+ <groupId>org.openo.common-services.microservice-bus</groupId>
<artifactId>msbparent</artifactId>
- <version>1.0.0</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath>msb-parent/msbparent</relativePath>
- </parent>
+ </parent>
- <groupId>org.openo.msb</groupId>
<artifactId>msb-core-root</artifactId>
<version>1.0.0-SNAPSHOT</version>
<name>openo/msb/msb-core-root</name>
@@ -39,4 +38,4 @@ <module>msb-core</module>
</modules>
- </project>
\ No newline at end of file + </project>
|