Skip to content

Commit

Permalink
[apache#4040] Update Rat check to ignore Datastrato headers (apache#4044
Browse files Browse the repository at this point in the history
)

### What changes were proposed in this pull request?

No longer accept Datastrato headers.

### Why are the changes needed?

See above.

Fix: apache#4040 

### Does this PR introduce _any_ user-facing change?

No.

### How was this patch tested?

Note that until all file headers have changed the Rat test will not
pass. I made it a separate PR for easy review.
  • Loading branch information
justinmclean authored Jul 3, 2024
1 parent bee0bb0 commit 3711113
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 7 deletions.
21 changes: 16 additions & 5 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,20 @@
/*
* Copyright 2023 Datastrato Pvt Ltd.
* This software is licensed under the Apache License version 2.
* 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.
*/
import com.github.gradle.node.NodeExtension
import com.github.gradle.node.NodePlugin
Expand Down Expand Up @@ -440,9 +454,6 @@ subprojects {
}

tasks.rat {
substringMatcher("DS", "Datastrato", "Copyright 2023 Datastrato Pvt Ltd.")
substringMatcher("DS", "Datastrato", "Copyright 2024 Datastrato Pvt Ltd.")
approvedLicense("Datastrato")
approvedLicense("Apache License Version 2.0")

// Set input directory to that of the root project instead of the CWD. This
Expand Down
18 changes: 16 additions & 2 deletions clients/client-python/tests/integration/test_catalog.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,20 @@
"""
Copyright 2024 Datastrato Pvt Ltd.
This software is licensed under the Apache License version 2.
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.
"""

import logging
Expand Down

0 comments on commit 3711113

Please sign in to comment.