Upgrade to parent 26 and new copyright headers

19 files changed, 76 insertions, 87 deletions

diff --git a/sonar-db/src/main/java/org/sonar/db/issue/ActionPlanDao.java b/sonar-db/src/main/java/org/sonar/db/issue/ActionPlanDao.java
index fed8d421950..c6d9ceaf232 100644
--- a/sonar-db/src/main/java/org/sonar/db/issue/ActionPlanDao.java
+++ b/sonar-db/src/main/java/org/sonar/db/issue/ActionPlanDao.java
@@ -1,14 +1,14 @@
 /*
- * SonarQube, open source software quality management tool.
- * Copyright (C) 2008-2014 SonarSource
+ * SonarQube :: Database
+ * Copyright (C) 2009-2016 SonarSource SA
  * mailto:contact AT sonarsource DOT com
  *
- * SonarQube is free software; you can redistribute it and/or
+ * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 3 of the License, or (at your option) any later version.
  *
- * SonarQube is distributed in the hope that it will be useful,
+ * 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 GNU
  * Lesser General Public License for more details.
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-
 package org.sonar.db.issue;
 
 import com.google.common.base.Function;
diff --git a/sonar-db/src/main/java/org/sonar/db/issue/ActionPlanDto.java b/sonar-db/src/main/java/org/sonar/db/issue/ActionPlanDto.java
index bd132c391db..a374efe4d4b 100644
--- a/sonar-db/src/main/java/org/sonar/db/issue/ActionPlanDto.java
+++ b/sonar-db/src/main/java/org/sonar/db/issue/ActionPlanDto.java
@@ -1,14 +1,14 @@
 /*
- * SonarQube, open source software quality management tool.
- * Copyright (C) 2008-2014 SonarSource
+ * SonarQube :: Database
+ * Copyright (C) 2009-2016 SonarSource SA
  * mailto:contact AT sonarsource DOT com
  *
- * SonarQube is free software; you can redistribute it and/or
+ * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 3 of the License, or (at your option) any later version.
  *
- * SonarQube is distributed in the hope that it will be useful,
+ * 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 GNU
  * Lesser General Public License for more details.
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-
 package org.sonar.db.issue;
 
 import java.util.Date;
diff --git a/sonar-db/src/main/java/org/sonar/db/issue/ActionPlanMapper.java b/sonar-db/src/main/java/org/sonar/db/issue/ActionPlanMapper.java
index b8df2a11a58..1f123a79054 100644
--- a/sonar-db/src/main/java/org/sonar/db/issue/ActionPlanMapper.java
+++ b/sonar-db/src/main/java/org/sonar/db/issue/ActionPlanMapper.java
@@ -1,14 +1,14 @@
 /*
- * SonarQube, open source software quality management tool.
- * Copyright (C) 2008-2014 SonarSource
+ * SonarQube :: Database
+ * Copyright (C) 2009-2016 SonarSource SA
  * mailto:contact AT sonarsource DOT com
  *
- * SonarQube is free software; you can redistribute it and/or
+ * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 3 of the License, or (at your option) any later version.
  *
- * SonarQube is distributed in the hope that it will be useful,
+ * 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 GNU
  * Lesser General Public License for more details.
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-
 package org.sonar.db.issue;
 
 import java.util.List;
diff --git a/sonar-db/src/main/java/org/sonar/db/issue/ActionPlanStatsDao.java b/sonar-db/src/main/java/org/sonar/db/issue/ActionPlanStatsDao.java
index 57aa87a1dd3..11f7b07b5ab 100644
--- a/sonar-db/src/main/java/org/sonar/db/issue/ActionPlanStatsDao.java
+++ b/sonar-db/src/main/java/org/sonar/db/issue/ActionPlanStatsDao.java
@@ -1,14 +1,14 @@
 /*
- * SonarQube, open source software quality management tool.
- * Copyright (C) 2008-2014 SonarSource
+ * SonarQube :: Database
+ * Copyright (C) 2009-2016 SonarSource SA
  * mailto:contact AT sonarsource DOT com
  *
- * SonarQube is free software; you can redistribute it and/or
+ * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 3 of the License, or (at your option) any later version.
  *
- * SonarQube is distributed in the hope that it will be useful,
+ * 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 GNU
  * Lesser General Public License for more details.
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-
 package org.sonar.db.issue;
 
 import java.util.List;
diff --git a/sonar-db/src/main/java/org/sonar/db/issue/ActionPlanStatsDto.java b/sonar-db/src/main/java/org/sonar/db/issue/ActionPlanStatsDto.java
index 925306560b2..e4ae5787752 100644
--- a/sonar-db/src/main/java/org/sonar/db/issue/ActionPlanStatsDto.java
+++ b/sonar-db/src/main/java/org/sonar/db/issue/ActionPlanStatsDto.java
@@ -1,14 +1,14 @@
 /*
- * SonarQube, open source software quality management tool.
- * Copyright (C) 2008-2014 SonarSource
+ * SonarQube :: Database
+ * Copyright (C) 2009-2016 SonarSource SA
  * mailto:contact AT sonarsource DOT com
  *
- * SonarQube is free software; you can redistribute it and/or
+ * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 3 of the License, or (at your option) any later version.
  *
- * SonarQube is distributed in the hope that it will be useful,
+ * 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 GNU
  * Lesser General Public License for more details.
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-
 package org.sonar.db.issue;
 
 import java.util.Date;
diff --git a/sonar-db/src/main/java/org/sonar/db/issue/ActionPlanStatsMapper.java b/sonar-db/src/main/java/org/sonar/db/issue/ActionPlanStatsMapper.java
index 26c3395a0f7..4d1f63f42bd 100644
--- a/sonar-db/src/main/java/org/sonar/db/issue/ActionPlanStatsMapper.java
+++ b/sonar-db/src/main/java/org/sonar/db/issue/ActionPlanStatsMapper.java
@@ -1,14 +1,14 @@
 /*
- * SonarQube, open source software quality management tool.
- * Copyright (C) 2008-2014 SonarSource
+ * SonarQube :: Database
+ * Copyright (C) 2009-2016 SonarSource SA
  * mailto:contact AT sonarsource DOT com
  *
- * SonarQube is free software; you can redistribute it and/or
+ * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 3 of the License, or (at your option) any later version.
  *
- * SonarQube is distributed in the hope that it will be useful,
+ * 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 GNU
  * Lesser General Public License for more details.
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-
 package org.sonar.db.issue;
 
 import java.util.List;
diff --git a/sonar-db/src/main/java/org/sonar/db/issue/IssueChangeDao.java b/sonar-db/src/main/java/org/sonar/db/issue/IssueChangeDao.java
index 7a3f7bc686d..627f2798bf3 100644
--- a/sonar-db/src/main/java/org/sonar/db/issue/IssueChangeDao.java
+++ b/sonar-db/src/main/java/org/sonar/db/issue/IssueChangeDao.java
@@ -1,14 +1,14 @@
 /*
- * SonarQube, open source software quality management tool.
- * Copyright (C) 2008-2014 SonarSource
+ * SonarQube :: Database
+ * Copyright (C) 2009-2016 SonarSource SA
  * mailto:contact AT sonarsource DOT com
  *
- * SonarQube is free software; you can redistribute it and/or
+ * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 3 of the License, or (at your option) any later version.
  *
- * SonarQube is distributed in the hope that it will be useful,
+ * 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 GNU
  * Lesser General Public License for more details.
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-
 package org.sonar.db.issue;
 
 import com.google.common.base.Function;
diff --git a/sonar-db/src/main/java/org/sonar/db/issue/IssueChangeDto.java b/sonar-db/src/main/java/org/sonar/db/issue/IssueChangeDto.java
index 14bce70b26b..6071a2b30be 100644
--- a/sonar-db/src/main/java/org/sonar/db/issue/IssueChangeDto.java
+++ b/sonar-db/src/main/java/org/sonar/db/issue/IssueChangeDto.java
@@ -1,14 +1,14 @@
 /*
- * SonarQube, open source software quality management tool.
- * Copyright (C) 2008-2014 SonarSource
+ * SonarQube :: Database
+ * Copyright (C) 2009-2016 SonarSource SA
  * mailto:contact AT sonarsource DOT com
  *
- * SonarQube is free software; you can redistribute it and/or
+ * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 3 of the License, or (at your option) any later version.
  *
- * SonarQube is distributed in the hope that it will be useful,
+ * 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 GNU
  * Lesser General Public License for more details.
diff --git a/sonar-db/src/main/java/org/sonar/db/issue/IssueChangeMapper.java b/sonar-db/src/main/java/org/sonar/db/issue/IssueChangeMapper.java
index 1f0efcd0c31..4d6a88cdaaa 100644
--- a/sonar-db/src/main/java/org/sonar/db/issue/IssueChangeMapper.java
+++ b/sonar-db/src/main/java/org/sonar/db/issue/IssueChangeMapper.java
@@ -1,14 +1,14 @@
 /*
- * SonarQube, open source software quality management tool.
- * Copyright (C) 2008-2014 SonarSource
+ * SonarQube :: Database
+ * Copyright (C) 2009-2016 SonarSource SA
  * mailto:contact AT sonarsource DOT com
  *
- * SonarQube is free software; you can redistribute it and/or
+ * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 3 of the License, or (at your option) any later version.
  *
- * SonarQube is distributed in the hope that it will be useful,
+ * 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 GNU
  * Lesser General Public License for more details.
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-
 package org.sonar.db.issue;
 
 import java.util.List;
diff --git a/sonar-db/src/main/java/org/sonar/db/issue/IssueDao.java b/sonar-db/src/main/java/org/sonar/db/issue/IssueDao.java
index 36dbf668650..13bdfd9aaf4 100644
--- a/sonar-db/src/main/java/org/sonar/db/issue/IssueDao.java
+++ b/sonar-db/src/main/java/org/sonar/db/issue/IssueDao.java
@@ -1,14 +1,14 @@
 /*
- * SonarQube, open source software quality management tool.
- * Copyright (C) 2008-2014 SonarSource
+ * SonarQube :: Database
+ * Copyright (C) 2009-2016 SonarSource SA
  * mailto:contact AT sonarsource DOT com
  *
- * SonarQube is free software; you can redistribute it and/or
+ * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 3 of the License, or (at your option) any later version.
  *
- * SonarQube is distributed in the hope that it will be useful,
+ * 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 GNU
  * Lesser General Public License for more details.
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-
 package org.sonar.db.issue;
 
 import com.google.common.base.Function;
diff --git a/sonar-db/src/main/java/org/sonar/db/issue/IssueDto.java b/sonar-db/src/main/java/org/sonar/db/issue/IssueDto.java
index 67a907a6a27..58923437322 100644
--- a/sonar-db/src/main/java/org/sonar/db/issue/IssueDto.java
+++ b/sonar-db/src/main/java/org/sonar/db/issue/IssueDto.java
@@ -1,14 +1,14 @@
 /*
- * SonarQube, open source software quality management tool.
- * Copyright (C) 2008-2014 SonarSource
+ * SonarQube :: Database
+ * Copyright (C) 2009-2016 SonarSource SA
  * mailto:contact AT sonarsource DOT com
  *
- * SonarQube is free software; you can redistribute it and/or
+ * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 3 of the License, or (at your option) any later version.
  *
- * SonarQube is distributed in the hope that it will be useful,
+ * 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 GNU
  * Lesser General Public License for more details.
diff --git a/sonar-db/src/main/java/org/sonar/db/issue/IssueFilterDao.java b/sonar-db/src/main/java/org/sonar/db/issue/IssueFilterDao.java
index 6a6b6fb86bf..e1c0db46a35 100644
--- a/sonar-db/src/main/java/org/sonar/db/issue/IssueFilterDao.java
+++ b/sonar-db/src/main/java/org/sonar/db/issue/IssueFilterDao.java
@@ -1,14 +1,14 @@
 /*
- * SonarQube, open source software quality management tool.
- * Copyright (C) 2008-2014 SonarSource
+ * SonarQube :: Database
+ * Copyright (C) 2009-2016 SonarSource SA
  * mailto:contact AT sonarsource DOT com
  *
- * SonarQube is free software; you can redistribute it and/or
+ * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 3 of the License, or (at your option) any later version.
  *
- * SonarQube is distributed in the hope that it will be useful,
+ * 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 GNU
  * Lesser General Public License for more details.
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-
 package org.sonar.db.issue;
 
 import java.util.List;
diff --git a/sonar-db/src/main/java/org/sonar/db/issue/IssueFilterDto.java b/sonar-db/src/main/java/org/sonar/db/issue/IssueFilterDto.java
index d3552aae316..c19f5467c8a 100644
--- a/sonar-db/src/main/java/org/sonar/db/issue/IssueFilterDto.java
+++ b/sonar-db/src/main/java/org/sonar/db/issue/IssueFilterDto.java
@@ -1,14 +1,14 @@
 /*
- * SonarQube, open source software quality management tool.
- * Copyright (C) 2008-2014 SonarSource
+ * SonarQube :: Database
+ * Copyright (C) 2009-2016 SonarSource SA
  * mailto:contact AT sonarsource DOT com
  *
- * SonarQube is free software; you can redistribute it and/or
+ * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 3 of the License, or (at your option) any later version.
  *
- * SonarQube is distributed in the hope that it will be useful,
+ * 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 GNU
  * Lesser General Public License for more details.
diff --git a/sonar-db/src/main/java/org/sonar/db/issue/IssueFilterFavouriteDao.java b/sonar-db/src/main/java/org/sonar/db/issue/IssueFilterFavouriteDao.java
index 4253844e253..e3fe4f8ea3c 100644
--- a/sonar-db/src/main/java/org/sonar/db/issue/IssueFilterFavouriteDao.java
+++ b/sonar-db/src/main/java/org/sonar/db/issue/IssueFilterFavouriteDao.java
@@ -1,14 +1,14 @@
 /*
- * SonarQube, open source software quality management tool.
- * Copyright (C) 2008-2014 SonarSource
+ * SonarQube :: Database
+ * Copyright (C) 2009-2016 SonarSource SA
  * mailto:contact AT sonarsource DOT com
  *
- * SonarQube is free software; you can redistribute it and/or
+ * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 3 of the License, or (at your option) any later version.
  *
- * SonarQube is distributed in the hope that it will be useful,
+ * 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 GNU
  * Lesser General Public License for more details.
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-
 package org.sonar.db.issue;
 
 import java.util.List;
diff --git a/sonar-db/src/main/java/org/sonar/db/issue/IssueFilterFavouriteDto.java b/sonar-db/src/main/java/org/sonar/db/issue/IssueFilterFavouriteDto.java
index d86bd266bf4..07d94a600c0 100644
--- a/sonar-db/src/main/java/org/sonar/db/issue/IssueFilterFavouriteDto.java
+++ b/sonar-db/src/main/java/org/sonar/db/issue/IssueFilterFavouriteDto.java
@@ -1,14 +1,14 @@
 /*
- * SonarQube, open source software quality management tool.
- * Copyright (C) 2008-2014 SonarSource
+ * SonarQube :: Database
+ * Copyright (C) 2009-2016 SonarSource SA
  * mailto:contact AT sonarsource DOT com
  *
- * SonarQube is free software; you can redistribute it and/or
+ * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 3 of the License, or (at your option) any later version.
  *
- * SonarQube is distributed in the hope that it will be useful,
+ * 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 GNU
  * Lesser General Public License for more details.
diff --git a/sonar-db/src/main/java/org/sonar/db/issue/IssueFilterFavouriteMapper.java b/sonar-db/src/main/java/org/sonar/db/issue/IssueFilterFavouriteMapper.java
index 947bd799e34..2b7cee11e54 100644
--- a/sonar-db/src/main/java/org/sonar/db/issue/IssueFilterFavouriteMapper.java
+++ b/sonar-db/src/main/java/org/sonar/db/issue/IssueFilterFavouriteMapper.java
@@ -1,14 +1,14 @@
 /*
- * SonarQube, open source software quality management tool.
- * Copyright (C) 2008-2014 SonarSource
+ * SonarQube :: Database
+ * Copyright (C) 2009-2016 SonarSource SA
  * mailto:contact AT sonarsource DOT com
  *
- * SonarQube is free software; you can redistribute it and/or
+ * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 3 of the License, or (at your option) any later version.
  *
- * SonarQube is distributed in the hope that it will be useful,
+ * 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 GNU
  * Lesser General Public License for more details.
diff --git a/sonar-db/src/main/java/org/sonar/db/issue/IssueFilterMapper.java b/sonar-db/src/main/java/org/sonar/db/issue/IssueFilterMapper.java
index 50c7cc8912d..56ecf2129f6 100644
--- a/sonar-db/src/main/java/org/sonar/db/issue/IssueFilterMapper.java
+++ b/sonar-db/src/main/java/org/sonar/db/issue/IssueFilterMapper.java
@@ -1,14 +1,14 @@
 /*
- * SonarQube, open source software quality management tool.
- * Copyright (C) 2008-2014 SonarSource
+ * SonarQube :: Database
+ * Copyright (C) 2009-2016 SonarSource SA
  * mailto:contact AT sonarsource DOT com
  *
- * SonarQube is free software; you can redistribute it and/or
+ * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 3 of the License, or (at your option) any later version.
  *
- * SonarQube is distributed in the hope that it will be useful,
+ * 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 GNU
  * Lesser General Public License for more details.
diff --git a/sonar-db/src/main/java/org/sonar/db/issue/IssueMapper.java b/sonar-db/src/main/java/org/sonar/db/issue/IssueMapper.java
index d74665b8461..5b96fdbedd8 100644
--- a/sonar-db/src/main/java/org/sonar/db/issue/IssueMapper.java
+++ b/sonar-db/src/main/java/org/sonar/db/issue/IssueMapper.java
@@ -1,14 +1,14 @@
 /*
- * SonarQube, open source software quality management tool.
- * Copyright (C) 2008-2014 SonarSource
+ * SonarQube :: Database
+ * Copyright (C) 2009-2016 SonarSource SA
  * mailto:contact AT sonarsource DOT com
  *
- * SonarQube is free software; you can redistribute it and/or
+ * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 3 of the License, or (at your option) any later version.
  *
- * SonarQube is distributed in the hope that it will be useful,
+ * 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 GNU
  * Lesser General Public License for more details.
diff --git a/sonar-db/src/main/java/org/sonar/db/issue/package-info.java b/sonar-db/src/main/java/org/sonar/db/issue/package-info.java
index 472eca27cae..6c5f79ae809 100644
--- a/sonar-db/src/main/java/org/sonar/db/issue/package-info.java
+++ b/sonar-db/src/main/java/org/sonar/db/issue/package-info.java
@@ -1,14 +1,14 @@
 /*
- * SonarQube, open source software quality management tool.
- * Copyright (C) 2008-2014 SonarSource
+ * SonarQube :: Database
+ * Copyright (C) 2009-2016 SonarSource SA
  * mailto:contact AT sonarsource DOT com
  *
- * SonarQube is free software; you can redistribute it and/or
+ * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 3 of the License, or (at your option) any later version.
  *
- * SonarQube is distributed in the hope that it will be useful,
+ * 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 GNU
  * Lesser General Public License for more details.