You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by ni...@apache.org on 2018/03/05 05:45:35 UTC

[incubator-servicecomb-saga] branch master updated (16e224c -> f33c41a)

This is an automated email from the ASF dual-hosted git repository.

ningjiang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-saga.git.


    from 16e224c  SCB-363 Rename pack-demo to booking
     new c5427c3  SCB-346 Update rat exclusions
     new a827ca5  SCB-346 Add missing javax.interceptor-api dependency
     new f33c41a  SCB-346 Add distribution module

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 alpha/alpha-server/pom.xml                  |   4 ++
 pom.xml                                     |  10 ++-
 saga-distribution/pom.xml                   | 101 ++++++++++++++++++++++++++++
 saga-distribution/src/assembly/assembly.xml |  58 ++++++++++++++++
 4 files changed, 171 insertions(+), 2 deletions(-)
 create mode 100644 saga-distribution/pom.xml
 create mode 100644 saga-distribution/src/assembly/assembly.xml

-- 
To stop receiving notification emails like this one, please contact
ningjiang@apache.org.

[incubator-servicecomb-saga] 02/03: SCB-346 Add missing javax.interceptor-api dependency

Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-saga.git

commit a827ca5e307a11448e586f0808c1b2cc0077d23d
Author: Yang Bo <ya...@huawei.com>
AuthorDate: Fri Mar 2 02:15:04 2018 +0800

    SCB-346 Add missing javax.interceptor-api dependency
---
 alpha/alpha-server/pom.xml | 4 ++++
 pom.xml                    | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/alpha/alpha-server/pom.xml b/alpha/alpha-server/pom.xml
index 0f49262..8a54feb 100644
--- a/alpha/alpha-server/pom.xml
+++ b/alpha/alpha-server/pom.xml
@@ -126,6 +126,10 @@
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest-all</artifactId>
     </dependency>
+    <dependency>
+      <groupId>javax.interceptor</groupId>
+      <artifactId>javax.interceptor-api</artifactId>
+    </dependency>
   </dependencies>
 
   <build>
diff --git a/pom.xml b/pom.xml
index 229e545..4337849 100755
--- a/pom.xml
+++ b/pom.xml
@@ -325,6 +325,11 @@
         <version>2.2</version>
       </dependency>
       <dependency>
+        <groupId>javax.interceptor</groupId>
+        <artifactId>javax.interceptor-api</artifactId>
+        <version>1.2</version>
+      </dependency>
+      <dependency>
       <groupId>org.eclipse.persistence</groupId>
       <artifactId>org.eclipse.persistence.jpa</artifactId>
       <version>${eclipse.link.version}</version>

-- 
To stop receiving notification emails like this one, please contact
ningjiang@apache.org.

[incubator-servicecomb-saga] 03/03: SCB-346 Add distribution module

Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-saga.git

commit f33c41aae8df874025028a1b2929c1167c2ad156
Author: Yang Bo <ya...@huawei.com>
AuthorDate: Fri Mar 2 10:11:31 2018 +0800

    SCB-346 Add distribution module
    
    Use maven assembly plugin to collect all the saga dependencies for
    release. Also packed demo source for reference.
---
 saga-distribution/pom.xml                   | 101 ++++++++++++++++++++++++++++
 saga-distribution/src/assembly/assembly.xml |  58 ++++++++++++++++
 2 files changed, 159 insertions(+)

