Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(java): relax license header replacement regex and use current year #383

Merged
merged 3 commits into from
Jan 22, 2020
Merged

fix(java): relax license header replacement regex and use current year #383

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
50ddc7d
fix(java): relax license header replacement regex and use current year
chingor13 Jan 22, 2020
d388724
fix: hardcode 2020 as the license year
chingor13 Jan 22, 2020
d18382b
chore: remove unused import
chingor13 Jan 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions synthtool/languages/java.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
DEFAULT_FORMAT_VERSION = "1.7"
GOOD_LICENSE = """
/*
* Copyright 2019 Google LLC
* Copyright 2020 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -45,7 +45,7 @@
"""
PROTOBUF_HEADER = "// Generated by the protocol buffer compiler. DO NOT EDIT!"
BAD_LICENSE = """/\\*
\\* Copyright 2018 Google LLC
\\* Copyright \\d{4} Google LLC
\\*
\\* 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
Expand Down Expand Up @@ -96,6 +96,7 @@ def fix_proto_headers(proto_root: Path) -> None:
PROTOBUF_HEADER,
f"{GOOD_LICENSE}{PROTOBUF_HEADER}",
)
# https://github.com/googleapis/gapic-generator/issues/3074
s.replace(
[proto_root / "src/**/*Name.java", proto_root / "src/**/*Names.java"],
BAD_LICENSE,
Expand Down