Skip to content

Commit

Permalink
Merge branch 'develop' into 'main'
Browse files Browse the repository at this point in the history
Develop

See merge request Griefed/ServerPackCreator!595
  • Loading branch information
Griefed committed Aug 3, 2024
2 parents abf4264 + d494a8d commit 2213764
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -930,7 +930,7 @@ from the source code management (SCM) system project uses.
(4 of 38)
Group: com.fasterxml.jackson.module
Name: jackson-module-kotlin
Version: 2.17.0
Version: 2.17.1
Project URL: https://github.com/FasterXML/jackson-module-kotlin\n\n
Manifest license URL: https://www.apache.org/licenses/LICENSE-2.0

Expand Down Expand Up @@ -4174,7 +4174,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
(34 of 38)
Group: org.springframework.boot
Name: spring-boot-devtools
Version: 3.2.5
Version: 3.3.0
POM Project URL: https://spring.io/projects/spring-boot


Expand Down Expand Up @@ -4387,7 +4387,7 @@ Embedded license:
See the License for the specific language governing permissions and
limitations under the License.

Spring Boot 3.2.5
Spring Boot 3.3.0
Copyright (c) 2012-2024 VMware, Inc.

This product is licensed to you under the Apache License, Version 2.0
Expand All @@ -4399,7 +4399,7 @@ the License.
(35 of 38)
Group: org.springframework.boot
Name: spring-boot-starter-data-jpa
Version: 3.2.5
Version: 3.3.0
POM Project URL: https://spring.io/projects/spring-boot


Expand Down Expand Up @@ -4612,7 +4612,7 @@ Embedded license:
See the License for the specific language governing permissions and
limitations under the License.

Spring Boot 3.2.5
Spring Boot 3.3.0
Copyright (c) 2012-2024 VMware, Inc.

This product is licensed to you under the Apache License, Version 2.0
Expand All @@ -4624,7 +4624,7 @@ the License.
(36 of 38)
Group: org.springframework.boot
Name: spring-boot-starter-log4j2
Version: 3.2.4
Version: 3.3.1
POM Project URL: https://spring.io/projects/spring-boot


Expand Down Expand Up @@ -4837,7 +4837,7 @@ Embedded license:
See the License for the specific language governing permissions and
limitations under the License.

Spring Boot 3.2.4
Spring Boot 3.3.1
Copyright (c) 2012-2024 VMware, Inc.

This product is licensed to you under the Apache License, Version 2.0
Expand All @@ -4849,7 +4849,7 @@ the License.
(37 of 38)
Group: org.springframework.boot
Name: spring-boot-starter-web
Version: 3.2.4
Version: 3.3.1
POM Project URL: https://spring.io/projects/spring-boot


Expand Down Expand Up @@ -5062,7 +5062,7 @@ Embedded license:
See the License for the specific language governing permissions and
limitations under the License.

Spring Boot 3.2.4
Spring Boot 3.3.1
Copyright (c) 2012-2024 VMware, Inc.

This product is licensed to you under the Apache License, Version 2.0
Expand Down
14 changes: 13 additions & 1 deletion spc.install4j
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</modules>
</jreBundles>
</application>
<files defaultOverwriteMode="1" defaultUninstallMode="2" launcherOverwriteMode="1" defaultFileMode="755" preserveMode="true">
<files defaultOverwriteMode="1" defaultUninstallMode="2" launcherOverwriteMode="1" defaultFileMode="755">
<mountPoints>
<mountPoint id="26" />
</mountPoints>
Expand Down Expand Up @@ -392,6 +392,18 @@ if they so desire. By default $USERHOME/ServerPackCreator will be used for them.
<property name="closeStrategy" type="enum" class="com.install4j.runtime.beans.actions.misc.CloseStrategy" value="ASK_FOR_CLOSE_AND_TERMINATE" />
</serializedBean>
</action>
<action id="379" beanClass="com.install4j.runtime.beans.actions.files.DeleteFileAction" actionElevationType="elevated" rollbackBarrierExitCode="0">
<serializedBean>
<property name="files" type="array" class="java.io.File" length="1">
<element index="0">
<object class="java.io.File">
<string>.</string>
</object>
</element>
</property>
<property name="recursive" type="boolean" value="true" />
</serializedBean>
</action>
<action id="17" beanClass="com.install4j.runtime.beans.actions.InstallFilesAction" actionElevationType="elevated" rollbackBarrierExitCode="0" failureStrategy="quit" errorMessage="${i18n:FileCorrupted}" />
<action id="18" beanClass="com.install4j.runtime.beans.actions.desktop.CreateProgramGroupAction" actionElevationType="elevated" rollbackBarrierExitCode="0">
<serializedBean>
Expand Down

0 comments on commit 2213764

Please sign in to comment.