Skip to content

Commit a40b089

Browse files
tschuehlytschuehly
committed
Update dependencies
1 parent 41cf111 commit a40b089

15 files changed

Lines changed: 362 additions & 239 deletions

File tree

‎.github/workflows/release.yml‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,10 @@ jobs:
156156
run: ./gradlew :thymeleaf:publish
157157
- name: Publish thymeleaf package to maven central
158158
env:
159-
JRELEASER_NEXUS2_USERNAME: ${{ secrets.JRELEASER_NEXUS2_USERNAME }}
160-
JRELEASER_NEXUS2_PASSWORD: ${{ secrets.JRELEASER_NEXUS2_PASSWORD }}
159+
JRELEASER_NEXUS2_USERNAME: ${{ secrets.JRELEASER_MAVENCENTRAL_SONATYPE_USERNAME }}
160+
JRELEASER_NEXUS2_TOKEN: ${{ secrets.JRELEASER_MAVENCENTRAL_SONATYPE_TOKEN }}
161+
JRELEASER_MAVENCENTRAL_USERNAME: ${{ secrets.JRELEASER_MAVENCENTRAL_SONATYPE_USERNAME }}
162+
JRELEASER_MAVENCENTRAL_TOKEN: ${{ secrets.JRELEASER_MAVENCENTRAL_SONATYPE_TOKEN}}
161163
JRELEASER_GPG_PASSPHRASE: ${{ secrets.JRELEASER_GPG_PASSPHRASE }}
162164
JRELEASER_GPG_SECRET_KEY: ${{ secrets.JRELEASER_GPG_SECRET_KEY }}
163165
JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.JRELEASER_GPG_PUBLIC_KEY }}
@@ -167,8 +169,10 @@ jobs:
167169
run: ./gradlew :jte:publish
168170
- name: Publish jte package to maven central
169171
env:
170-
JRELEASER_NEXUS2_USERNAME: ${{ secrets.JRELEASER_NEXUS2_USERNAME }}
171-
JRELEASER_NEXUS2_PASSWORD: ${{ secrets.JRELEASER_NEXUS2_PASSWORD }}
172+
JRELEASER_NEXUS2_USERNAME: ${{ secrets.JRELEASER_MAVENCENTRAL_SONATYPE_USERNAME }}
173+
JRELEASER_NEXUS2_TOKEN: ${{ secrets.JRELEASER_MAVENCENTRAL_SONATYPE_TOKEN }}
174+
JRELEASER_MAVENCENTRAL_USERNAME: ${{ secrets.JRELEASER_MAVENCENTRAL_SONATYPE_USERNAME }}
175+
JRELEASER_MAVENCENTRAL_TOKEN: ${{ secrets.JRELEASER_MAVENCENTRAL_SONATYPE_TOKEN}}
172176
JRELEASER_GPG_PASSPHRASE: ${{ secrets.JRELEASER_GPG_PASSPHRASE }}
173177
JRELEASER_GPG_SECRET_KEY: ${{ secrets.JRELEASER_GPG_SECRET_KEY }}
174178
JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.JRELEASER_GPG_PUBLIC_KEY }}
@@ -178,8 +182,10 @@ jobs:
178182
run: ./gradlew :kte:publish
179183
- name: Publish kte package to maven central
180184
env:
181-
JRELEASER_NEXUS2_USERNAME: ${{ secrets.JRELEASER_NEXUS2_USERNAME }}
182-
JRELEASER_NEXUS2_PASSWORD: ${{ secrets.JRELEASER_NEXUS2_PASSWORD }}
185+
JRELEASER_NEXUS2_USERNAME: ${{ secrets.JRELEASER_MAVENCENTRAL_SONATYPE_USERNAME }}
186+
JRELEASER_NEXUS2_TOKEN: ${{ secrets.JRELEASER_MAVENCENTRAL_SONATYPE_TOKEN }}
187+
JRELEASER_MAVENCENTRAL_USERNAME: ${{ secrets.JRELEASER_MAVENCENTRAL_SONATYPE_USERNAME }}
188+
JRELEASER_MAVENCENTRAL_TOKEN: ${{ secrets.JRELEASER_MAVENCENTRAL_SONATYPE_TOKEN}}
183189
JRELEASER_GPG_PASSPHRASE: ${{ secrets.JRELEASER_GPG_PASSPHRASE }}
184190
JRELEASER_GPG_SECRET_KEY: ${{ secrets.JRELEASER_GPG_SECRET_KEY }}
185191
JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.JRELEASER_GPG_PUBLIC_KEY }}
@@ -189,8 +195,10 @@ jobs:
189195
run: ./gradlew :core:publish
190196
- name: Publish core package to maven central
191197
env:
192-
JRELEASER_NEXUS2_USERNAME: ${{ secrets.JRELEASER_NEXUS2_USERNAME }}
193-
JRELEASER_NEXUS2_PASSWORD: ${{ secrets.JRELEASER_NEXUS2_PASSWORD }}
198+
JRELEASER_NEXUS2_USERNAME: ${{ secrets.JRELEASER_MAVENCENTRAL_SONATYPE_USERNAME }}
199+
JRELEASER_NEXUS2_TOKEN: ${{ secrets.JRELEASER_MAVENCENTRAL_SONATYPE_TOKEN }}
200+
JRELEASER_MAVENCENTRAL_USERNAME: ${{ secrets.JRELEASER_MAVENCENTRAL_SONATYPE_USERNAME }}
201+
JRELEASER_MAVENCENTRAL_TOKEN: ${{ secrets.JRELEASER_MAVENCENTRAL_SONATYPE_TOKEN}}
194202
JRELEASER_GPG_PASSPHRASE: ${{ secrets.JRELEASER_GPG_PASSPHRASE }}
195203
JRELEASER_GPG_SECRET_KEY: ${{ secrets.JRELEASER_GPG_SECRET_KEY }}
196204
JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.JRELEASER_GPG_PUBLIC_KEY }}

