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 07:17:54 UTC
[incubator-servicecomb-saga] 01/01: SCB-346 create src and binary
release with different LICENSE and NOTICE files
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch SCB-346
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-saga.git
commit 0af70630c17e8551134adbaf523c2b8f73db0c15
Author: Willem Jiang <ji...@huawei.com>
AuthorDate: Mon Mar 5 15:17:34 2018 +0800
SCB-346 create src and binary release with different LICENSE and NOTICE files
---
NOTICE | 76 +-------
pom.xml | 1 +
saga-distribution/pom.xml | 19 +-
.../src/assembly/{assembly.xml => bin.xml} | 12 +-
saga-distribution/src/assembly/src.xml | 57 ++++++
saga-distribution/src/release/LICENSE | 203 +++++++++++++++++++++
saga-distribution/src/release/NOTICE | 5 +
7 files changed, 291 insertions(+), 82 deletions(-)
diff --git a/NOTICE b/NOTICE
index 004f2c4..a961677 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,79 +1,5 @@
-Servicecomb Saga
+ServiceComb Saga
Copyright 2017-2018 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-
-================================================================
-The Eclipse Public License 1.0
-================================================================
-
-The following components are provided under the Eclipse Public License - v 1.0 (http://www.eclipse.org/legal/epl-v10.html). See project link for details.
-
-AspectJ weaver (http://www.aspectj.org) org.aspectj:aspectjweaver:jar:1.8.10
-Logback Core Module (http://logback.qos.ch/logback-core) ch.qos.logback:logback-core:jar:1.1.7
-Logback Core Module (http://logback.qos.ch/logback-core) ch.qos.logback:logback-core:jar:1.1.11
-Logback Classic Module (http://logback.qos.ch/logback-classic) ch.qos.logback:logback-classic:jar:1.1.7
-Logback Classic Module (http://logback.qos.ch/logback-classic) ch.qos.logback:logback-classic:jar:1.1.11
-EclipseLink ASM (http://www.eclipse.org/eclipselink) org.eclipse.persistence:org.eclipse.persistence.asm:jar:2.7.1
-EclipseLink Hermes JPQL Parser (http://www.eclipse.org/eclipselink) org.eclipse.persistence:org.eclipse.persistence.jpa.jpql:jar:2.7.1
-EclipseLink JPA (http://www.eclipse.org/eclipselink) org.eclipse.persistence:org.eclipse.persistence.jpa:jar:2.7.1
-EclipseLink ANTLR (http://www.eclipse.org/eclipselink) org.eclipse.persistence:org.eclipse.persistence.antlr:jar:2.7.1
-EclipseLink Core (http://www.eclipse.org/eclipselink) org.eclipse.persistence:org.eclipse.persistence.core:jar:2.7.1
-Javax Persistence (http://www.eclipse.org/eclipselink) org.eclipse.persistence:javax.persistence:jar:2.2.0
-javax.persistence-api (https://github.com/javaee/jpa-spec) javax.persistence:javax.persistence-api:jar:2.2
-
-================================================================
-The BSD Licenses
-================================================================
-
-The following components are provided under the BSD Licenses (http://www.opensource.org/licenses/bsd-license.php). See project link for details.
-
-PostgreSQL JDBC Driver - JDBC 4.1 (https://github.com/pgjdbc/pgjdbc-parent-poms/pgjdbc-core-parent/pgjdbc-core-prevjre/postgresql) org.postgresql:postgresql:bundle:9.4.1212.jre7
-Kryo (https://github.com/EsotericSoftware/kryo/kryo) com.esotericsoftware:kryo:bundle:4.0.1
-Protocol Buffers [Util] (https://developers.google.com/protocol-buffers/protobuf-java-util/) com.google.protobuf:protobuf-java-util:bundle:3.4.0
-Protocol Buffers [Core] (https://developers.google.com/protocol-buffers/protobuf-java/) com.google.protobuf:protobuf-java:bundle:3.4.0
-Hamcrest Core (https://github.com/hamcrest/JavaHamcrest/hamcrest-core) org.hamcrest:hamcrest-core:jar:1.3
-ReflectASM (https://github.com/EsotericSoftware/reflectasm) com.esotericsoftware:reflectasm:bundle:1.11.3
-MinLog (https://github.com/EsotericSoftware/minlog) com.esotericsoftware:minlog:bundle:1.3.0
-Hamcrest library (https://github.com/hamcrest/JavaHamcrest/hamcrest-library) org.hamcrest:hamcrest-library:jar:1.3
-scala-java8-compat (http://www.scala-lang.org/) org.scala-lang.modules:scala-java8-compat_2.12:bundle:0.8.0
-ASM Core (http://asm.objectweb.org/asm/) org.ow2.asm:asm:jar:5.0.3
-ASM Core (http://asm.objectweb.org/asm/) org.ow2.asm:asm:jar:5.0.4
-Stax2 API (http://wiki.fasterxml.com/WoodstoxStax2) org.codehaus.woodstox:stax2-api:bundle:3.1.4
-Scala Library (http://www.scala-lang.org/) org.scala-lang:scala-library:jar:2.12.3
-
-================================================================
-The MIT License
-================================================================
-
-The following components are provided under the MIT License (http://www.opensource.org/licenses/mit-license.php). See project link for details.
-
-Bouncy Castle PKIX, CMS, EAC, TSP, PKCS, OCSP, CMP, and CRMF APIs (http://www.bouncycastle.org/java.html) org.bouncycastle:bcpkix-jdk15on:jar:1.55
-Bouncy Castle Provider (http://www.bouncycastle.org/java.html) org.bouncycastle:bcprov-jdk15on:jar:1.55
-JCL 1.2 implemented over SLF4J (http://www.slf4j.org) org.slf4j:jcl-over-slf4j:jar:1.7.24
-JUL to SLF4J bridge (http://www.slf4j.org) org.slf4j:jul-to-slf4j:jar:1.7.24
-SLF4J API Module (http://www.slf4j.org) org.slf4j:slf4j-api:jar:1.7.25
-
-================================================================
-The COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.1
-================================================================
-
-The following components are provided under the CDDL 1.1 (http://glassfish.java.net/public/CDDL+GPL_1_1.html)
-
-jersey-core (https://jersey.java.net/jersey-core/) com.sun.jersey:jersey-core:jar:1.19.1
-Jersey Apache HTTP Client 4.x (https://jersey.java.net/jersey-contribs/jersey-apache-client4/) com.sun.jersey.contribs:jersey-apache-client4:jar:1.19.1
-javax.ws.rs-api (http://jax-rs-spec.java.net) javax.ws.rs:javax.ws.rs-api:jar:2.0.1
-jersey-client (https://jersey.java.net/jersey-client/) com.sun.jersey:jersey-client:jar:1.19.1
-Java Servlet API (http://servlet-spec.java.net) javax.servlet:javax.servlet-api:jar:3.1.0
-Expression Language 3.0 (http://el-spec.java.net) org.glassfish:javax.el:jar:3.0.0
-javax.transaction API (http://jta-spec.java.net) javax.transaction:javax.transaction-api:jar:1.2
-JSR 353 (JSON Processing) Default Provider (http://jsonp.java.net) org.glassfish:javax.json:bundle:1.0.4
-
-================================================================
-Public Domain
-================================================================
-
-The following components are provided under the Public Domain, per Creative Commons CC0 (http://creativecommons.org/publicdomain/zero/1.0/). See project link for details.
-
-HdrHistogram (http://hdrhistogram.github.io/HdrHistogram/) org.hdrhistogram:HdrHistogram:bundle:2.1.9
diff --git a/pom.xml b/pom.xml
index 4337849..3c980f0 100755
--- a/pom.xml
+++ b/pom.xml
@@ -614,6 +614,7 @@
<id>release</id>
<modules>
<module>saga-demo</module>
+ <module>saga-distribution</module>
</modules>
<build>
<plugins>
diff --git a/saga-distribution/pom.xml b/saga-distribution/pom.xml
index 08a6882..53cec79 100644
--- a/saga-distribution/pom.xml
+++ b/saga-distribution/pom.xml
@@ -67,10 +67,6 @@
<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>
@@ -82,13 +78,26 @@
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
+ <id>bin</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/bin.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ <execution>
+ <id>src</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
- <descriptor>src/assembly/assembly.xml</descriptor>
+ <descriptor>src/assembly/src.xml</descriptor>
</descriptors>
</configuration>
</execution>
diff --git a/saga-distribution/src/assembly/assembly.xml b/saga-distribution/src/assembly/bin.xml
similarity index 89%
rename from saga-distribution/src/assembly/assembly.xml
rename to saga-distribution/src/assembly/bin.xml
index fb7aaee..3eace53 100644
--- a/saga-distribution/src/assembly/assembly.xml
+++ b/saga-distribution/src/assembly/bin.xml
@@ -39,13 +39,21 @@
<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>
+ <!-- include the NOTICE and LICENSE file from release directory -->
+ <fileSet>
+ <directory>src/release</directory>
+ <outputDirectory>saga-distribution-${project.version}</outputDirectory>
+ <includes>
+ <include>NOTICE</include>
+ <include>LICENSE</include>
+ </includes>
+ </fileSet>
</fileSets>
<dependencySets>
<dependencySet>
diff --git a/saga-distribution/src/assembly/src.xml b/saga-distribution/src/assembly/src.xml
new file mode 100644
index 0000000..b951e89
--- /dev/null
+++ b/saga-distribution/src/assembly/src.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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>
+ <id>src</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <fileSets>
+ <!-- Binary Files -->
+ <fileSet>
+ <directory>..</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <!-- excludes the binary files -->
+ <excludes>
+ <exclude>**/eclipse-classes/**</exclude>
+ <exclude>**/target/**</exclude>
+ <exclude>**/build/**</exclude>
+ <exclude>**/eclipse-classes/**</exclude>
+ <exclude>**/.*</exclude>
+ <exclude>**/.*/**</exclude>
+
+ <exclude>**/surefire*</exclude>
+ <exclude>**/svn-commit*</exclude>
+
+ <exclude>**/.idea/**</exclude>
+ <exclude>**/*.iml</exclude>
+ <exclude>**/*.ipr</exclude>
+ <exclude>**/*.iws</exclude>
+
+ <exclude>**/cobertura.ser</exclude>
+
+ <exclude>**/node_modules/**</exclude>
+ </excludes>
+ </fileSet>
+
+ </fileSets>
+</assembly>
diff --git a/saga-distribution/src/release/LICENSE b/saga-distribution/src/release/LICENSE
new file mode 100644
index 0000000..0e4f36a
--- /dev/null
+++ b/saga-distribution/src/release/LICENSE
@@ -0,0 +1,203 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "{}"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright {yyyy} {name of copyright owner}
+
+ 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.
+
+===========================================================================
diff --git a/saga-distribution/src/release/NOTICE b/saga-distribution/src/release/NOTICE
new file mode 100644
index 0000000..a961677
--- /dev/null
+++ b/saga-distribution/src/release/NOTICE
@@ -0,0 +1,5 @@
+ServiceComb Saga
+Copyright 2017-2018 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
--
To stop receiving notification emails like this one, please contact
ningjiang@apache.org.