You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2020/05/04 15:03:21 UTC
[tomcat] branch master updated: Add missing ALv2 headers
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 8825fa2 Add missing ALv2 headers
8825fa2 is described below
commit 8825fa20b19b4a979dee34a7b687b67813f69431
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon May 4 16:03:02 2020 +0100
Add missing ALv2 headers
I'm expecting that IDEA will accept these files with a prolog and
comment header but if not, we can remove them and add them to the
excludes list for checking.
---
res/ide-support/idea/ant.xml | 16 ++++++++++++++++
res/ide-support/idea/codeStyles/Project.xml | 17 +++++++++++++++++
res/ide-support/idea/codeStyles/codeStyleConfig.xml | 17 +++++++++++++++++
res/ide-support/idea/copyright/Tomcat.xml | 17 +++++++++++++++++
res/ide-support/idea/copyright/profiles_settings.xml | 17 +++++++++++++++++
res/ide-support/idea/externalDependencies.xml | 16 ++++++++++++++++
.../idea/inspectionProfiles/Project_Default.xml | 17 +++++++++++++++++
7 files changed, 117 insertions(+)
diff --git a/res/ide-support/idea/ant.xml b/res/ide-support/idea/ant.xml
index a2a4769..ac834d1 100644
--- a/res/ide-support/idea/ant.xml
+++ b/res/ide-support/idea/ant.xml
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<project version="4">
<component name="AntConfiguration">
<buildFile url="file://$PROJECT_DIR$/build.xml" />
diff --git a/res/ide-support/idea/codeStyles/Project.xml b/res/ide-support/idea/codeStyles/Project.xml
index 54fe072..adf710b 100644
--- a/res/ide-support/idea/codeStyles/Project.xml
+++ b/res/ide-support/idea/codeStyles/Project.xml
@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<component name="ProjectCodeStyleConfiguration">
<code_scheme name="Project" version="173">
<codeStyleSettings language="JAVA">
diff --git a/res/ide-support/idea/codeStyles/codeStyleConfig.xml b/res/ide-support/idea/codeStyles/codeStyleConfig.xml
index 79ee123..c81df23 100644
--- a/res/ide-support/idea/codeStyles/codeStyleConfig.xml
+++ b/res/ide-support/idea/codeStyles/codeStyleConfig.xml
@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<component name="ProjectCodeStyleConfiguration">
<state>
<option name="USE_PER_PROJECT_SETTINGS" value="true" />
diff --git a/res/ide-support/idea/copyright/Tomcat.xml b/res/ide-support/idea/copyright/Tomcat.xml
index 2982350..d9e4548 100644
--- a/res/ide-support/idea/copyright/Tomcat.xml
+++ b/res/ide-support/idea/copyright/Tomcat.xml
@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<component name="CopyrightManager">
<copyright>
<option name="notice" value="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.apac [...]
diff --git a/res/ide-support/idea/copyright/profiles_settings.xml b/res/ide-support/idea/copyright/profiles_settings.xml
index 0970355..ebc13c1 100644
--- a/res/ide-support/idea/copyright/profiles_settings.xml
+++ b/res/ide-support/idea/copyright/profiles_settings.xml
@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<component name="CopyrightManager">
<settings default="Tomcat" />
</component>
\ No newline at end of file
diff --git a/res/ide-support/idea/externalDependencies.xml b/res/ide-support/idea/externalDependencies.xml
index eade272..11f0751 100644
--- a/res/ide-support/idea/externalDependencies.xml
+++ b/res/ide-support/idea/externalDependencies.xml
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<project version="4">
<component name="ExternalDependencies">
<plugin id="AntSupport" />
diff --git a/res/ide-support/idea/inspectionProfiles/Project_Default.xml b/res/ide-support/idea/inspectionProfiles/Project_Default.xml
index 38495a4..dd01fa3 100644
--- a/res/ide-support/idea/inspectionProfiles/Project_Default.xml
+++ b/res/ide-support/idea/inspectionProfiles/Project_Default.xml
@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<component name="InspectionProjectProfileManager">
<profile version="1.0">
<option name="myName" value="Project Default" />
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org