Skip to content

Commit

Permalink
Merge pull request apache#3515 from apache/delivery
Browse files Browse the repository at this point in the history 
Sync delivery to master after 13-rc3
  • Loading branch information
@neilcsmith-net
neilcsmith-net authored Feb 2, 2022
2 parents 8774f8d + 3ff1e3d commit 0b619d1
Show file tree
Hide file tree
Showing 43 changed files with 738 additions and 155 deletions.
29 changes: 29 additions & 0 deletions enterprise/micronaut/licenseinfo.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
<licenseinfo>
<fileset>
<file>src/org/netbeans/modules/micronaut/resources/warning.png</file>
<file>src/org/netbeans/modules/micronaut/resources/micronaut.png</file>
<license ref="Apache-2.0-ASF" />
<comment type="COMMENT_UNSUPPORTED" />
</fileset>
</licenseinfo>
102 changes: 65 additions & 37 deletions enterprise/micronaut/src/org/netbeans/modules/micronaut/newproject/BasePropertiesVisual.form
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,47 +45,48 @@
<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="javaVersionLabel" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="groupLabel" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="languageLabel" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="customRadioButton" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="artifactLabel" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="applicationTypeLabel" alignment="0" min="-2" pref="90" max="-2" attributes="0"/>
<Component id="versionLabel" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="snapshotRadioButton" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="defaultRadioButton" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="serviceURLLabel" min="-2" max="-2" attributes="0"/>
<Component id="testFrameworkLabel" alignment="0" min="-2" max="-2" attributes="0"/>
</Group>
<Group type="102" alignment="0" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="executeDownloadedCodeWarning" pref="0" max="32767" attributes="0"/>
<Group type="102" attributes="0">
<Group type="103" groupAlignment="0" max="-2" attributes="0">
<Component id="javaVersionLabel" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="groupLabel" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="languageLabel" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="customRadioButton" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="artifactLabel" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="versionLabel" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="snapshotRadioButton" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="defaultRadioButton" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="serviceURLLabel" max="32767" attributes="0"/>
<Component id="testFrameworkLabel" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="applicationTypeLabel" alignment="0" max="32767" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="javaVersionComboBox" min="-2" pref="63" max="-2" attributes="0"/>
<Group type="102" alignment="0" attributes="0">
<Group type="103" groupAlignment="0" attributes="0">
<Component id="javaRadioButton" min="-2" pref="50" max="-2" attributes="0"/>
<Component id="junitRadioButton" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace min="-2" pref="18" max="-2" attributes="0"/>
<Group type="102" attributes="0">
<Group type="103" groupAlignment="0" attributes="0">
<Component id="spockRadioButton" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="kotlinRadioButton" alignment="0" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace type="separate" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="groovyRadioButton" min="-2" max="-2" attributes="0"/>
<Component id="kotestRadioButton" min="-2" max="-2" attributes="0"/>
<Component id="javaVersionComboBox" min="-2" pref="63" max="-2" attributes="0"/>
<Group type="102" alignment="0" attributes="0">
<Group type="103" groupAlignment="0" attributes="0">
<Component id="javaRadioButton" min="-2" pref="50" max="-2" attributes="0"/>
<Component id="junitRadioButton" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace min="-2" pref="18" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="spockRadioButton" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="kotlinRadioButton" alignment="0" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace type="separate" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="groovyRadioButton" min="-2" max="-2" attributes="0"/>
<Component id="kotestRadioButton" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
</Group>
<EmptySpace min="0" pref="332" max="32767" attributes="0"/>
</Group>
</Group>
<EmptySpace min="-2" pref="357" max="-2" attributes="0"/>
</Group>
<Group type="102" attributes="0">
<Group type="103" groupAlignment="0" attributes="0">
<Component id="defaultURLLabel" max="32767" attributes="0"/>
<Component id="versionTextField" max="32767" attributes="0"/>
<Component id="snapshotURLLabel" alignment="0" max="32767" attributes="0"/>
Expand All @@ -94,9 +95,9 @@
<Component id="artifactTextField" alignment="1" max="32767" attributes="0"/>
<Component id="groupTextField" max="32767" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
</Group>
</Group>
<EmptySpace max="-2" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
Expand Down Expand Up @@ -127,7 +128,7 @@
</Group>
<EmptySpace type="separate" max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="groupTextField" alignment="3" min="-2" pref="19" max="-2" attributes="0"/>
<Component id="groupTextField" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="groupLabel" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
Expand Down Expand Up @@ -159,7 +160,9 @@
<Component id="spockRadioButton" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="kotestRadioButton" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace pref="28" max="32767" attributes="0"/>
<EmptySpace type="separate" max="-2" attributes="0"/>
<Component id="executeDownloadedCodeWarning" max="-2" attributes="0"/>
<EmptySpace pref="17" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
Expand Down Expand Up @@ -395,5 +398,30 @@
<Property name="actionCommand" type="java.lang.String" value="KOTEST"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="executeDownloadedCodeWarning">
<Properties>
<Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
<Color blue="8b" green="b8" red="f8" type="rgb"/>
</Property>
<Property name="foreground" type="java.awt.Color" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
<Connection code="Color.black" type="code"/>
</Property>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
<Connection code="ImageUtilities.loadImageIcon(&quot;org/netbeans/modules/micronaut/resources/warning.png&quot;, false)" type="code"/>
</Property>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="org/netbeans/modules/micronaut/newproject/Bundle.properties" key="MSG_executeDownloadedCodeWarning" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
<Border info="org.netbeans.modules.form.compat2.border.LineBorderInfo">
<LineBorder roundedCorners="true" thickness="5">
<Color PropertyName="color" blue="8b" green="b8" red="f8" type="rgb"/>
</LineBorder>
</Border>
</Property>
<Property name="opaque" type="boolean" value="true"/>
<Property name="verticalTextPosition" type="int" value="1"/>
</Properties>
</Component>
</SubComponents>
</Form>
Loading

0 comments on commit 0b619d1

Please sign in to comment.