[roller] branch roller-6.0.x updated: Dockerfile in roller-6.0.x should build against roller-6.0.x.
This is an automated email from the ASF dual-hosted git repository. snoopdave pushed a commit to branch roller-6.0.x in repository https://gitbox.apache.org/repos/asf/roller.git The following commit(s) were added to refs/heads/roller-6.0.x by this push: new c0b5636 Dockerfile in roller-6.0.x should build against roller-6.0.x. c0b5636 is described below commit c0b56361bab325215247d517aea2ed1e9730b39c Author: David M. Johnson AuthorDate: Sat Sep 21 16:19:00 2019 -0400 Dockerfile in roller-6.0.x should build against roller-6.0.x. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 28570de..29410a2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,7 +31,7 @@ WORKDIR /tmp RUN apt-get update && apt-get install -y git RUN git clone https://github.com/apache/roller.git WORKDIR /tmp/roller -RUN git checkout master; \ +RUN git checkout roller-6.0.x; \ mvn -Duser.home=/builder/home -DskipTests=true -B clean install
[roller] 01/01: Merge branch 'master' into roller-6.0.x
This is an automated email from the ASF dual-hosted git repository. snoopdave pushed a commit to branch roller-6.0.x in repository https://gitbox.apache.org/repos/asf/roller.git commit 23739e2b98f75158c74c04605fe601dec1368166 Merge: 605797d 026f8f1 Author: David M. Johnson AuthorDate: Sat Sep 21 16:17:04 2019 -0400 Merge branch 'master' into roller-6.0.x # Conflicts: # LICENSE.txt # NOTICE.txt Dockerfile | 6 +- LICENSE.txt| 28 + app/pom.xml| 2 +- .../weblogger/business/search/FieldConstants.java | 4 - .../business/search/IndexManagerImpl.java | 136 - .../business/search/operations/IndexOperation.java | 10 +- .../search/operations/ReadFromIndexOperation.java | 3 +- .../search/operations/SearchOperation.java | 40 +++--- .../apache/roller/weblogger/config/PingConfig.java | 31 +++-- .../weblogger/ui/struts2/admin/UserEdit.java | 16 +-- app/src/main/resources/struts.xml | 6 +- .../webapp/WEB-INF/jsps/admin/GlobalConfig.jsp | 8 +- .../main/webapp/WEB-INF/jsps/admin/UserAdmin.jsp | 12 +- .../main/webapp/WEB-INF/jsps/editor/Entries.jsp| 29 +++-- .../webapp/WEB-INF/jsps/editor/EntryEditor.jsp | 3 +- app/src/main/webapp/roller-ui/scripts/ajax-user.js | 3 +- LICENSE.txt => binary-includes/LICENSE.txt | 109 - binary-includes/NOTICE.txt | 27 doap_roller.rdf| 15 ++- docker-compose.yml | 7 +- 20 files changed, 323 insertions(+), 172 deletions(-) diff --cc LICENSE.txt index 89d78e0,f7d3e4d..83b89fc --- a/LICENSE.txt +++ b/LICENSE.txt @@@ -324,6 -324,33 +324,34 @@@ Copyright (c) 2011-2019 The Bootstrap A Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. ++ + --- + This product bundles Summernote WYSIWYG editor, which is available under a + "MIT" license. For details, see + /webjars/summernote/0.8.11/dist/summernote.min.js + https://github.com/summernote/summernote/blob/develop/LICENSE + + The MIT License (MIT) + + Copyright (c) 2015~ Summernote Team (https://github.com/orgs/summernote/people) + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
[roller] branch roller-6.0.x updated (605797d -> 23739e2)
This is an automated email from the ASF dual-hosted git repository. snoopdave pushed a change to branch roller-6.0.x in repository https://gitbox.apache.org/repos/asf/roller.git. from 605797d Prepare for rc 1 add 596a84f Fixed: NOTICE file does not have standard content (ROL-2138) 1. Rearranged the content as per the standard for Notice and License files 2. Removed credits from Notice file add 1438660 Fixed: NOTICE file does not have standard content (ROL-2138) Improved text of the ALv2 and improved the statements as per the standards. Removed copyright notice of sub dependencies of Xinha WYSIWYG editor Updated license file as per the standards add 192b006 Merge branch 'master' of https://github.com/apache/roller into ROL-2138 add 917b26b Fixed: NOTICE file does not have standard content (ROL-2138) Improved statements in License file add 21fca17 Added: separate Notice and License files for the binary release (ROL-2138) add 6916df6 Merge pull request #29 from apache/ROL-2138 add 333dfb7 Small improvements to README add 83d8f8b Add link button to Summernote rich text editor. add 10370c1 updated apache lucene to 8.1.1 and made necessary code changes. search index rebuild task is now triggered automatically during init if the index version is incompatible. add a4dfaed removed code using the deprecated RAMDirectory, since the codepaths were not used or tested anyway. add 30694c2 reuse reader from the index consistency check. add 5b8c44b Merge pull request #34 from mbien/master add ca5cbe2 Entries page: move delete column to far right, add tooltips for edit and delete glyphs. add 7e18e38 War file location fix add 8f2aef8 Merge pull request #33 from fileme/patch-1 add 9f47674 fix global config jsp wrong tag add dbd7886 fix bugs in Global Config JSP add 74f288d Revert "fix bugs in Global Config JSP" add 1918954 fix Global Config JSP Page bugs add 251c72e Merge pull request #36 from zorrofox/fix_globalconfig_jsp add c59a571 Merge branch 'master' of https://github.com/apache/roller add 619a3d2 Fixes to User Admin pages: disable edit button if nothing selected and send user back to user admin page after save. add 1ca1853 Formatting change only. add 7c498e5 Added the information for latest release add 07434a1 Merge pull request #38 from swapnilmmane/patch-1 add deaab19 Update to work with latest docker-compose. add 026f8f1 Dockerfile in master should build against master. new 23739e2 Merge branch 'master' into roller-6.0.x The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: Dockerfile | 6 +- LICENSE.txt| 28 + app/pom.xml| 2 +- .../weblogger/business/search/FieldConstants.java | 4 - .../business/search/IndexManagerImpl.java | 136 - .../business/search/operations/IndexOperation.java | 10 +- .../search/operations/ReadFromIndexOperation.java | 3 +- .../search/operations/SearchOperation.java | 40 +++--- .../apache/roller/weblogger/config/PingConfig.java | 31 +++-- .../weblogger/ui/struts2/admin/UserEdit.java | 16 +-- app/src/main/resources/struts.xml | 6 +- .../webapp/WEB-INF/jsps/admin/GlobalConfig.jsp | 8 +- .../main/webapp/WEB-INF/jsps/admin/UserAdmin.jsp | 12 +- .../main/webapp/WEB-INF/jsps/editor/Entries.jsp| 29 +++-- .../webapp/WEB-INF/jsps/editor/EntryEditor.jsp | 3 +- app/src/main/webapp/roller-ui/scripts/ajax-user.js | 3 +- LICENSE.txt => binary-includes/LICENSE.txt | 109 - NOTICE.txt => binary-includes/NOTICE.txt | 2 +- doap_roller.rdf| 15 ++- docker-compose.yml | 7 +- 20 files changed, 297 insertions(+), 173 deletions(-) copy LICENSE.txt => binary-includes/LICENSE.txt (78%) copy NOTICE.txt => binary-includes/NOTICE.txt (95%)
[roller] branch master updated: Dockerfile in master should build against master.
This is an automated email from the ASF dual-hosted git repository. snoopdave pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/roller.git The following commit(s) were added to refs/heads/master by this push: new 026f8f1 Dockerfile in master should build against master. 026f8f1 is described below commit 026f8f139b73e796a9a3de2f94d93a7cefe96876 Author: David M. Johnson AuthorDate: Sat Sep 21 16:14:36 2019 -0400 Dockerfile in master should build against master. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2dcbcd4..28570de 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,7 +31,7 @@ WORKDIR /tmp RUN apt-get update && apt-get install -y git RUN git clone https://github.com/apache/roller.git WORKDIR /tmp/roller -RUN git checkout bootstrap-ui; \ +RUN git checkout master; \ mvn -Duser.home=/builder/home -DskipTests=true -B clean install
[roller] branch asm7-fix created (now 45a970a)
This is an automated email from the ASF dual-hosted git repository. snoopdave pushed a change to branch asm7-fix in repository https://gitbox.apache.org/repos/asf/roller.git. at 45a970a Experiment with OGNL downgrade to fix "UnsupportedOperationException: This feature requires ASM7" message from Struts. This branch includes the following new commits: new 45a970a Experiment with OGNL downgrade to fix "UnsupportedOperationException: This feature requires ASM7" message from Struts. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[roller] 01/01: Experiment with OGNL downgrade to fix "UnsupportedOperationException: This feature requires ASM7" message from Struts.
This is an automated email from the ASF dual-hosted git repository. snoopdave pushed a commit to branch asm7-fix in repository https://gitbox.apache.org/repos/asf/roller.git commit 45a970a011cb54726a92ccab1f163f1f9c6973f0 Author: David M. Johnson AuthorDate: Sat Sep 21 16:08:50 2019 -0400 Experiment with OGNL downgrade to fix "UnsupportedOperationException: This feature requires ASM7" message from Struts. --- app/pom.xml | 6 ++ 1 file changed, 6 insertions(+) diff --git a/app/pom.xml b/app/pom.xml index 94bf7ae..c7081e3 100644 --- a/app/pom.xml +++ b/app/pom.xml @@ -224,6 +224,12 @@ limitations under the License. +ognl +ognl +3.1.18 + + + org.webjars bootstrap 3.3.7
[roller] branch revert-30-ROL-2136-5.2.x deleted (was 05c8e03)
This is an automated email from the ASF dual-hosted git repository. snoopdave pushed a change to branch revert-30-ROL-2136-5.2.x in repository https://gitbox.apache.org/repos/asf/roller.git. was 05c8e03 Revert "Improved: Editor should confirm user before leaving the page (ROL-2136)" The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[roller] branch master updated: Update to work with latest docker-compose.
This is an automated email from the ASF dual-hosted git repository. snoopdave pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/roller.git The following commit(s) were added to refs/heads/master by this push: new deaab19 Update to work with latest docker-compose. deaab19 is described below commit deaab1988e3fc4e5bb29712f0d8f4594a41bf099 Author: David M. Johnson AuthorDate: Sat Sep 21 15:36:00 2019 -0400 Update to work with latest docker-compose. --- docker-compose.yml | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 022..ba5c7b8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,10 +16,10 @@ # directory of this distribution. -# Example Docker Compose setup for running Roller and PostreSQL locally +# Example Docker Compose setup for running Roller and PostgreSQL locally -version: '3.2' +version: '3.7' services: @@ -37,8 +37,7 @@ services: - POSTGRES_PASSWORD=tiger roller: - image: - build: . + build: . ports: - "8080:8080" volumes:
