This is an automated email from the ASF dual-hosted git repository. ofuks pushed a commit to branch v2.3-RC1 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 724250dddcee37c61f78dbae282a6bb455bdccf6 Author: Oleh Fuks <olegfuk...@gmail.com> AuthorDate: Fri Apr 24 16:27:40 2020 +0300 updated copyright --- .../aws/ssn-k8s/main/files/ssn-policy.json.tpl | 20 ----------------- pom.xml | 1 + .../billing-aws/src/main/resources/application.yml | 21 ++++++++++++++++++ .../src/main/resources/application.yml | 21 ++++++++++++++++++ services/billing-gcp/billing.yml | 21 ++++++++++++++++++ .../dlab/billing/gcp/model/BillingHistory.java | 25 +++++++++++++++++++--- .../gcp/repository/BillingHistoryRepository.java | 19 ++++++++++++++++ .../billing-gcp/src/main/resources/application.yml | 21 ++++++++++++++++++ services/self-service/entrypoint.sh | 20 +++++++++++++++++ .../src/main/resources/webapp/browserslist | 23 +++++++++++++++++++- 10 files changed, 168 insertions(+), 24 deletions(-) diff --git a/infrastructure-provisioning/terraform/aws/ssn-k8s/main/files/ssn-policy.json.tpl b/infrastructure-provisioning/terraform/aws/ssn-k8s/main/files/ssn-policy.json.tpl index e75717d..e197744 100644 --- a/infrastructure-provisioning/terraform/aws/ssn-k8s/main/files/ssn-policy.json.tpl +++ b/infrastructure-provisioning/terraform/aws/ssn-k8s/main/files/ssn-policy.json.tpl @@ -1,23 +1,3 @@ -# ***************************************************************************** -# -# 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. -# -# ****************************************************************************** { "Version": "2012-10-17", "Statement": [ diff --git a/pom.xml b/pom.xml index b6808a8..46b9616 100644 --- a/pom.xml +++ b/pom.xml @@ -240,6 +240,7 @@ <exclude>**/*.ipynb</exclude> <exclude>**/*.iml</exclude> <exclude>**/*.json</exclude> + <exclude>**/*.json.tpl</exclude> <exclude>**/*.r</exclude> <exclude>**/__init__.py</exclude> <exclude>**/*.conf</exclude> diff --git a/services/billing-aws/src/main/resources/application.yml b/services/billing-aws/src/main/resources/application.yml index ece61aa..8bd3a4f 100644 --- a/services/billing-aws/src/main/resources/application.yml +++ b/services/billing-aws/src/main/resources/application.yml @@ -1,3 +1,24 @@ +# ***************************************************************************** +# +# 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. +# +# ****************************************************************************** + spring: main: allow-bean-definition-overriding: true diff --git a/services/billing-azure/src/main/resources/application.yml b/services/billing-azure/src/main/resources/application.yml index eba7073..482a78d 100644 --- a/services/billing-azure/src/main/resources/application.yml +++ b/services/billing-azure/src/main/resources/application.yml @@ -1,3 +1,24 @@ +# ***************************************************************************** +# +# 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. +# +# ****************************************************************************** + spring: main: allow-bean-definition-overriding: true diff --git a/services/billing-gcp/billing.yml b/services/billing-gcp/billing.yml index 87313c2..ecdcc45 100644 --- a/services/billing-gcp/billing.yml +++ b/services/billing-gcp/billing.yml @@ -1,3 +1,24 @@ +# ***************************************************************************** +# +# 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. +# +# ****************************************************************************** + spring: main: allow-bean-definition-overriding: true diff --git a/services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/model/BillingHistory.java b/services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/model/BillingHistory.java index 6abb2d9..a232ecc 100644 --- a/services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/model/BillingHistory.java +++ b/services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/model/BillingHistory.java @@ -1,3 +1,22 @@ +/* + * 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. + */ + package com.epam.dlab.billing.gcp.model; import lombok.AllArgsConstructor; @@ -7,7 +26,7 @@ import org.springframework.data.annotation.Id; @Data @AllArgsConstructor public class BillingHistory { - @Id - private String tableName; - private final long lastModified; + @Id + private String tableName; + private final long lastModified; } diff --git a/services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/repository/BillingHistoryRepository.java b/services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/repository/BillingHistoryRepository.java index c375904..957ced7 100644 --- a/services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/repository/BillingHistoryRepository.java +++ b/services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/repository/BillingHistoryRepository.java @@ -1,3 +1,22 @@ +/* + * 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. + */ + package com.epam.dlab.billing.gcp.repository; import com.epam.dlab.billing.gcp.model.BillingHistory; diff --git a/services/billing-gcp/src/main/resources/application.yml b/services/billing-gcp/src/main/resources/application.yml index b2fda5d..45bab37 100644 --- a/services/billing-gcp/src/main/resources/application.yml +++ b/services/billing-gcp/src/main/resources/application.yml @@ -1,3 +1,24 @@ +# ***************************************************************************** +# +# 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. +# +# ****************************************************************************** + spring: main: allow-bean-definition-overriding: true diff --git a/services/self-service/entrypoint.sh b/services/self-service/entrypoint.sh index f436c05..f2d7149 100644 --- a/services/self-service/entrypoint.sh +++ b/services/self-service/entrypoint.sh @@ -1,4 +1,24 @@ #!/bin/sh +# ***************************************************************************** +# +# 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. +# +# ****************************************************************************** checkfile () { if [ -s /root/step-certs/ca.crt ] diff --git a/services/self-service/src/main/resources/webapp/browserslist b/services/self-service/src/main/resources/webapp/browserslist index 8084853..ae0116f 100644 --- a/services/self-service/src/main/resources/webapp/browserslist +++ b/services/self-service/src/main/resources/webapp/browserslist @@ -1,3 +1,24 @@ +# ***************************************************************************** +# +# 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. +# +# ****************************************************************************** + # This file is used by the build system to adjust CSS and JS output to support the specified browsers below. # For additional information regarding the format and rule options, please see: # https://github.com/browserslist/browserslist#queries @@ -9,4 +30,4 @@ last 2 versions Firefox ESR not dead -not IE 9-11 # For IE 9-11 support, remove 'not'. \ No newline at end of file +not IE 9-11 # For IE 9-11 support, remove 'not'. --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org