branch develop updated (fca205f -> 4c4988f)
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 fca205f [jgitflow-maven-plugin]updating poms for 1.6-SNAPSHOT development new b995b68 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 4cbfb21 fixes dependancy and license problem new 8df08ba [jgitflow-maven-plugin]updating poms for branch'release/1.5' with non-snapshot versions new 6bcdda0 [jgitflow-maven-plugin]merging 'release/1.5' into 'master' new e849d6e [jgitflow-maven-plugin]merging 'master' into 'develop' new 4c4988f [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 4c4988f005e4b7f4dae04c8cf05e728eb6278f0d Author: Maven Release <maven-release@codelutin.com> Date: Mon Jul 20 19:43:48 2015 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit e849d6e8a6d753b5c40c8fbf44d58a65b48da85e Merge: b995b68 6bcdda0 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jul 20 19:43:48 2015 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit b995b68ee85379bf75cb76700a246f88928e6aca Author: Maven Release <maven-release@codelutin.com> Date: Mon Jul 20 19:43:48 2015 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 6bcdda0bf6903cf503a7113ed26ebaf447dee9fa Merge: c546bbe 8df08ba Author: Maven Release <maven-release@codelutin.com> Date: Mon Jul 20 19:43:47 2015 +0200 [jgitflow-maven-plugin]merging 'release/1.5' into 'master' commit 8df08ba85b385c5ef13553062877036a9a05f387 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jul 20 19:43:12 2015 +0200 [jgitflow-maven-plugin]updating poms for branch'release/1.5' with non-snapshot versions commit 4cbfb21f7a306edb7169fe3cfb65b08eb9a128b0 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jul 20 19:42:23 2015 +0200 fixes dependancy and license problem Summary of changes: bow-ui/src/license/THIRD-PARTY.properties | 6 ++++-- bow-ui/src/main/java/org/chorem/bow/BowUtils.java | 2 +- pom.xml | 1 + 3 files changed, 6 insertions(+), 3 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 4cbfb21f7a306edb7169fe3cfb65b08eb9a128b0 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jul 20 19:42:23 2015 +0200 fixes dependancy and license problem --- bow-ui/src/license/THIRD-PARTY.properties | 6 ++++-- bow-ui/src/main/java/org/chorem/bow/BowUtils.java | 2 +- pom.xml | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/bow-ui/src/license/THIRD-PARTY.properties b/bow-ui/src/license/THIRD-PARTY.properties index a6c13e1..03beb06 100644 --- a/bow-ui/src/license/THIRD-PARTY.properties +++ b/bow-ui/src/license/THIRD-PARTY.properties @@ -3,6 +3,7 @@ # Already used licenses in project : # - Apache 2 # - Apache License +# - Apache License 2.0 # - Apache Software License, version 1.1 # - BSD License # - BSD style @@ -25,13 +26,13 @@ # - TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. # - The Apache Software License, Version 1.1 # - The Apache Software License, Version 2.0 -# - The H2 License, Version 1.0 # - The MIT License #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Thu Nov 20 18:34:08 UTC 2014 +#Mon Jul 20 19:30:15 CEST 2015 +com.h2database--h2--1.4.187=MPL 2.0 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) @@ -40,5 +41,6 @@ javax.servlet--jstl--1.2=Common Development and Distribution License (CDDL) v1.0 javax.servlet--servlet-api--2.5=Common Development and Distribution License (CDDL) v1.0 javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) v1.0 org.apache.zookeeper--zookeeper--3.4.5=The Apache Software License, Version 2.0 +org.jacorb--jacorb--2.3.1.jbossorg-1=Lesser General Public License (LPGL) oro--oro--2.0.8=The Apache Software License, Version 2.0 xpp3--xpp3_min--1.1.3.4.O=Indiana University Extreme\! Lab Software License, vesion 1.1.1 diff --git a/bow-ui/src/main/java/org/chorem/bow/BowUtils.java b/bow-ui/src/main/java/org/chorem/bow/BowUtils.java index b4794eb..172d18a 100644 --- a/bow-ui/src/main/java/org/chorem/bow/BowUtils.java +++ b/bow-ui/src/main/java/org/chorem/bow/BowUtils.java @@ -32,7 +32,7 @@ import java.util.List; import java.util.Set; import java.util.UUID; import org.apache.commons.codec.binary.Base64; -import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections.CollectionUtils; import org.nuiton.wikitty.query.WikittyQuery; import org.nuiton.wikitty.query.WikittyQueryMaker; import org.nuiton.wikitty.services.WikittyServiceAuthorisation; diff --git a/pom.xml b/pom.xml index 09188d6..12c846c 100644 --- a/pom.xml +++ b/pom.xml @@ -248,6 +248,7 @@ <groupId>com.jgeppert.struts2.jquery</groupId> <artifactId>struts2-jquery-plugin</artifactId> <version>${struts2jqueryVersion}</version> + <scope>runtime</scope> </dependency> <dependency> -- 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 8df08ba85b385c5ef13553062877036a9a05f387 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jul 20 19:43:12 2015 +0200 [jgitflow-maven-plugin]updating poms for branch'release/1.5' 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 bdf5b6c..6ff318c 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.5</version> </parent> <artifactId>bow-extension-chromium</artifactId> diff --git a/bow-ui/pom.xml b/bow-ui/pom.xml index 89aa74a..ae40d50 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.5</version> </parent> <artifactId>bow-ui</artifactId> diff --git a/pom.xml b/pom.xml index 12c846c..b8dacc9 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.5</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 6bcdda0bf6903cf503a7113ed26ebaf447dee9fa Merge: c546bbe 8df08ba Author: Maven Release <maven-release@codelutin.com> Date: Mon Jul 20 19:43:47 2015 +0200 [jgitflow-maven-plugin]merging 'release/1.5' into 'master' bow-extension-chromium/pom.xml | 2 +- bow-ui/pom.xml | 27 +-- bow-ui/src/license/THIRD-PARTY.properties | 6 +- .../main/java/org/chorem/bow/BookmarkUtils.java | 63 +++++- bow-ui/src/main/java/org/chorem/bow/BowConfig.java | 26 ++- .../main/java/org/chorem/bow/BowConfigOption.java | 59 +++--- bow-ui/src/main/java/org/chorem/bow/BowProxy.java | 3 +- .../src/main/java/org/chorem/bow/BowSession.java | 46 ++++- bow-ui/src/main/java/org/chorem/bow/BowUtils.java | 61 +++++- .../java/org/chorem/bow/action/AliasAction.java | 40 ++-- .../java/org/chorem/bow/action/AtomAction.java | 114 +++++++++++ .../java/org/chorem/bow/action/BowBaseAction.java | 21 ++ .../bow/action/admin/ReIndexationAction.java | 2 +- .../bow/action/bookmark/AddOrUpdateAction.java | 192 ++++++------------- .../action/bookmark/DeleteSearchResultsAction.java | 10 +- .../org/chorem/bow/action/bookmark/EditAction.java | 2 +- .../org/chorem/bow/action/bookmark/HomeAction.java | 5 +- .../chorem/bow/action/bookmark/RemoveAction.java | 4 +- .../bow/action/bookmark/ScreenshotAction.java | 6 +- .../chorem/bow/action/group/GroupEditAction.java | 211 +++++++++++++++++++++ .../chorem/bow/action/group/GroupViewAction.java | 86 +++++++++ .../bow/action/login/ForgotPasswordAction.java | 14 +- .../org/chorem/bow/action/login/LoginAction.java | 8 +- .../chorem/bow/action/login/RegisterAction.java | 18 +- .../action/opensearch/OpenSearchBaseAction.java | 7 +- .../action/opensearch/OpenSearchResultAction.java | 2 +- .../opensearch/OpenSearchSuggestionAction.java | 2 +- .../bow/action/opensearch/SuggestionAction.java | 2 +- .../bow/action/preference/AdminTagAction.java | 2 +- .../bow/action/preference/DeleteImportAction.java | 4 +- .../bow/action/preference/GenerateTokenAction.java | 4 +- .../action/preference/ImportBookmarksAction.java | 10 +- .../action/preference/PreferenceBaseAction.java | 2 +- .../bow/action/preference/UpdateSiteAction.java | 6 +- .../bow/action/preference/UpdateUserAction.java | 12 +- .../main/resources/i18n/bow-ui_en_GB.properties | 44 +++-- .../main/resources/i18n/bow-ui_fr_FR.properties | 160 +++++++++------- bow-ui/src/main/resources/struts.xml | 32 +++- bow-ui/src/main/webapp/WEB-INF/bowutils.tld | 6 + bow-ui/src/main/webapp/WEB-INF/jsp/atom.jsp | 129 +++++++++++++ .../src/main/webapp/WEB-INF/jsp/editBookmark.jsp | 9 +- bow-ui/src/main/webapp/WEB-INF/jsp/groupEdit.jsp | 118 ++++++++++++ bow-ui/src/main/webapp/WEB-INF/jsp/groupView.jsp | 79 ++++++++ .../src/main/webapp/WEB-INF/jsp/inc/rightMenu.jsp | 2 + bow-ui/src/main/webapp/css/global.css | 37 +++- bow-ui/src/main/xmi/bow-model.zargo | Bin 9807 -> 10532 bytes pom.xml | 25 ++- 47 files changed, 1355 insertions(+), 365 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 b995b68ee85379bf75cb76700a246f88928e6aca Author: Maven Release <maven-release@codelutin.com> Date: Mon Jul 20 19:43:48 2015 +0200 [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 7ed8a7d..6ff318c 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.6-SNAPSHOT</version> + <version>1.5</version> </parent> <artifactId>bow-extension-chromium</artifactId> diff --git a/bow-ui/pom.xml b/bow-ui/pom.xml index d15ad9b..ae40d50 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.6-SNAPSHOT</version> + <version>1.5</version> </parent> <artifactId>bow-ui</artifactId> diff --git a/pom.xml b/pom.xml index 4c0f077..7779e7c 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>org.chorem</groupId> <artifactId>bow</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5</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 e849d6e8a6d753b5c40c8fbf44d58a65b48da85e Merge: b995b68 6bcdda0 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jul 20 19:43:48 2015 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' bow-ui/src/license/THIRD-PARTY.properties | 6 ++++-- bow-ui/src/main/java/org/chorem/bow/BowUtils.java | 2 +- pom.xml | 1 + 3 files changed, 6 insertions(+), 3 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 4c4988f005e4b7f4dae04c8cf05e728eb6278f0d Author: Maven Release <maven-release@codelutin.com> Date: Mon Jul 20 19:43:48 2015 +0200 [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 6ff318c..7ed8a7d 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</version> + <version>1.6-SNAPSHOT</version> </parent> <artifactId>bow-extension-chromium</artifactId> diff --git a/bow-ui/pom.xml b/bow-ui/pom.xml index ae40d50..d15ad9b 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</version> + <version>1.6-SNAPSHOT</version> </parent> <artifactId>bow-ui</artifactId> diff --git a/pom.xml b/pom.xml index b8dacc9..925cf45 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>org.chorem</groupId> <artifactId>bow</artifactId> - <version>1.5</version> + <version>1.6-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