This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository wlo. See http://git.codelutin.com/wlo.git commit b5c97417ebc8db411ec0ef608478d8a2bc8b67f3 Author: Kevin Morin <morin@codelutin.com> Date: Tue Dec 23 14:10:58 2014 +0100 make the project build in release profile --- pom.xml | 34 ++++++++++------------ .../wlo/measurement/MeasurementActivity.java | 2 +- .../fr/ifremer/wlo/utils/ImportExportUtil.java | 2 +- .../WloAutoCompleteTextViewWithFavorites.java | 2 +- 4 files changed, 19 insertions(+), 21 deletions(-) diff --git a/pom.xml b/pom.xml index 7219cbb..f4e8237 100644 --- a/pom.xml +++ b/pom.xml @@ -118,9 +118,11 @@ <!-- Post Release configuration --> <skipPostRelease>false</skipPostRelease> - <gsonVersion>2.2.4</gsonVersion> <sdkVersion>19.0.1</sdkVersion> + <!-- location of the release repository to use --> + <release.repository>${other.release.repository}</release.repository> + </properties> <dependencies> @@ -478,23 +480,6 @@ </reportSets> </plugin> - <!--<plugin>--> - <!--<groupId>org.nuiton</groupId>--> - <!--<artifactId>nuiton-maven-report-plugin</artifactId>--> - <!--<version>3.0-alpha-1</version>--> - <!--<inherited>false</inherited>--> - <!--<reportSets>--> - <!--<reportSet>--> - <!--<reports>--> - <!--<report>aggregate-config-report</report>--> - <!--</reports>--> - <!--</reportSet>--> - <!--</reportSets>--> - <!--<configuration>--> - <!--<i18nBundleName>tutti-i18n</i18nBundleName>--> - <!--</configuration>--> - <!--</plugin>--> - </plugins> </reporting> @@ -643,6 +628,19 @@ </profile> + <profile> + <id>release-quality-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <properties> + <helper.skipCheckAutocontainer>true</helper.skipCheckAutocontainer> + </properties> + </profile> + </profiles> </project> diff --git a/src/main/java/fr/ifremer/wlo/measurement/MeasurementActivity.java b/src/main/java/fr/ifremer/wlo/measurement/MeasurementActivity.java index 78194b6..71aec17 100644 --- a/src/main/java/fr/ifremer/wlo/measurement/MeasurementActivity.java +++ b/src/main/java/fr/ifremer/wlo/measurement/MeasurementActivity.java @@ -87,7 +87,7 @@ import fr.ifremer.wlo.models.referentials.Mensuration; import fr.ifremer.wlo.storage.WloSqlOpenHelper; import fr.ifremer.wlo.utils.BaseTextWatcher; import fr.ifremer.wlo.utils.UIUtils; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; diff --git a/src/main/java/fr/ifremer/wlo/utils/ImportExportUtil.java b/src/main/java/fr/ifremer/wlo/utils/ImportExportUtil.java index 245c8b2..2646edb 100644 --- a/src/main/java/fr/ifremer/wlo/utils/ImportExportUtil.java +++ b/src/main/java/fr/ifremer/wlo/utils/ImportExportUtil.java @@ -49,7 +49,7 @@ import fr.ifremer.wlo.models.categorization.QualitativeValueModel; import fr.ifremer.wlo.models.referentials.CalcifiedPartTaking; import fr.ifremer.wlo.storage.DataCache; import fr.ifremer.wlo.storage.WloSqlOpenHelper; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.Range; import org.nuiton.csv.Export; diff --git a/src/main/java/fr/ifremer/wlo/utils/WloAutoCompleteTextViewWithFavorites.java b/src/main/java/fr/ifremer/wlo/utils/WloAutoCompleteTextViewWithFavorites.java index 3ef57fd..68e33b2 100644 --- a/src/main/java/fr/ifremer/wlo/utils/WloAutoCompleteTextViewWithFavorites.java +++ b/src/main/java/fr/ifremer/wlo/utils/WloAutoCompleteTextViewWithFavorites.java @@ -33,7 +33,7 @@ import android.widget.FrameLayout; import android.widget.ToggleButton; import com.google.common.collect.Lists; import fr.ifremer.wlo.R; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import java.util.Collection; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.