[struts] branch master updated (7cc3e8b -> f2ad93a)

[ya...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

yasserzamani pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git.


    from 7cc3e8b  Merge pull request #269 from sepe81/update-plugins
     add 2cfca93  Update maven-bundle-plugin to 3.5.0
     add 7be1bc7  Remove inherited version for maven-bundle-plugin
     new f2ad93a  Merge pull request #274 from sepe81/update-maven-bundle-plugin

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:
 bundles/demo/pom.xml | 1 -
 pom.xml              | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

[struts] 01/01: Merge pull request #274 from sepe81/update-maven-bundle-plugin

[ya...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

yasserzamani pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git

commit f2ad93a0d64b127829e8777a06af4c20dcd7af85
Merge: 7cc3e8b 7be1bc7
Author: Yasser Zamani <ya...@live.com>
AuthorDate: Mon Nov 19 10:31:47 2018 +0330

    Merge pull request #274 from sepe81/update-maven-bundle-plugin
    
    Update maven bundle plugin

 bundles/demo/pom.xml | 1 -
 pom.xml              | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)