Skip to content

Commit

Permalink
Fix license issues to release 1.2.3
Browse files Browse the repository at this point in the history
  • Loading branch information
ShannonDing committed Aug 21, 2019
1 parent 32fb1c8 commit b782163
Show file tree
Hide file tree
Showing 5 changed files with 56 additions and 5 deletions.
14 changes: 14 additions & 0 deletions .travis/check-git-clang-format.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
# 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.

#!/bin/bash

if [ "$TRAVIS_PULL_REQUEST" = "true" ]; then
Expand Down
11 changes: 7 additions & 4 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -355,10 +355,13 @@ ExecutionTesting()

PackageRocketMQStatic()
{
#packet libevent,jsoncpp,boost,rocketmq,Signature to one librocketmq.a
cp -f ${basepath}/libs/signature/lib/libSignature.a ${install_lib_dir}/lib
ar -M < ${basepath}/package_rocketmq.mri
cp -f librocketmq.a ${install_lib_dir}
if test "$(uname)" = "Linux"; then
echo "package static library."
#packet libevent,jsoncpp,boost,rocketmq,Signature to one librocketmq.a
cp -f ${basepath}/libs/signature/lib/libSignature.a ${install_lib_dir}/lib
ar -M < ${basepath}/package_rocketmq.mri
cp -f librocketmq.a ${install_lib_dir}
fi
}

PrintParams
Expand Down
2 changes: 1 addition & 1 deletion distribution/LICENSE-BIN
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@
limitations under the License.

------
This product has a bundle disruptor--, which is available under its own License.
This product has a bundle disruptor--, which is available under BSD License.
The source code of disruptor-- can be found at https://github.com/fsaintjacques/disruptor--.

Copyright (c) 2011, François Saint-Jacques
Expand Down
17 changes: 17 additions & 0 deletions include/BatchMessage.h
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
/*
* 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.
*/

#ifndef __BATCHMESSAGE_H__
#define __BATCHMESSAGE_H__
#include "MQMessage.h"
Expand Down
17 changes: 17 additions & 0 deletions src/message/BatchMessage.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
/*
* 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.
*/

#include "BatchMessage.h"
#include "MQDecoder.h"
#include "StringIdMaker.h"
Expand Down

0 comments on commit b782163

Please sign in to comment.