SONARHTML-281 Prepare next development iteration

its/plugin/pom.xml

@@ -5,22 +5,19 @@
   <parent>
     <groupId>org.sonarsource.html</groupId>
     <artifactId>html-its</artifactId>
-    <version>3.18.0-SNAPSHOT</version>
+    <version>3.19.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>it-html-plugin</artifactId>
 
-  <name>SonarSource :: HTML :: ITs :: Plugin</name>
+  <name>SonarQube HTML Plugin :: ITs :: Plugin</name>
   <inceptionYear>2011</inceptionYear>
   <organization>
     <name>SonarSource</name>
     <url>http://www.sonarsource.com</url>
   </organization>
   <properties>
-    <license.name>AL2</license.name>
     <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
-    <license.owner>SonarSource SA and Matthijs Galesloot</license.owner>
-    <license.mailto>[email protected]</license.mailto>
     <gitRepositoryName>sonar-html</gitRepositoryName>
   </properties>
 

its/plugin/src/test/java/com/sonar/it/web/FileSuffixesTest.java

@@ -1,19 +1,18 @@
 /*
- * SonarSource :: HTML :: ITs :: Plugin
- * Copyright (c) 2011-2024 SonarSource SA and Matthijs Galesloot
- * sonarqube@googlegroups.com
+ * SonarQube HTML
+ * Copyright (C) 2011-2024 SonarSource SA
+ * mailto:info AT sonarsource DOT com
  *
- * 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
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the Sonar Source-Available License Version 1, as published by SonarSource SA.
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the Sonar Source-Available License for more details.
  *
- * 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.
+ * You should have received a copy of the Sonar Source-Available License
+ * along with this program; if not, see https://sonarsource.com/license/ssal/
  */
 package com.sonar.it.web;
 

its/plugin/src/test/java/com/sonar/it/web/HtmlTestSuite.java

@@ -1,19 +1,18 @@
 /*
- * SonarSource :: HTML :: ITs :: Plugin
- * Copyright (c) 2011-2024 SonarSource SA and Matthijs Galesloot
- * sonarqube@googlegroups.com
+ * SonarQube HTML
+ * Copyright (C) 2011-2024 SonarSource SA
+ * mailto:info AT sonarsource DOT com
  *
- * 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
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the Sonar Source-Available License Version 1, as published by SonarSource SA.
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the Sonar Source-Available License for more details.
  *
- * 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.
+ * You should have received a copy of the Sonar Source-Available License
+ * along with this program; if not, see https://sonarsource.com/license/ssal/
  */
 package com.sonar.it.web;
 

its/plugin/src/test/java/com/sonar/it/web/PhpFilesTest.java

@@ -1,19 +1,18 @@
 /*
- * SonarSource :: HTML :: ITs :: Plugin
- * Copyright (c) 2011-2024 SonarSource SA and Matthijs Galesloot
- * sonarqube@googlegroups.com
+ * SonarQube HTML
+ * Copyright (C) 2011-2024 SonarSource SA
+ * mailto:info AT sonarsource DOT com
  *
- * 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
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the Sonar Source-Available License Version 1, as published by SonarSource SA.
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the Sonar Source-Available License for more details.
  *
- * 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.
+ * You should have received a copy of the Sonar Source-Available License
+ * along with this program; if not, see https://sonarsource.com/license/ssal/
  */
 package com.sonar.it.web;
 

its/plugin/src/test/java/com/sonar/it/web/SonarLintTest.java

@@ -1,19 +1,18 @@
 /*
- * SonarSource :: HTML :: ITs :: Plugin
- * Copyright (c) 2011-2024 SonarSource SA and Matthijs Galesloot
- * sonarqube@googlegroups.com
+ * SonarQube HTML
+ * Copyright (C) 2011-2024 SonarSource SA
+ * mailto:info AT sonarsource DOT com
  *
- * 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
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the Sonar Source-Available License Version 1, as published by SonarSource SA.
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the Sonar Source-Available License for more details.
  *
- * 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.
+ * You should have received a copy of the Sonar Source-Available License
+ * along with this program; if not, see https://sonarsource.com/license/ssal/
  */
 package com.sonar.it.web;
 

