This is an automated email from the ASF dual-hosted git repository. mmoayyed pushed a commit to branch SYNCOPE-1545 in repository https://gitbox.apache.org/repos/asf/syncope.git
commit 1ffb70045a358ca80f32e59534596587fca11ee5 Merge: 52c22f3 5fb7ef6 Author: Misagh Moayyed <[email protected]> AuthorDate: Tue Mar 3 13:46:51 2020 +0330 Merge branch 'SYNCOPE-1545' of github.com:apache/syncope into SYNCOPE-1545 # Conflicts: # pom.xml .travis.yml | 2 +- client/am/console/pom.xml | 2 +- client/idm/console/pom.xml | 2 +- client/idrepo/common-ui/pom.xml | 2 +- client/idrepo/console/pom.xml | 2 +- client/idrepo/enduser/pom.xml | 2 +- pom.xml | 20 ++++++++++---------- 7 files changed, 16 insertions(+), 16 deletions(-) diff --cc pom.xml index e37e57e,cda62e4..958a24c --- a/pom.xml +++ b/pom.xml @@@ -2537,20 -2543,11 +2538,15 @@@ under the License <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-remote-resources-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>process</goal> - </goals> + <configuration> + <skip>${remote-resources.skip}</skip> + </configuration> + <phase>none</phase> + </execution> + <execution> + <id>process-resource-bundles</id> - <phase>none</phase> - </execution> - </executions> </plugin> + <!-- Put NOTICE and LICENSE files in all artifacts and javadocs --> <plugin> <groupId>org.apache.maven.plugins</groupId>