‎.run/testAll.run.xml‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="testAll" type="GradleRunConfiguration" factoryName="Gradle">
3+
<ExternalSystemSettings>
4+
<option name="executionName" />
5+
<option name="externalProjectPath" value="$PROJECT_DIR$" />
6+
<option name="externalSystemIdString" value="GRADLE" />
7+
<option name="scriptParameters" value="" />
8+
<option name="taskDescriptions">
9+
<list />
10+
</option>
11+
<option name="taskNames">
12+
<list>
13+
<option value=":examples:thymeleaf-kotlin-example:test" />
14+
<option value=":examples:thymeleaf-java-example:test" />
15+
<option value=":examples:kte-example:test" />
16+
<option value=":examples:jte-example:test" />
17+
</list>
18+
</option>
19+
<option name="vmOptions" />
20+
</ExternalSystemSettings>
21+
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
22+
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
23+
<EXTENSION ID="com.intellij.execution.ExternalSystemRunConfigurationJavaExtension">
24+
<extension name="net.ashald.envfile">
25+
<option name="IS_ENABLED" value="false" />
26+
<option name="IS_SUBST" value="false" />
27+
<option name="IS_PATH_MACRO_SUPPORTED" value="false" />
28+
<option name="IS_IGNORE_MISSING_FILES" value="false" />
29+
<option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
30+
<ENTRIES>
31+
<ENTRY IS_ENABLED="true" PARSER="runconfig" IS_EXECUTABLE="false" />
32+
</ENTRIES>
33+
</extension>
34+
</EXTENSION>
35+
<DebugAllEnabled>false</DebugAllEnabled>
36+
<RunAsTest>false</RunAsTest>
37+
<method v="2" />
38+
</configuration>
39+
<configuration default="false" name="testAll" type="GradleRunConfiguration" factoryName="Gradle">
40+
<ExternalSystemSettings>
41+
<option name="executionName" />
42+
<option name="externalProjectPath" value="$PROJECT_DIR$" />
43+
<option name="externalSystemIdString" value="GRADLE" />
44+
<option name="scriptParameters" value="" />
45+
<option name="taskDescriptions">
46+
<list />
47+
</option>
48+
<option name="taskNames">
49+
<list>
50+
<option value=":examples:thymeleaf-kotlin-example:test" />
51+
<option value=":examples:thymeleaf-java-example:test" />
52+
<option value=":examples:kte-example:test" />
53+
<option value=":examples:jte-example:test" />
54+
</list>
55+
</option>
56+
<option name="vmOptions" />
57+
</ExternalSystemSettings>
58+
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
59+
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
60+
<EXTENSION ID="com.intellij.execution.ExternalSystemRunConfigurationJavaExtension">
61+
<extension name="net.ashald.envfile">
62+
<option name="IS_ENABLED" value="false" />
63+
<option name="IS_SUBST" value="false" />
64+
<option name="IS_PATH_MACRO_SUPPORTED" value="false" />
65+
<option name="IS_IGNORE_MISSING_FILES" value="false" />
66+
<option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
67+
<ENTRIES>
68+
<ENTRY IS_ENABLED="true" PARSER="runconfig" IS_EXECUTABLE="false" />
69+
</ENTRIES>
70+
</extension>
71+
</EXTENSION>
72+
<DebugAllEnabled>false</DebugAllEnabled>
73+
<RunAsTest>false</RunAsTest>
74+
<method v="2" />
75+
</configuration>
76+
</component>

