diff --git a/common/gradle/wrapper/gradle-wrapper.properties b/common/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index f7664bccf..000000000 --- a/common/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,6 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip -validateDistributionUrl=true -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/proprietary/LICENSE-proprietary b/proprietary/LICENSE-proprietary index f723a2809..9f8fef545 100644 --- a/proprietary/LICENSE-proprietary +++ b/proprietary/LICENSE-proprietary @@ -4,33 +4,14 @@ Copyright (c) 2025-present Stirling Tools With regard to the Stirling PDF Software: -This software and associated documentation files (the "Software") may only be -used in production, if you (and any entity that you represent) have agreed to, -and are in compliance with, the Stirling PDF Terms of Service, available -at https://www.stirlingpdf.com/terms-and-conditions (the “EE Terms”), or other -agreement governing the use of the Software, as agreed by you and Stirling PDF, -and otherwise have a valid Stirling PDF Enterprise Edition subscription for the -correct number of user seats. Subject to the foregoing sentence, you are free to -modify this Software and publish patches to the Software. You agree that Stirling PDF -and/or its licensors (as applicable) retain all right, title and interest in and -to all such modifications and/or patches, and all such modifications and/or -patches may only be used, copied, modified, displayed, distributed, or otherwise -exploited with a valid Stirling PDF Enterprise Edition subscription for the correct -number of user seats. Notwithstanding the foregoing, you may copy and modify -the Software for development and testing purposes, without requiring a -subscription. You agree that Stirling PDF and/or its licensors (as applicable) retain -all right, title and interest in and to all such modifications. You are not -granted any other rights beyond what is expressly stated herein. Subject to the -foregoing, it is forbidden to copy, merge, publish, distribute, sublicense, -and/or sell the Software. +Trial and Minimal Use -This EE License applies only to the part of this Software that is not -distributed as part of MIT License. Any part of this Software -distributed as part of MIT License or is served client-side as an image, font, -cascading stylesheet (CSS), file which produces or is compiled, arranged, -augmented, or combined into client-side JavaScript, in whole or in part, is -copyrighted under the MIT Expat license. The full text of this EE License shall -be included in all copies or substantial portions of the Software. +You may use the Software without a subscription for purposes of trial, evaluation, or minimal use, including use by individuals, +organizations, or businesses, provided that: + * The usage is limited in scope (e.g. up to five (5) sessions or uses, or as otherwise defined within the Software); + * You do not modify, distribute, sublicense, or reverse-engineer the Software; + * Any continued use beyond the permitted trial or minimal use scope requires a valid Stirling PDF Enterprise Edition + subscription for the appropriate number of users. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, diff --git a/proprietary/build.gradle b/proprietary/build.gradle index 8f548a785..5c91d21ba 100644 --- a/proprietary/build.gradle +++ b/proprietary/build.gradle @@ -19,25 +19,24 @@ configurations.all { dependencyManagement { imports { - mavenBom 'org.springframework.boot:spring-boot-dependencies:3.4.5' + mavenBom 'org.springframework.boot:spring-boot-dependencies:3.5.0' } } dependencies { implementation project(':common') - implementation 'org.springframework:spring-jdbc:6.2.7' - implementation 'org.springframework:spring-webmvc:6.2.7' + implementation 'org.springframework:spring-jdbc' + implementation 'org.springframework:spring-webmvc' + implementation 'org.springframework.session:spring-session-core' + implementation "org.springframework.security:spring-security-core:$springSecuritySamlVersion" + implementation "org.springframework.security:spring-security-saml2-service-provider:$springSecuritySamlVersion" implementation 'org.springframework.boot:spring-boot-starter-jetty' implementation 'org.springframework.boot:spring-boot-starter-security' implementation 'org.springframework.boot:spring-boot-starter-data-jpa' implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' implementation 'org.springframework.boot:spring-boot-starter-mail' - implementation "org.springframework.security:spring-security-core:$springSecuritySamlVersion" - implementation "org.springframework.security:spring-security-saml2-service-provider:$springSecuritySamlVersion" - implementation 'org.springframework.session:spring-session-core:3.4.3' implementation 'io.swagger.core.v3:swagger-core-jakarta:2.2.30' - implementation 'com.bucket4j:bucket4j_jdk17-core:8.14.0' // https://mvnrepository.com/artifact/com.bucket4j/bucket4j_jdk17 diff --git a/proprietary/gradle/wrapper/gradle-wrapper.properties b/proprietary/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index f7664bccf..000000000 --- a/proprietary/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,6 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip -validateDistributionUrl=true -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists