This is an automated email from the ASF dual-hosted git repository. dbalek pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git
from 34deb25b8b Merge pull request #7028 from sdedic/maven/conflicting-dependencies add 14e90977b3 Micronaut: separate templates for creating plain controllers and controllers from repositories. new 79b0ff6ace Merge pull request #7071 from dbalek/dbalek/micronaut-separate-controller-templates 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: .../modules/micronaut/db/Bundle.properties | 4 +- .../modules/micronaut/db/MicronautController.java | 233 +++++++++++---------- .../modules/micronaut/resources/Controller.html | 4 +- ...ntroller.html => ControllerFromRepository.html} | 2 +- .../netbeans/modules/micronaut/resources/layer.xml | 34 +-- 5 files changed, 150 insertions(+), 127 deletions(-) copy enterprise/micronaut/src/org/netbeans/modules/micronaut/resources/{Controller.html => ControllerFromRepository.html} (92%) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists