Compare commits

..

6 Commits

Author SHA1 Message Date
705140629b Merge branch 'test' into Hithomelabs/CFTunnels#114 2026-04-18 22:34:46 +05:30
c6d9b0994d Merge pull request 'Fix build issues - Spring Boot plugin, imports, and ENV default' (#116) from Dave/CFTunnels:ISSUE-114 into test
Reviewed-on: Hithomelabs/CFTunnels#116
2026-04-18 16:16:05 +00:00
29b767d634 Hithomelabs/CFTunnels#114: Fix properties parser blocking issue
Fixed the malformed comment in application.properties:
- Changed "/ * * Masking" to "# Making" to create a valid comment
- This was causing the properties parser to fail
2026-04-18 15:29:40 +00:00
6304c69577 Fix ENV variable with default value 2026-04-18 15:06:25 +00:00
7fdfdacf50 Fix by adding explicit import statements 2026-04-18 15:06:11 +00:00
e4a51ed9f8 Fix build by using buildscript pattern instead of plugin DSL 2026-04-18 15:05:51 +00:00
2 changed files with 19 additions and 8 deletions

View File

@ -1,9 +1,19 @@
plugins {
id 'java'
id 'org.springframework.boot' version '3.4.5'
id 'io.spring.dependency-management' version '1.1.7'
buildscript {
repositories {
mavenCentral()
}
dependencies {
classpath("org.springframework.boot:spring-boot-gradle-plugin:3.4.5")
}
}
plugins {
id 'java'
id 'io.spring.dependency-management' version '1.1.7'
}
apply plugin: 'org.springframework.boot'
group = 'com.hithomelabs'
version = '0.0.1-SNAPSHOT'
@ -45,9 +55,10 @@ repositories {
dependencies {
implementation group: 'org.springdoc', name: 'springdoc-openapi-starter-webmvc-ui', version: '2.8.5'
implementation group: 'org.springframework.boot', name:'spring-boot-starter-oauth2-client', version: '3.5.5'
implementation 'org.springframework.boot:spring-boot-starter'
implementation 'org.springframework.boot:spring-boot-starter-web'
compileOnly 'org.projectlombok:lombok:1.18.30'
annotationProcessor 'org.projectlombok:lombok:1.18.30'
implementation 'org.springframework.boot:spring-boot-starter-web'
testImplementation 'org.springframework.boot:spring-boot-starter-test'
testImplementation 'org.springframework.security:spring-security-test'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'

View File

@ -2,9 +2,9 @@ spring.application.name=CFTunnels
cloudflare.accountId=${CLOUDFLARE_ACCOUNT_ID}
cloudflare.apiKey=${CLOUDFLARE_API_KEY}
cloudflare.email=${CLOUDFLARE_EMAIL}
spring.profiles.active=${ENV}
spring.profiles.active=${ENV:default}
/ * * Masking sure app works behind a reverse proxy
# Making sure app works behind a reverse proxy
server.forward-headers-strategy=framework
spring.security.oauth2.client.registration.cftunnels.client-id=${OAUTH_CLIENT_ID}