‎README.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ spring.view-component.local-development=true
227227
<summary>Gradle</summary>
228228

229229
```kotlin
230-
implementation("de.tschuehly:spring-view-component-thymeleaf:0.8.3")
230+
implementation("de.tschuehly:spring-view-component-thymeleaf:0.9.0-SNAPSHOT")
231231
sourceSets {
232232
main {
233233
resources {
@@ -249,7 +249,7 @@ sourceSets {
249249
<dependency>
250250
<groupId>de.tschuehly</groupId>
251251
<artifactId>spring-view-component-thymeleaf</artifactId>
252-
<version>0.8.3</version>
252+
<version>0.9.0-SNAPSHOT</version>
253253
</dependency>
254254
</dependencies>
255255
<build>
@@ -286,10 +286,10 @@ sourceSets {
286286

287287
```kotlin
288288
plugins {
289-
id("gg.jte.gradle") version("3.1.12")
289+
id("gg.jte.gradle") version("3.2.1")
290290
}
291291

292-
implementation("de.tschuehly:spring-view-component-jte:0.8.3")
292+
implementation("de.tschuehly:spring-view-component-jte:0.9.0-SNAPSHOT")
293293

294294
jte{
295295
generate()
@@ -308,7 +308,7 @@ jte{
308308
<dependency>
309309
<groupId>de.tschuehly</groupId>
310310
<artifactId>spring-view-component-jte</artifactId>
311-
<version>0.8.3</version>
311+
<version>0.9.0-SNAPSHOT</version>
312312
</dependency>
313313
</dependencies>
314314
<build>
@@ -352,7 +352,7 @@ plugins {
352352
}
353353

354354
dependencies {
355-
implementation("de.tschuehly:spring-view-component-kte:0.8.3")
355+
implementation("de.tschuehly:spring-view-component-kte:0.9.0-SNAPSHOT")
356356
}
357357

358358
jte {

‎core/build.gradle.kts‎

Lines changed: 30 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
1-
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
21
import org.jreleaser.model.Active
32

43
plugins {
5-
id("org.springframework.boot") version "3.2.4"
6-
id("io.spring.dependency-management") version "1.1.4"
7-
kotlin("jvm") version "1.9.23"
8-
kotlin("plugin.spring") version "1.9.23"
4+
id("org.springframework.boot") version "3.5.6"
5+
id("io.spring.dependency-management") version "1.1.7"
6+
kotlin("jvm") version "2.2.20"
7+
kotlin("plugin.spring") version "2.2.20"
98

109
id("maven-publish")
11-
id("org.jreleaser") version "1.13.0"
10+
id("org.jreleaser") version "1.20.0"
1211
id("signing")
1312
id("java-test-fixtures")
1413
}
1514

1615
group = "de.tschuehly"
17-
version = "0.8.4"
16+
version = "0.9.0-SNAPSHOT"
1817
java.sourceCompatibility = JavaVersion.VERSION_17
1918

2019
repositories {
@@ -36,14 +35,13 @@ dependencies {
3635

3736
}
3837

39-
tasks.withType<KotlinCompile> {
40-
kotlinOptions {
41-
freeCompilerArgs = listOf("-Xjsr305=strict")
42-
jvmTarget = "17"
38+
kotlin {
39+
compilerOptions {
40+
freeCompilerArgs.addAll("-Xjsr305=strict", "-Xannotation-default-target=param-property")
4341
}
42+
jvmToolchain(17)
4443
}
4544

46-
4745
tasks.withType<Test> {
4846
useJUnitPlatform()
4947
}
@@ -59,12 +57,12 @@ java {
5957
}
6058

6159

62-
tasks.jar{
60+
tasks.jar {
6361
enabled = true
6462
// Remove `plain` postfix from jar file name
6563
archiveClassifier.set("")
6664
}
67-
publishing{
65+
publishing {
6866
publications {
6967

7068
create<MavenPublication>("Maven") {
@@ -89,7 +87,7 @@ publishing{
8987
developers {
9088
developer {
9189
id.set("tschuehly")
92-
name.set("Thomas Schuehly")
90+
name.set("Thomas Schilling")
9391
email.set("thomas.schuehly@outlook.com")
9492
}
9593
}
@@ -110,7 +108,7 @@ publishing{
110108

111109
jreleaser {
112110
project {
113-
copyright.set("Thomas Schuehly")
111+
copyright.set("Thomas Schilling")
114112
}
115113
gitRootSearch.set(true)
116114
signing {
@@ -119,18 +117,29 @@ jreleaser {
119117
}
120118
deploy {
121119
maven {
122-
nexus2 {
123-
create("maven-central") {
120+
mavenCentral {
121+
122+
create("release-deploy") {
124123
active.set(Active.ALWAYS)
125-
url.set("https://s01.oss.sonatype.org/service/local")
126-
snapshotUrl.set("https://s01.oss.sonatype.org/content/repositories/snapshots/")
124+
url.set("https://central.sonatype.com/api/v1/publisher")
125+
stagingRepositories.add("build/staging-deploy")
126+
}
127+
}
128+
nexus2 {
129+
create("snapshot-deploy") {
130+
active.set(Active.SNAPSHOT)
131+
snapshotSupported.set(true)
132+
url.set("https://central.sonatype.com/api/v1/publisher")
133+
snapshotUrl.set("https://central.sonatype.com/repository/maven-snapshots")
134+
127135
closeRepository.set(true)
128136
releaseRepository.set(true)
129137
stagingRepositories.add("build/staging-deploy")
138+
applyMavenCentralRules = true
130139
}
131-
132140
}
133141
}
134142
}
135143

144+
136145
}

‎examples/jte-example/build.gradle.kts‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ import kotlin.io.path.Path
22

33
plugins {
44
java
5-
id("org.springframework.boot") version "3.2.4"
6-
id("io.spring.dependency-management") version "1.1.4"
7-
id("gg.jte.gradle") version("3.1.12")
5+
id("org.springframework.boot") version "3.5.6"
6+
id("io.spring.dependency-management") version "1.1.7"
7+
id("gg.jte.gradle") version("3.2.1")
88
}
99

1010
group = "de.tschuehly"
@@ -26,14 +26,15 @@ repositories {
2626
dependencies {
2727
implementation("org.springframework.boot:spring-boot-starter-web")
2828

29-
implementation("de.tschuehly:spring-view-component-jte:0.8.4")
29+
implementation("de.tschuehly:spring-view-component-jte:0.9.0-SNAPSHOT")
3030

3131
implementation("org.webjars.npm:htmx.org:1.9.11")
32-
implementation("org.webjars:webjars-locator-core:0.58")
32+
implementation("org.webjars:webjars-locator-lite:1.1.0")
33+
runtimeOnly("org.springframework.boot:spring-boot-devtools")
3334

3435
testImplementation("org.springframework.boot:spring-boot-starter-test")
3536
testRuntimeOnly("org.springframework.boot:spring-boot-devtools")
36-
testImplementation(testFixtures("de.tschuehly:spring-view-component-core:0.8.4"))
37+
testImplementation(testFixtures("de.tschuehly:spring-view-component-core:0.9.0-SNAPSHOT"))
3738
}
3839

3940
tasks.withType<Test> {

‎examples/jte-example/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<description>JTE Example</description>
1616
<properties>
1717
<java.version>17</java.version>
18-
<view.component.version>0.8.4</view.component.version>
18+
<view.component.version>0.9.0-SNAPSHOT</view.component.version>
1919
</properties>
2020
<dependencies>
2121
<dependency>

‎examples/jte-example/src/test/java/de/tschuehly/example/jte/JteIntegrationTest.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,10 @@
11
package de.tschuehly.example.jte;
22

33
import de.tschuehly.spring.viewcomponent.core.IntegrationTestBase;
4-
import org.springframework.beans.factory.annotation.Autowired;
54
import org.springframework.boot.test.context.SpringBootTest;
6-
import org.springframework.boot.test.web.client.TestRestTemplate;
75

86
@SpringBootTest(
97
webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT
108
)
119
class JteIntegrationTest extends IntegrationTestBase {
12-
13-
@Autowired
14-
TestRestTemplate testRestTemplate;
1510
}

0 commit comments

Comments
 (0)