diff --git a/saga-distribution/pom.xml b/saga-distribution/pom.xml
new file mode 100644
index 0000000..08a6882
--- /dev/null
+++ b/saga-distribution/pom.xml
@@ -0,0 +1,101 @@
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You 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.apache.servicecomb.saga</groupId>
+      <artifactId>saga</artifactId>
+      <version>0.0.3-SNAPSHOT</version>
+    </parent>
+    <artifactId>saga-distribution</artifactId>
+    <name>Saga::Distribution</name>
+    <packaging>pom</packaging>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.servicecomb.saga</groupId>
+            <artifactId>omega-context</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicecomb.saga</groupId>
+            <artifactId>omega-transaction</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicecomb.saga</groupId>
+            <artifactId>omega-spring-tx</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicecomb.saga</groupId>
+            <artifactId>omega-transport-resttemplate</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicecomb.saga</groupId>
+            <artifactId>omega-connector-grpc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicecomb.saga</groupId>
+            <artifactId>omega-spring-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicecomb.saga</groupId>
+            <artifactId>omega-format</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicecomb.saga</groupId>
+            <artifactId>alpha-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicecomb.saga</groupId>
+            <artifactId>pack-contract-grpc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicecomb.saga</groupId>
+            <artifactId>pack-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicecomb.saga</groupId>
+            <artifactId>saga-persistence-jpa</artifactId>
+        </dependency>
+    </dependencies>
+
+    <profiles>
+        <profile>
+            <id>release</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>single</goal>
+                                </goals>
+                                <configuration>
+                                    <descriptors>
+                                        <descriptor>src/assembly/assembly.xml</descriptor>
+                                    </descriptors>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+</project>
diff --git a/saga-distribution/src/assembly/assembly.xml b/saga-distribution/src/assembly/assembly.xml
new file mode 100644
index 0000000..fb7aaee
--- /dev/null
+++ b/saga-distribution/src/assembly/assembly.xml
@@ -0,0 +1,58 @@
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You 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.
+  -->
+
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <id>release</id>
+    <formats>
+        <format>zip</format>
+    </formats>
+    <fileSets>
+        <fileSet>
+            <directory>../saga-demo</directory>
+            <outputDirectory>saga-distribution-${project.version}/saga-demo</outputDirectory>
+            <excludes>
+                <exclude>**/target</exclude>
+                <exclude>**/target/**/*</exclude>
+            </excludes>
+        </fileSet>
+        <fileSet>
+            <directory>../docs</directory>
+            <outputDirectory>saga-distribution-${project.version}/docs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../</directory>
+            <outputDirectory>saga-distribution-${project.version}</outputDirectory>
+            <includes>
+                <include>NOTICE</include>
+                <include>LICENSE</include>
+                <include>DISCLAIMER</include>
+                <include>README.md</include>
+                <include>README_ZH.md</include>
+            </includes>
+        </fileSet>
+    </fileSets>
+    <dependencySets>
+        <dependencySet>
+            <useProjectArtifact>true</useProjectArtifact>
+            <unpack>false</unpack>
+            <outputDirectory>saga-distribution-${project.version}/libs</outputDirectory>
+            <scope>runtime</scope>
+        </dependencySet>
+    </dependencySets>
+</assembly>

-- 
To stop receiving notification emails like this one, please contact
ningjiang@apache.org.

[incubator-servicecomb-saga] 01/03: SCB-346 Update rat exclusions

Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-saga.git

commit c5427c3522f069798ece999d0abfad4c06e5d44e
Author: Yang Bo <ya...@huawei.com>
AuthorDate: Mon Feb 26 10:22:28 2018 +0800

    SCB-346 Update rat exclusions
    
    Exclude readme and other unrelated files for rat checking.
---
 pom.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9207e14..229e545 100755
--- a/pom.xml
+++ b/pom.xml
@@ -588,12 +588,13 @@
             <exclude>.github/PULL_REQUEST_TEMPLATE.md</exclude>
             <exclude>.travis.yml</exclude>
             <exclude>DISCLAIMER</exclude>
+            <exclude>**/README_ZH.md</exclude>
             <exclude>docs/*.md</exclude>
-            <exclude>docs/**.md</exclude>
+            <exclude>docs/**/**.md</exclude>
             <exclude>**/README.md</exclude>
             <excldue>**/target/**</excldue>
             <exclude>**/*.sql</exclude>
-            
+            <exclude>**/*.iml</exclude>
             <!--exclude>**/*.js</exclude>
             <exclude>**/*.css</exclude>
             <exclude>**/*.css.map</exclude-->

-- 
To stop receiving notification emails like this one, please contact
ningjiang@apache.org.