You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuweni.apache.org by to...@apache.org on 2019/08/26 05:25:55 UTC
[incubator-tuweni] 02/02: Fix source provenance and header
This is an automated email from the ASF dual-hosted git repository.
toulmean pushed a commit to branch 0.8
in repository https://gitbox.apache.org/repos/asf/incubator-tuweni.git
commit 209b8fd5fc95c5bfe9b0f04ce2fd31a29c2647de
Author: Antoine Toulme <an...@lunar-ocean.com>
AuthorDate: Sun Aug 25 22:25:35 2019 -0700
Fix source provenance and header
---
LICENSE | 4 ----
build.gradle | 1 +
.../java/org/apache/tuweni/crypto/SECP256K1.java | 23 ++++++++++++----------
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/LICENSE b/LICENSE
index 28adb90..54513df 100644
--- a/LICENSE
+++ b/LICENSE
@@ -418,7 +418,3 @@ THE SOFTWARE.
------------------------------------------------------------------------------------
This product includes code (crypto/src/main/java/org/apache/tuweni/crypto/SECP256K1.java) adapted from BitcoinJ ECKey (https://github.com/bitcoinj/bitcoinj).
License: Apache License v2.0 (https://www.apache.org/licenses/LICENSE-2.0.html)
-
-------------------------------------------------------------------------------------
-This product includes code (crypto/src/main/java/org/apache/tuweni/crypto/SECP256K1.java) adapted from web3j (https://github.com/web3j/web3j).
-License: Apache License v2.0 (https://www.apache.org/licenses/LICENSE-2.0.html)
diff --git a/build.gradle b/build.gradle
index a4178ea..4855812 100644
--- a/build.gradle
+++ b/build.gradle
@@ -143,6 +143,7 @@ subprojects {
target project.fileTree(project.projectDir) {
include '**/*.java'
exclude '**/generated-src/**/*.*'
+ exclude '**/SECP256K1.java'
}
removeUnusedImports()
licenseHeaderFile rootProject.file('gradle/spotless.license.txt')
diff --git a/crypto/src/main/java/org/apache/tuweni/crypto/SECP256K1.java b/crypto/src/main/java/org/apache/tuweni/crypto/SECP256K1.java
index 42a2758..b0cf48f 100644
--- a/crypto/src/main/java/org/apache/tuweni/crypto/SECP256K1.java
+++ b/crypto/src/main/java/org/apache/tuweni/crypto/SECP256K1.java
@@ -1,14 +1,19 @@
/*
- * 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
+ * Copyright 2011 Google Inc.
+ * Copyright 2014 Andreas Schildbach
+ * Copyright 2014-2016 the libsecp256k1 contributors
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * 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
*
- * 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.
+ * 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.
*/
package org.apache.tuweni.crypto;
@@ -63,8 +68,6 @@ import org.bouncycastle.math.ec.custom.sec.SecP256K1Curve;
* Adapted from the BitcoinJ ECKey (Apache 2 License) implementation:
* https://github.com/bitcoinj/bitcoinj/blob/master/core/src/main/java/org/bitcoinj/core/ECKey.java
*
- * Adapted from the web3j (Apache 2 License) implementations:
- * https://github.com/web3j/web3j/crypto/src/main/java/org/web3j/crypto/*.java
*/
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@tuweni.apache.org
For additional commands, e-mail: commits-help@tuweni.apache.org