its/plugin/src/test/java/com/sonar/it/web/StandardMeasuresTest.java

@@ -1,19 +1,18 @@
 /*
- * SonarSource :: HTML :: ITs :: Plugin
- * Copyright (c) 2011-2024 SonarSource SA and Matthijs Galesloot
- * sonarqube@googlegroups.com
+ * SonarQube HTML
+ * Copyright (C) 2011-2024 SonarSource SA
+ * mailto:info AT sonarsource DOT com
  *
- * 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
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the Sonar Source-Available License Version 1, as published by SonarSource SA.
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the Sonar Source-Available License for more details.
  *
- * 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.
+ * You should have received a copy of the Sonar Source-Available License
+ * along with this program; if not, see https://sonarsource.com/license/ssal/
  */
 package com.sonar.it.web;
 
@@ -70,9 +69,6 @@ public void testProjectMeasures() {
 
     assertThat(getProjectMeasureAsDouble("public_api")).isNull();
     assertThat(getProjectMeasureAsDouble("complexity")).isEqualTo(391d);
-    assertThat(getProjectMeasureAsDouble("function_complexity")).isNull();
-    assertThat(getProjectMeasureAsDouble("function_complexity_distribution")).isNull();
-    assertThat(getProjectMeasureAsDouble("file_complexity")).isEqualTo(3.8);
   }
 
   @Test
@@ -104,9 +100,6 @@ public void testFileMeasures() {
     assertThat(getFileMeasureAsDouble("duplicated_lines_density")).isZero();
     assertThat(getFileMeasureAsDouble("statements")).isNull();
     assertThat(getFileMeasureAsDouble("complexity")).isEqualTo(16d);
-    assertThat(getFileMeasureAsDouble("function_complexity")).isNull();
-    assertThat(getFileMeasureAsDouble("function_complexity_distribution")).isNull();
-    assertThat(getFileMeasureAsDouble("file_complexity")).isEqualTo(16.0d);
   }
 
   @Test

its/plugin/src/test/java/com/sonar/it/web/VariousTest.java

@@ -1,19 +1,18 @@
 /*
- * SonarSource :: HTML :: ITs :: Plugin
- * Copyright (c) 2011-2024 SonarSource SA and Matthijs Galesloot
- * sonarqube@googlegroups.com
+ * SonarQube HTML
+ * Copyright (C) 2011-2024 SonarSource SA
+ * mailto:info AT sonarsource DOT com
  *
- * 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
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the Sonar Source-Available License Version 1, as published by SonarSource SA.
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the Sonar Source-Available License for more details.
  *
- * 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.
+ * You should have received a copy of the Sonar Source-Available License
+ * along with this program; if not, see https://sonarsource.com/license/ssal/
  */
 package com.sonar.it.web;
 

its/pom.xml

@@ -6,11 +6,11 @@
   <parent>
     <groupId>org.sonarsource.html</groupId>
     <artifactId>html</artifactId>
-    <version>3.18.0-SNAPSHOT</version>
+    <version>3.19.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>html-its</artifactId>
-  <name>SonarSource :: Web :: ITs</name>
+  <name>SonarQube HTML Plugin :: ITs</name>
   <packaging>pom</packaging>
 
   <modules>

its/ruling/pom.xml

@@ -4,27 +4,22 @@
   <parent>
     <groupId>org.sonarsource.html</groupId>
     <artifactId>html-its</artifactId>
-    <version>3.18.0-SNAPSHOT</version>
+    <version>3.19.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>it-html-ruling</artifactId>
 
-  <name>SonarSource :: HTML :: ITs :: Ruling</name>
+  <name>SonarQube HTML Plugin :: ITs :: Ruling</name>
   <inceptionYear>2013</inceptionYear>
   <organization>
     <name>SonarSource</name>
     <url>http://www.sonarsource.com</url>
   </organization>
 
   <properties>
-    <license.name>AL2</license.name>
     <webVersion>2.2-SNAPSHOT</webVersion>
