Prepare v2.2.0.1 release: version numbering and missing license headers

sigmah-dev · Jan 31, 2018 · 15aac86 · 15aac86
1 parent 884b660
commit 15aac86
Show file tree

Hide file tree

Showing 18 changed files with 76 additions and 30 deletions.
diff --git a/pom.xml b/pom.xml
@@ -12,7 +12,7 @@
 	<artifactId>sigmah</artifactId>
 	<!-- Any change of version here should also be reported manually client-side in 
 		public static final String VERSION of /src/main/java/org/sigmah/client/Sigmah.java  -->
-	<version>2.2-rc6</version>
+	<version>2.2.0.1</version>
 
 	<packaging>war</packaging>
 

diff --git a/src/main/java/org/sigmah/client/Sigmah.java b/src/main/java/org/sigmah/client/Sigmah.java
@@ -47,7 +47,7 @@ public class Sigmah implements EntryPoint {
 	 * Version number. Hard coded to avoid querying the server to identify
 	 * the current version number.
 	 */
-	public static final String VERSION = "2.2-rc6";
+	public static final String VERSION = "2.2.0.1";
 
 	/**
 	 * GIN injector.

diff --git a/src/main/java/org/sigmah/offline/dao/ContactAsyncDAO.java b/src/main/java/org/sigmah/offline/dao/ContactAsyncDAO.java
@@ -9,12 +9,12 @@
  * it under the terms of the GNU General Public License as
  * published by the Free Software Foundation, either version 3 of the
  * License, or (at your option) any later version.
- *
+ * 
  * 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 General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/gpl-3.0.html>.

diff --git a/src/main/java/org/sigmah/offline/dao/ContactHistoryAsyncDAO.java b/src/main/java/org/sigmah/offline/dao/ContactHistoryAsyncDAO.java
@@ -9,12 +9,12 @@
  * it under the terms of the GNU General Public License as
  * published by the Free Software Foundation, either version 3 of the
  * License, or (at your option) any later version.
- *
+ * 
  * 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 General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/gpl-3.0.html>.

diff --git a/src/main/java/org/sigmah/offline/dao/ContactListElementAsyncDAO.java b/src/main/java/org/sigmah/offline/dao/ContactListElementAsyncDAO.java
@@ -9,12 +9,12 @@
  * it under the terms of the GNU General Public License as
  * published by the Free Software Foundation, either version 3 of the
  * License, or (at your option) any later version.
- *
+ * 
  * 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 General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/gpl-3.0.html>.

diff --git a/src/main/java/org/sigmah/offline/dao/ContactRelationshipAsyncDAO.java b/src/main/java/org/sigmah/offline/dao/ContactRelationshipAsyncDAO.java
@@ -9,12 +9,12 @@
  * it under the terms of the GNU General Public License as
  * published by the Free Software Foundation, either version 3 of the
  * License, or (at your option) any later version.
- *
+ * 
  * 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 General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/gpl-3.0.html>.

diff --git a/src/main/java/org/sigmah/offline/dao/LayoutGroupIterationsAsyncDAO.java b/src/main/java/org/sigmah/offline/dao/LayoutGroupIterationsAsyncDAO.java
@@ -9,12 +9,12 @@
  * it under the terms of the GNU General Public License as
  * published by the Free Software Foundation, either version 3 of the
  * License, or (at your option) any later version.
- *
+ * 
  * 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 General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/gpl-3.0.html>.

diff --git a/src/main/java/org/sigmah/offline/handler/CheckContactDuplicationAsyncHandler.java b/src/main/java/org/sigmah/offline/handler/CheckContactDuplicationAsyncHandler.java
@@ -9,12 +9,12 @@
  * it under the terms of the GNU General Public License as
  * published by the Free Software Foundation, either version 3 of the
  * License, or (at your option) any later version.
- *
+ * 
  * 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 General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/gpl-3.0.html>.

diff --git a/src/main/java/org/sigmah/offline/handler/GetContactHistoryAsyncHandler.java b/src/main/java/org/sigmah/offline/handler/GetContactHistoryAsyncHandler.java
@@ -9,12 +9,12 @@
  * it under the terms of the GNU General Public License as
  * published by the Free Software Foundation, either version 3 of the
  * License, or (at your option) any later version.
- *
+ * 
  * 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 General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/gpl-3.0.html>.

diff --git a/src/main/java/org/sigmah/offline/handler/GetContactRelationshipsAsyncHandler.java b/src/main/java/org/sigmah/offline/handler/GetContactRelationshipsAsyncHandler.java
@@ -9,12 +9,12 @@
  * it under the terms of the GNU General Public License as
  * published by the Free Software Foundation, either version 3 of the
  * License, or (at your option) any later version.
- *
+ * 
  * 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 General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/gpl-3.0.html>.

diff --git a/src/main/java/org/sigmah/offline/handler/UpdateContactAsyncHandler.java b/src/main/java/org/sigmah/offline/handler/UpdateContactAsyncHandler.java
@@ -9,12 +9,12 @@
  * it under the terms of the GNU General Public License as
  * published by the Free Software Foundation, either version 3 of the
  * License, or (at your option) any later version.
- *
+ * 
  * 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 General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/gpl-3.0.html>.

diff --git a/src/main/java/org/sigmah/offline/handler/UpdateLayoutGroupIterationsAsyncHandler.java b/src/main/java/org/sigmah/offline/handler/UpdateLayoutGroupIterationsAsyncHandler.java
@@ -9,12 +9,12 @@
  * it under the terms of the GNU General Public License as
  * published by the Free Software Foundation, either version 3 of the
  * License, or (at your option) any later version.
- *
+ * 
  * 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 General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/gpl-3.0.html>.

diff --git a/src/main/java/org/sigmah/offline/js/IterationChangeJS.java b/src/main/java/org/sigmah/offline/js/IterationChangeJS.java
@@ -9,12 +9,12 @@
  * it under the terms of the GNU General Public License as
  * published by the Free Software Foundation, either version 3 of the
  * License, or (at your option) any later version.
- *
+ * 
  * 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 General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/gpl-3.0.html>.

diff --git a/src/main/java/org/sigmah/offline/js/LayoutGroupIterationJS.java b/src/main/java/org/sigmah/offline/js/LayoutGroupIterationJS.java
@@ -9,12 +9,12 @@
  * it under the terms of the GNU General Public License as
  * published by the Free Software Foundation, either version 3 of the
  * License, or (at your option) any later version.
- *
+ * 
  * 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 General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/gpl-3.0.html>.

diff --git a/src/main/java/org/sigmah/offline/js/UpdateContactJS.java b/src/main/java/org/sigmah/offline/js/UpdateContactJS.java
@@ -9,12 +9,12 @@
  * it under the terms of the GNU General Public License as
  * published by the Free Software Foundation, either version 3 of the
  * License, or (at your option) any later version.
- *
+ * 
  * 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 General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/gpl-3.0.html>.

diff --git a/src/main/java/org/sigmah/offline/js/UpdateLayoutGroupIterationsJS.java b/src/main/java/org/sigmah/offline/js/UpdateLayoutGroupIterationsJS.java
@@ -9,12 +9,12 @@
  * it under the terms of the GNU General Public License as
  * published by the Free Software Foundation, either version 3 of the
  * License, or (at your option) any later version.
- *
+ * 
  * 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 General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/gpl-3.0.html>.

diff --git a/src/test/java/org/sigmah/server/servlet/importer/ExcelImporterTest.java b/src/test/java/org/sigmah/server/servlet/importer/ExcelImporterTest.java
@@ -1,5 +1,28 @@
 package org.sigmah.server.servlet.importer;
 
+/*
+ * #%L
+ * Sigmah
+ * %%
+ * Copyright (C) 2010 - 2018 Groupe URD
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ * 
+ * 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 General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public
+ * License along with this program.  If not, see
+ * <http://www.gnu.org/licenses/gpl-3.0.html>.
+ * #L%
+ */
+
+
 import com.google.inject.Inject;
 import com.google.inject.Injector;
 import java.io.IOException;

diff --git a/src/test/java/org/sigmah/server/servlet/importer/OdsImporterTest.java b/src/test/java/org/sigmah/server/servlet/importer/OdsImporterTest.java
@@ -1,5 +1,28 @@
 package org.sigmah.server.servlet.importer;
 
+/*
+ * #%L
+ * Sigmah
+ * %%
+ * Copyright (C) 2010 - 2018 Groupe URD
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ * 
+ * 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 General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public
+ * License along with this program.  If not, see
+ * <http://www.gnu.org/licenses/gpl-3.0.html>.
+ * #L%
+ */
+
+
 import com.google.inject.Inject;
 import com.google.inject.Injector;
 import java.io.IOException;