Skip to content

Commit

Permalink
SCB-260 Correct LICENSE/NOTICE for src/binary release
Browse files Browse the repository at this point in the history
Use different set of LICENCE/NOTICE files for src/binary release.
Also modified the distribution module to pack both the source and
binary package.
  • Loading branch information
yangbor committed Mar 6, 2018
1 parent a37e2b4 commit 3217fa0
Show file tree
Hide file tree
Showing 18 changed files with 3,814 additions and 143 deletions.
29 changes: 29 additions & 0 deletions LICENSE
Expand Up @@ -199,3 +199,32 @@
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.

=======================================================================
Apache ServiceComb Java Chassis Subcomponents:

The Apache ServiceComb Java Chassis project contains subcomponents with
separate copyright notices and license terms. Your use of the source
for these subcomponents is subject to the terms and conditions of the
following licenses.


================================================================
For foundations/foundation-vertx/src/main/java/io/vertx/ext/web/impl/MimeTypesUtils.java
transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/RestBodyHandler.java
================================================================
This product bundles files from vertx which is licensed under the Apache License v2.
For details, see https://github.com/vert-x3/vertx-web


================================================================
For swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/extend/property/AbstractBaseIntegerProperty.java
================================================================
This product bundles files from swagger which is licensed under the Apache License v2.
For details, see https://github.com/swagger-api/swagger-core

================================================================
For handlers/handler-bizkeeper/src/main/java/org/apache/servicecomb/bizkeeper/HystrixCommandPropertiesExt.java
================================================================
This product bundles files from swagger which is licensed under the Apache License v2.
For details, see https://github.com/Netflix/Hystrix
141 changes: 2 additions & 139 deletions NOTICE
@@ -1,142 +1,5 @@
Apache ServiceComb
Copyright 2018 The Apache Software Foundation
Apache ServiceComb Java Chassis
Copyright 2017-2018 The Apache Software Foundation

This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).


================================================================
The 2-Clause BSD License
================================================================

The following components are provided under the The BSD License (http://www.opensource.org/licenses/bsd-license.php). See project link for details.

Stax2 API (http://wiki.fasterxml.com/WoodstoxStax2) org.codehaus.woodstox:stax2-api:bundle:3.1.4

================================================================
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.8
Logback Core Module (http://logback.qos.ch/logback-core) ch.qos.logback:logback-core:jar:1.1.7
Logback Classic Module (http://logback.qos.ch/logback-classic) ch.qos.logback:logback-classic:jar:1.1.7

================================================================
COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.1
================================================================

The following components are provided under the CDDL 1.1 (https://javaee.github.io/glassfish/LICENSE). See project link for details.

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

================================================================
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

================================================================
The MIT License
================================================================

The following components are provided under the Bouncy Castle Licence (http://www.bouncycastle.org/licence.html). 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
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.7
JCL 1.2 implemented over SLF4J (http://www.slf4j.org) org.slf4j:jcl-over-slf4j:jar:1.7.24

================================================================
Common Development and Distribution License 1.0
================================================================

The following components are provided under the CDDL License (http://www.opensource.org/licenses/cddl1.php). See project link for details.

jsr311-api (https://jsr311.dev.java.net) javax.ws.rs:jsr311-api:jar:1.1.1

================================================================
The 3-Clause BSD License
================================================================

The following components are provided under the BSD (http://asm.objectweb.org/license.html). See project link for details.

ASM Core (http://asm.objectweb.org/asm/) org.ow2.asm:asm:jar:5.0.4

================================================================
For foundations/foundation-vertx/src/main/java/io/vertx/ext/web/impl/MimeTypesUtils.java
(Forked from https://github.com/vert-x3/vertx-web/blob/927ed057ddc028eb09a168db621de3d72fd85ed4/vertx-web/src/main/java/io/vertx/ext/web/impl/Utils.java)

Copyright 2014 Red Hat, Inc.

All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
and Apache License v2.0 which accompanies this distribution.

The Eclipse Public License is available at
http://www.eclipse.org/legal/epl-v10.html

The Apache License v2.0 is available at
http://www.opensource.org/licenses/apache2.0.php

You may elect to redistribute this code under either of these licenses.

================================================================
For swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/extend/property/AbstractBaseIntegerProperty.java
(Forked from https://github.com/swagger-api/swagger-core/blob/master/modules/swagger-models/src/main/java/io/swagger/models/properties/IntegerProperty.java)

Copyright 2016 SmartBear Software

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 [apache.org/licenses/LICENSE-2.0](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.

================================================================
For transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/RestBodyHandler.java
(Forked from https://github.com/vert-x3/vertx-web/blob/master/vertx-web/src/main/java/io/vertx/ext/web/handler/impl/BodyHandlerImpl.java)

Copyright 2014 Red Hat, Inc.

All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
and Apache License v2.0 which accompanies this distribution.

The Eclipse Public License is available at
http://www.eclipse.org/legal/epl-v10.html

The Apache License v2.0 is available at
http://www.opensource.org/licenses/apache2.0.php

You may elect to redistribute this code under either of these licenses.

================================================================
For handlers/handler-bizkeeper/src/main/java/org/apache/servicecomb/bizkeeper/HystrixCommandPropertiesExt.java
(Forked from https://github.com/Netflix/Hystrix/blob/master/hystrix-core/src/main/java/com/netflix/hystrix/HystrixCommandProperties.java)

Copyright 2012 Netflix, Inc.

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.
15 changes: 14 additions & 1 deletion java-chassis-distribution/pom.xml
Expand Up @@ -187,13 +187,26 @@
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<id>bin</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
<descriptor>src/assembly/assembly.xml</descriptor>
<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/src.xml</descriptor>
</descriptors>
</configuration>
</execution>
Expand Down
Expand Up @@ -18,7 +18,7 @@
<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>assembly</id>
<id>bin</id>
<formats>
<format>zip</format>
</formats>
Expand All @@ -35,12 +35,19 @@
<directory>../</directory>
<outputDirectory>java-chassis-distribution-${project.version}</outputDirectory>
<includes>
<include>NOTICE</include>
<include>LICENSE</include>
<include>DISCLAIMER</include>
<include>README.md</include>
</includes>
</fileSet>
<fileSet>
<directory>src/release</directory>
<outputDirectory>java-chassis-distribution-${project.version}</outputDirectory>
<includes>
<include>NOTICE</include>
<include>LICENSE</include>
<include>licenses/**</include>
</includes>
</fileSet>
</fileSets>
<dependencySets>
<dependencySet>
Expand Down
55 changes: 55 additions & 0 deletions java-chassis-distribution/src/assembly/src.xml
@@ -0,0 +1,55 @@
<!--
~ 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>src</id>
<formats>
<format>zip</format>
</formats>
<fileSets>
<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>

0 comments on commit 3217fa0

Please sign in to comment.