-
     <surefire.argLine>-server -Xmx512m</surefire.argLine>
-    <license.owner>SonarSource SA and Matthijs Galesloot</license.owner>
-    <license.mailto>[email protected]</license.mailto>
     <gitRepositoryName>sonar-html</gitRepositoryName>
-
     <gson.version>2.10</gson.version>
   </properties>
 

its/ruling/src/test/java/org/sonar/web/it/WebRulingTest.java

@@ -1,19 +1,18 @@
 /*
- * SonarSource :: HTML :: ITs :: Ruling
- * Copyright (c) 2013-2024 SonarSource SA and Matthijs Galesloot
- * sonarqube@googlegroups.com
+ * SonarQube HTML
+ * Copyright (C) 2013-2024 SonarSource SA
+ * mailto:info AT sonarsource DOT com
  *
- * 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
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the Sonar Source-Available License Version 1, as published by SonarSource SA.
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the Sonar Source-Available License for more details.
  *
- * 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.
+ * You should have received a copy of the Sonar Source-Available License
+ * along with this program; if not, see https://sonarsource.com/license/ssal/
  */
 package org.sonar.web.it;
 

pom.xml

@@ -11,16 +11,16 @@
 
   <groupId>org.sonarsource.html</groupId>
   <artifactId>html</artifactId>
-  <version>3.18.0-SNAPSHOT</version>
+  <version>3.19.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
-  <name>SonarSource :: HTML</name>
+  <name>SonarQube HTML Plugin</name>
 
   <url>http://redirect.sonarsource.com/plugins/web.html</url>
 
   <inceptionYear>2010</inceptionYear>
   <organization>
-    <name>SonarSource and Matthijs Galesloot</name>
+    <name>SonarSource</name>
   </organization>
   <licenses>
     <license>
@@ -65,7 +65,7 @@
 
   <properties>
     <revision>3.5-SNAPSHOT</revision>
-    <license.owner>SonarSource SA and Matthijs Galesloot</license.owner>
+    <license.title>SonarQube HTML</license.title>
     <gitRepositoryName>sonar-html</gitRepositoryName>
 
     <jakarta.el.version>4.0.2</jakarta.el.version>

sonar-html-plugin/pom.xml

@@ -5,24 +5,16 @@
   <parent>
     <groupId>org.sonarsource.html</groupId>
     <artifactId>html</artifactId>
-    <version>3.18.0-SNAPSHOT</version>
+    <version>3.19.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>sonar-html-plugin</artifactId>
   <packaging>sonar-plugin</packaging>
 
-  <name>SonarSource HTML analyzer :: Sonar Plugin</name>
+  <name>SonarQube HTML Plugin :: Sonar Plugin</name>
   <description>Code analyzer for HTML</description>
   <url>http://redirect.sonarsource.com/plugins/web.html</url>
 
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-
   <scm>
     <connection>scm:git:[email protected]:SonarSource/sonar-html.git</connection>
     <developerConnection>scm:git:[email protected]:SonarSource/sonar-html.git</developerConnection>

sonar-html-plugin/src/main/java/org/sonar/plugins/html/HtmlPlugin.java

@@ -1,6 +1,6 @@
 /*
- * SonarSource HTML analyzer :: Sonar Plugin
- * Copyright (C) 2010-2024 SonarSource SA and Matthijs Galesloot
+ * SonarQube HTML
+ * Copyright (C) 2010-2024 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or
@@ -31,8 +31,7 @@
 /**
  * HTML Plugin publishes extensions to sonar engine.
  *
- * @author Matthijs Galesloot
- * @since 1.0
+
  */
 public final class HtmlPlugin implements Plugin {
 

sonar-html-plugin/src/main/java/org/sonar/plugins/html/analyzers/ComplexityVisitor.java

@@ -1,6 +1,6 @@
 /*
- * SonarSource HTML analyzer :: Sonar Plugin
- * Copyright (C) 2010-2024 SonarSource SA and Matthijs Galesloot
+ * SonarQube HTML
+ * Copyright (C) 2010-2024 SonarSource SA
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or