Skip to content

Commit

Permalink
SCB-1363 update licenses and notice
Browse files Browse the repository at this point in the history
Signed-off-by: kakulisen <[email protected]>
  • Loading branch information
kakulisen authored and WillemJiang committed Jul 9, 2019
1 parent b87bf2f commit 72d2fa0
Show file tree
Hide file tree
Showing 22 changed files with 75 additions and 923 deletions.
5 changes: 2 additions & 3 deletions ...ase/licenses/NOTICE-maven-aether-provider → NOTICE
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@

Maven Aether Provider
Copyright 2001-2014 The Apache Software Foundation
Apache ServiceComb Toolkit
Copyright 2019-present The Apache Software Foundation

This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
35 changes: 35 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,20 @@
</license>
</licenses>

<developers>
<developer>
<name>The ServiceComb Developer Team</name>
<email>[email protected]</email>
</developer>
</developers>

<organization>
<name>The Apache Software Foundation</name>
<url>http://www.apache.org/</url>
</organization>

<inceptionYear>2019</inceptionYear>

<modules>
<module>codegen</module>
<module>cli</module>
Expand Down Expand Up @@ -215,6 +229,27 @@
</excludes>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
<executions>
<execution>
<id>process-resource-bundles</id>
<goals>
<goal>process</goal>
</goals>
<configuration>
<resourceBundles>
<resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
<resourceBundle>org.apache:apache-incubator-disclaimer-resource-bundle:1.1</resourceBundle>
</resourceBundles>
<properties>
<projectName>Apache ServiceComb</projectName>
</properties>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

Expand Down
285 changes: 37 additions & 248 deletions toolkit-distribution/release/LICENSE

Large diffs are not rendered by default.

41 changes: 1 addition & 40 deletions toolkit-distribution/release/NOTICE
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Apache ServiceComb Toolkit
Copyright 2017-2019 The Apache Software Foundation
Copyright 2019-present The Apache Software Foundation

This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Expand All @@ -18,36 +18,6 @@ Copyright 2001-2014 The Apache Software Foundation
This product includes software from the Spring Framework,
under the Apache License 2.0 (see: StringUtils.containsWhitespace())

================================================================
Notice for Netty

See licenses/NOTICE-netty

================================================================
Notice for Eclipse aether

See licenses/NOTICE-eclipse-aether

================================================================
Notice for Apache maven

See licenses/NOTICE-maven

================================================================
Notice for plexus-cipher

See licenses/NOTICE-plexus-cipher

================================================================
Notice for plexus-utils

See licenses/NOTICE-plexus-utils

================================================================
Notice for Byte Buddy

See licenses/NOTICE-bytebuddy

================================================================
Notice for Airline

Expand All @@ -62,12 +32,3 @@ See licenses/NOTICE-apache-commons-cli
Notice for Apache ServiceComb Java Chassis

See licenses/NOTICE-servicecomb-java-chassis

================================================================
Notice for maven-aether-provider

See licenses/NOTICE-maven-aether-provider




21 changes: 0 additions & 21 deletions toolkit-distribution/release/licenses/LICCENSE-mockito

This file was deleted.

27 changes: 0 additions & 27 deletions toolkit-distribution/release/licenses/LICENSE-asm

This file was deleted.

9 changes: 0 additions & 9 deletions toolkit-distribution/release/licenses/LICENSE-bouncycastle

This file was deleted.

47 changes: 0 additions & 47 deletions toolkit-distribution/release/licenses/LICENSE-classworlds

This file was deleted.

12 changes: 0 additions & 12 deletions toolkit-distribution/release/licenses/LICENSE-edl

This file was deleted.

Loading

0 comments on commit 72d2fa0

Please sign in to comment.