branch develop updated (c8298cb -> f6f8c39)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository bow. See http://git.chorem.org/bow.git from c8298cb [jgitflow-maven-plugin]updating poms for 1.5-SNAPSHOT development new 1bb94dc [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 0a9ae45 [maven-release-plugin] copy for tag bow-1.3 adds aea6ed3 add release file adds f05dadd [jgitflow-maven-plugin]updating poms for branch '1.4' with snapshot versions new 56cb32a Fix for release new 58448ca [jgitflow-maven-plugin]updating poms for branch'release/1.4' with non-snapshot versions new 47db070 Merge branch 'release/1.4' new 5e20b97 Merge branch 'master' into develop new f6f8c39 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit f6f8c39fe2ad0828ed454c07628e821cdf3aa4e2 Author: Maven Release <maven-release@codelutin.com> Date: Thu Nov 20 18:36:02 2014 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 5e20b973eb2e8229976e16c33075fa107f471b20 Merge: 1bb94dc 47db070 Author: Maven Release <maven-release@codelutin.com> Date: Thu Nov 20 18:36:02 2014 +0000 Merge branch 'master' into develop commit 1bb94dc53691f919f1982974fc33599caeafb682 Author: Maven Release <maven-release@codelutin.com> Date: Thu Nov 20 18:36:02 2014 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 47db070d589b38b35c06cc19761872fc6ba3ff80 Merge: aea6ed3 58448ca Author: Maven Release <maven-release@codelutin.com> Date: Thu Nov 20 18:36:01 2014 +0000 Merge branch 'release/1.4' commit 58448ca11732011d8b219394017e432767525e7c Author: Maven Release <maven-release@codelutin.com> Date: Thu Nov 20 18:35:27 2014 +0000 [jgitflow-maven-plugin]updating poms for branch'release/1.4' with non-snapshot versions commit 56cb32ae1912306828f39bdc601c54225a68d87d Author: Maven Release <maven-release@codelutin.com> Date: Thu Nov 20 18:35:04 2014 +0000 Fix for release Summary of changes: bow-extension-chromium/LICENSE.txt | 2 +- bow-ui/pom.xml | 2 ++ bow-ui/src/license/THIRD-PARTY.properties | 7 +++---- 3 files changed, 6 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository bow. See http://git.chorem.org/bow.git commit 56cb32ae1912306828f39bdc601c54225a68d87d Author: Maven Release <maven-release@codelutin.com> Date: Thu Nov 20 18:35:04 2014 +0000 Fix for release --- bow-extension-chromium/LICENSE.txt | 2 +- bow-ui/src/license/THIRD-PARTY.properties | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/bow-extension-chromium/LICENSE.txt b/bow-extension-chromium/LICENSE.txt index 2def0e8..dba13ed 100644 --- a/bow-extension-chromium/LICENSE.txt +++ b/bow-extension-chromium/LICENSE.txt @@ -658,4 +658,4 @@ specific requirements. You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU AGPL, see -<http://www.gnu.org/licenses/>. \ No newline at end of file +<http://www.gnu.org/licenses/>. diff --git a/bow-ui/src/license/THIRD-PARTY.properties b/bow-ui/src/license/THIRD-PARTY.properties index f2afb5d..a6c13e1 100644 --- a/bow-ui/src/license/THIRD-PARTY.properties +++ b/bow-ui/src/license/THIRD-PARTY.properties @@ -1,6 +1,7 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : +# - Apache 2 # - Apache License # - Apache Software License, version 1.1 # - BSD License @@ -9,6 +10,7 @@ # - CDDL # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) v1.0 +# - Common Development and Distribution License (CDDL) v1.0 # - Common Public License # - GNU Lesser General Public License, version 2.1 # - GPLv2+CE @@ -25,14 +27,11 @@ # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 # - The MIT License -# - http://asm.ow2.org/license.html #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Sun Mar 09 20:21:19 CET 2014 -asm--asm--3.1=http\://asm.ow2.org/license.html -asm--asm-commons--3.1=http\://asm.ow2.org/license.html +#Thu Nov 20 18:34:08 UTC 2014 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 concurrent--concurrent--1.0=TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. gnu.cajo--cajo--1.168=Lesser General Public License (LPGL) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository bow. See http://git.chorem.org/bow.git commit 58448ca11732011d8b219394017e432767525e7c Author: Maven Release <maven-release@codelutin.com> Date: Thu Nov 20 18:35:27 2014 +0000 [jgitflow-maven-plugin]updating poms for branch'release/1.4' with non-snapshot versions --- bow-extension-chromium/pom.xml | 2 +- bow-ui/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bow-extension-chromium/pom.xml b/bow-extension-chromium/pom.xml index c2481e7..306ee8c 100644 --- a/bow-extension-chromium/pom.xml +++ b/bow-extension-chromium/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>bow</artifactId> - <version>1.4-SNAPSHOT</version> + <version>1.4</version> </parent> <artifactId>bow-extension-chromium</artifactId> diff --git a/bow-ui/pom.xml b/bow-ui/pom.xml index 042396f..f9939b3 100644 --- a/bow-ui/pom.xml +++ b/bow-ui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>bow</artifactId> - <version>1.4-SNAPSHOT</version> + <version>1.4</version> </parent> <artifactId>bow-ui</artifactId> diff --git a/pom.xml b/pom.xml index 91cf560..a045bcb 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>org.chorem</groupId> <artifactId>bow</artifactId> - <version>1.4-SNAPSHOT</version> + <version>1.4</version> <packaging>pom</packaging> <name>bow</name> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository bow. See http://git.chorem.org/bow.git commit 47db070d589b38b35c06cc19761872fc6ba3ff80 Merge: aea6ed3 58448ca Author: Maven Release <maven-release@codelutin.com> Date: Thu Nov 20 18:36:01 2014 +0000 Merge branch 'release/1.4' .gitignore | 11 ++ bow-extension-chromium/LICENSE.txt | 2 +- bow-extension-chromium/pom.xml | 3 +- .../src/main/webapp/_locales/en/messages.json | 3 - .../src/main/webapp/_locales/fr/messages.json | 3 - .../src/main/webapp/background.js | 2 - .../src/main/webapp/css/extension.css | 2 +- .../src/main/webapp/css/options.css | 5 +- .../src/main/webapp/manifest.json | 3 - .../src/main/webapp/options.html | 5 +- bow-extension-chromium/src/main/webapp/options.js | 4 +- bow-extension-chromium/src/main/webapp/popup.html | 5 +- bow-extension-chromium/src/main/webapp/popup.js | 2 - .../src/main/webapp/properties.js | 3 - .../src/site/site.xml | 44 +++---- bow-ui/pom.xml | 13 +- bow-ui/src/license/THIRD-PARTY.properties | 7 +- .../main/java/org/chorem/bow/BookmarkUtils.java | 5 +- bow-ui/src/main/java/org/chorem/bow/BowConfig.java | 5 +- .../main/java/org/chorem/bow/BowConfigOption.java | 5 +- bow-ui/src/main/java/org/chorem/bow/BowMail.java | 5 +- .../org/chorem/bow/BowMigrationPreference.java | 3 - bow-ui/src/main/java/org/chorem/bow/BowProxy.java | 5 +- .../main/java/org/chorem/bow/BowSearchResult.java | 5 +- .../src/main/java/org/chorem/bow/BowSession.java | 5 +- bow-ui/src/main/java/org/chorem/bow/BowUtils.java | 5 +- .../java/org/chorem/bow/action/AliasAction.java | 3 - .../java/org/chorem/bow/action/BowBaseAction.java | 7 +- .../java/org/chorem/bow/action/LocaleAction.java | 5 +- .../bow/action/admin/ReIndexationAction.java | 7 +- .../bow/action/bookmark/AddOrUpdateAction.java | 7 +- .../action/bookmark/DeleteSearchResultsAction.java | 7 +- .../org/chorem/bow/action/bookmark/EditAction.java | 3 - .../org/chorem/bow/action/bookmark/HomeAction.java | 7 +- .../chorem/bow/action/bookmark/RemoveAction.java | 7 +- .../bow/action/bookmark/ScreenshotAction.java | 7 +- .../bow/action/login/ForgotPasswordAction.java | 7 +- .../org/chorem/bow/action/login/LoginAction.java | 7 +- .../org/chorem/bow/action/login/LogoutAction.java | 5 +- .../chorem/bow/action/login/RegisterAction.java | 5 +- .../action/opensearch/OpenSearchBaseAction.java | 5 +- .../action/opensearch/OpenSearchResultAction.java | 5 +- .../opensearch/OpenSearchSuggestionAction.java | 7 +- .../bow/action/opensearch/SuggestionAction.java | 2 - .../bow/action/preference/AdminTagAction.java | 3 - .../bow/action/preference/DeleteImportAction.java | 7 +- .../action/preference/ExportBookmarksAction.java | 7 +- .../bow/action/preference/GenerateTokenAction.java | 3 - .../action/preference/ImportBookmarksAction.java | 5 +- .../action/preference/PreferenceBaseAction.java | 5 +- .../bow/action/preference/UpdateSiteAction.java | 3 - .../bow/action/preference/UpdateUserAction.java | 3 - .../bow/interceptor/LaxLoginInterceptor.java | 5 +- .../chorem/bow/interceptor/LoginInterceptor.java | 5 +- .../chorem/bow/interceptor/LogoutInterceptor.java | 5 +- bow-ui/src/main/resources/META-INF/aop.xml | 3 - bow-ui/src/main/resources/bow.properties | 5 +- bow-ui/src/main/resources/freemarker.properties | 5 +- bow-ui/src/main/resources/log4j.properties | 5 +- .../bow/action/ForgotPasswordAction-validation.xml | 5 +- .../chorem/bow/action/LoginAction-validation.xml | 5 +- .../bow/action/RegisterAction-validation.xml | 5 +- .../preference/UpdateUserAction-validation.xml | 5 +- bow-ui/src/main/resources/struts.properties | 7 +- bow-ui/src/main/resources/struts.xml | 5 +- bow-ui/src/main/webapp/WEB-INF/decorators.xml | 5 +- bow-ui/src/main/webapp/WEB-INF/decorators/main.jsp | 5 +- .../src/main/webapp/WEB-INF/jsp/CallStatistic.jsp | 3 - bow-ui/src/main/webapp/WEB-INF/jsp/admin.jsp | 5 +- .../src/main/webapp/WEB-INF/jsp/editBookmark.jsp | 5 +- bow-ui/src/main/webapp/WEB-INF/jsp/error.jsp | 5 +- .../src/main/webapp/WEB-INF/jsp/forgotPassword.jsp | 5 +- bow-ui/src/main/webapp/WEB-INF/jsp/home.jsp | 5 +- .../src/main/webapp/WEB-INF/jsp/inc/bookmark.jsp | 5 +- bow-ui/src/main/webapp/WEB-INF/jsp/inc/footer.jsp | 5 +- bow-ui/src/main/webapp/WEB-INF/jsp/inc/header.jsp | 4 +- .../src/main/webapp/WEB-INF/jsp/inc/rightMenu.jsp | 7 +- .../src/main/webapp/WEB-INF/jsp/inc/tagsCloud.jsp | 7 +- bow-ui/src/main/webapp/WEB-INF/jsp/login.jsp | 5 +- .../src/main/webapp/WEB-INF/jsp/permanentXml.jsp | 5 +- bow-ui/src/main/webapp/WEB-INF/jsp/preferences.jsp | 37 +++--- bow-ui/src/main/webapp/WEB-INF/jsp/register.jsp | 5 +- bow-ui/src/main/webapp/WEB-INF/jsp/suggestions.jsp | 5 +- .../src/main/webapp/WEB-INF/jsp/temporaryXml.jsp | 5 +- bow-ui/src/main/webapp/WEB-INF/sitemesh.xml | 5 +- bow-ui/src/main/webapp/WEB-INF/web.xml | 26 ++-- bow-ui/src/main/webapp/css/bookmark.css | 5 +- bow-ui/src/main/webapp/css/connexion.css | 7 +- bow-ui/src/main/webapp/css/global.css | 7 +- .../webapp/css/jquery-ui-1.8.11.custom.bow.css | 3 - bow-ui/src/main/webapp/index.jsp | 7 +- bow-ui/src/main/webapp/js/bookmark.js | 3 - bow-ui/src/main/webapp/styles/forms.css | 7 +- bow-ui/src/main/webapp/styles/layout-1col.css | 7 +- .../src/main/webapp/styles/layout-navleft-1col.css | 7 +- .../src/main/webapp/styles/layout-navleft-2col.css | 7 +- .../src/main/webapp/styles/layout-navtop-1col.css | 7 +- .../src/main/webapp/styles/layout-navtop-3col.css | 7 +- .../main/webapp/styles/layout-navtop-localleft.css | 7 +- .../main/webapp/styles/layout-navtop-subright.css | 7 +- bow-ui/src/main/webapp/styles/layout.css | 5 +- bow-ui/src/main/webapp/styles/main.css | 7 +- bow-ui/src/main/webapp/styles/nav-horizontal.css | 7 +- bow-ui/src/main/webapp/styles/nav-vertical.css | 7 +- bow-ui/src/main/webapp/styles/tools.css | 7 +- bow-ui/src/main/webapp/styles/typo.css | 7 +- bow-ui/src/main/webapp/template/simple/a-close.ftl | 2 - .../main/webapp/template/simple/form-common.ftl | 2 - .../webapp/template/xhtml/controlheader-core.ftl | 4 +- bow-ui/src/main/webapp/template/xhtml/file.ftl | 2 - .../src/main/webapp/template/xhtml/form-close.ftl | 2 - bow-ui/src/main/webapp/template/xhtml/form.ftl | 2 - bow-ui/src/main/webapp/template/xhtml/password.ftl | 2 - .../main/webapp/template/xhtml/submit-close.ftl | 2 - bow-ui/src/main/webapp/template/xhtml/submit.ftl | 2 - bow-ui/src/main/webapp/template/xhtml/text.ftl | 2 - .../src/{main/webapp/index.jsp => site/site.xml} | 40 +++--- pom.xml | 139 ++++++++++++++++----- src/site/rst/developper/bow-model.rst | 4 +- src/site/rst/developper/installation.rst | 4 +- src/site/rst/developper/presentation.rst | 4 +- src/site/rst/index.rst | 4 +- src/site/rst/todo.rst | 4 +- src/site/rst/user/addBookmark.rst | 4 +- src/site/rst/user/alias.rst | 4 +- src/site/rst/user/importExport.rst | 4 +- src/site/rst/user/openSearch.rst | 4 +- src/site/rst/user/preferences.rst | 6 +- src/site/rst/user/search.rst | 4 +- src/site/rst/user/user.rst | 6 +- src/site/site.xml | 74 +++++++---- 131 files changed, 382 insertions(+), 596 deletions(-) diff --cc bow-ui/pom.xml index 0bcb474,f9939b3..31d4aff --- a/bow-ui/pom.xml +++ b/bow-ui/pom.xml @@@ -24,10 -24,10 +24,12 @@@ </i18n.bundleOutputDir> <i18n.addBundleOuputDirParent>false</i18n.addBundleOuputDirParent> + <redmine.releaseFiles>target/${project.artifactId}-${project.version}.war</redmine.releaseFiles> + <!-- Post Release configuration --> <skipPostRelease>false</skipPostRelease> + <redmine.releaseFiles>target/${project.artifactId}-${project.version}.war</redmine.releaseFiles> + </properties> <dependencies> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository bow. See http://git.chorem.org/bow.git commit 1bb94dc53691f919f1982974fc33599caeafb682 Author: Maven Release <maven-release@codelutin.com> Date: Thu Nov 20 18:36:02 2014 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- bow-extension-chromium/pom.xml | 2 +- bow-ui/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bow-extension-chromium/pom.xml b/bow-extension-chromium/pom.xml index bdf5b6c..306ee8c 100644 --- a/bow-extension-chromium/pom.xml +++ b/bow-extension-chromium/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>bow</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4</version> </parent> <artifactId>bow-extension-chromium</artifactId> diff --git a/bow-ui/pom.xml b/bow-ui/pom.xml index 2ed1def..f9939b3 100644 --- a/bow-ui/pom.xml +++ b/bow-ui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>bow</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4</version> </parent> <artifactId>bow-ui</artifactId> diff --git a/pom.xml b/pom.xml index 5608ff9..a045bcb 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>org.chorem</groupId> <artifactId>bow</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4</version> <packaging>pom</packaging> <name>bow</name> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository bow. See http://git.chorem.org/bow.git commit 5e20b973eb2e8229976e16c33075fa107f471b20 Merge: 1bb94dc 47db070 Author: Maven Release <maven-release@codelutin.com> Date: Thu Nov 20 18:36:02 2014 +0000 Merge branch 'master' into develop bow-extension-chromium/LICENSE.txt | 2 +- bow-ui/pom.xml | 2 ++ bow-ui/src/license/THIRD-PARTY.properties | 7 +++---- 3 files changed, 6 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository bow. See http://git.chorem.org/bow.git commit f6f8c39fe2ad0828ed454c07628e821cdf3aa4e2 Author: Maven Release <maven-release@codelutin.com> Date: Thu Nov 20 18:36:02 2014 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- bow-extension-chromium/pom.xml | 2 +- bow-ui/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bow-extension-chromium/pom.xml b/bow-extension-chromium/pom.xml index 306ee8c..bdf5b6c 100644 --- a/bow-extension-chromium/pom.xml +++ b/bow-extension-chromium/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>bow</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> </parent> <artifactId>bow-extension-chromium</artifactId> diff --git a/bow-ui/pom.xml b/bow-ui/pom.xml index 31d4aff..ebf0fc1 100644 --- a/bow-ui/pom.xml +++ b/bow-ui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>bow</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> </parent> <artifactId>bow-ui</artifactId> diff --git a/pom.xml b/pom.xml index a045bcb..5608ff9 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>org.chorem</groupId> <artifactId>bow</artifactId> - <version>1.4</version> + <version>1.5-SNAPSHOT</version> <packaging>pom</packaging> <name>bow</name> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm