Skip to content

Commit

Permalink
Add dynamic adapter config extension version to parent gradle file, c…
Browse files Browse the repository at this point in the history
…hange mirket-adapter plugins java to java-library
  • Loading branch information
TURGAY CAN committed Jan 12, 2025
1 parent 10ade59 commit 66e8284
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 11 deletions.
2 changes: 2 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ ext {
//main libs
integration : '1.0.0',
middleware : '1.0.0',
//adapter ext
dac_bridge : '1.0.0',
//ext libs
spring_boot_ws : '3.1.5',
spring_ws_core : '4.0.5',
Expand Down
10 changes: 5 additions & 5 deletions example/ms-example/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ targetCompatibility = JavaVersion.VERSION_17

repositories {
mavenCentral()
mavenLocal()
}

tasks.withType(Tar).configureEach {
Expand All @@ -27,14 +28,13 @@ tasks.withType(Zip).configureEach {
}

dependencies {
implementation 'org.springframework.boot:spring-boot-starter-web'

//INFO : for versioning it should be api!! DO NOT REMOVE THE INFO LINE.
// implementation 'com.inomera.adapters:mirket-adapter:1.0.0'
//INFO : disabled comment out line for only development!! DO NOT REMOVE THE INFO LINE
implementation project(path: ':mirket-adapter')
implementation project(path: ':micro-integration')
implementation project(path: ':micro-middleware')
implementation project(path: ':dynamic-adapter-config-bridge')
implementation 'com.inomera.telco.commons:config-manager-spring:4.0.0'

implementation 'org.springframework.boot:spring-boot-starter-web'
developmentOnly 'org.springframework.boot:spring-boot-devtools'
testImplementation 'org.springframework.boot:spring-boot-starter-test'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
Expand Down
2 changes: 1 addition & 1 deletion example/ms-example/src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ config-manager:
reload:
enabled: true
trigger: cron
cron-expression: '0/2 * * * * ?'
cron-expression: '0/30 * * * * ?'
properties:
property-files: classpath:settings.properties
2 changes: 1 addition & 1 deletion example/ms-example/src/main/resources/settings.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
config.adapter.common.v1={"logging":{"strategy":"REQ_RES","sensitiveFields":[],"nonLoggingFields":[]},"headers":{},"http":{"requestTimeout":30000,"connectTimeout":10000,"idleConnectionsTimeout":180000,"maxConnections":10,"maxConnPerRoute":10,"poolConcurrencyPolicy":"LAX","timeToLive":60000,"skipSsl":true,"redirectsEnable":true},"auth":{"type":"NONE"}}
config.adapter.mirket.v1={"auth":{"type":"BEARER","username":"username","password":"password","url":"https://www.googleapis.com/oauth2/v4/token","grantType":"urn:ietf:params:oauth:grant-type:jwt-bearer","ttl":3600000,"scope":"https://www.googleapis.com/auth/cloud-platform","clientId":"client_id","clientSecret":"client_secret","contentType":"application/x-www-form-urlencoded","accept":"application/json","tokenJsonPath":"$.access_token"},"headers":{"X-GW-TOKEN":""},"http":{"requestTimeout":30000,"connectTimeout":10000,"idleConnectionsTimeout":60000,"maxConnections":50,"maxConnPerRoute":50,"poolConcurrencyPolicy":"LAX","timeToLive":60000,"skipSsl":true,"redirectsEnable":true},"logging":{"strategy":"REQ_RES","sensitiveFields":["Authorization"],"nonLoggingFields":["file","content"]},"url":"https://api.mirket.inomera.com/v10/first"}
config.adapter.mirket.v1={"auth":{"type":"NONE"},"headers":{"X-GW-TOKEN":""},"http":{"requestTimeout":30000,"connectTimeout":10000,"idleConnectionsTimeout":60000,"maxConnections":50,"maxConnPerRoute":50,"poolConcurrencyPolicy":"LAX","timeToLive":60000,"skipSsl":true,"redirectsEnable":true},"logging":{"strategy":"REQ_RES","sensitiveFields":["Authorization"],"nonLoggingFields":["file","content"]},"url":"https://api.mirket.inomera.com/"}
config.adapter.country.v1={"logging":{"strategy":"ALL","sensitiveFields":[],"nonLoggingFields":[]},"headers":{},"http":{"requestTimeout":30000,"connectTimeout":10000,"idleConnectionsTimeout":180000,"maxConnections":10,"maxConnPerRoute":10,"poolConcurrencyPolicy":"LAX","timeToLive":60000,"skipSsl":true,"redirectsEnable":true},"auth":{"type":"NONE"},"url": "http://webservices.oorsprong.org/websamples.countryinfo/CountryInfoService.wso"}
17 changes: 13 additions & 4 deletions mirket-adapter/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'java'
id 'java-library'
id 'maven-publish'
}

Expand All @@ -10,6 +10,11 @@ println "Gradle Artifact for other projects: \ncompile '${group}:${name}:${versi
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17

repositories {
mavenLocal()
mavenCentral()
}

configurations {
compileOnly {
extendsFrom annotationProcessor
Expand All @@ -25,14 +30,18 @@ ext.jaxwsSourceDir = "src/main/java"

compileJava.dependsOn(processResources, 'wsimport')

compileJava.dependsOn(processResources)

dependencies {

implementation project(path: ':micro-integration')
//INFO : for versioning it should be api!! DO NOT REMOVE THE INFO LINE
// publishToMavenLocal for local lib testing
// api "com.inomera.integration:micro-middleware:${versions.middleware}"
// api "com.inomera.integration.ext:dynamic-adapter-config-bridge:${versions.dac_bridge}"
//INFO : disabled comment out line for only development!! DO NOT REMOVE THE INFO LINE
implementation project(path: ':micro-middleware')
implementation project(path: ':dynamic-adapter-config-bridge')

implementation 'com.inomera.telco.commons:config-manager-spring:4.0.0'

// soap
implementation "org.springframework.boot:spring-boot-starter-web-services:${versions.spring_boot_ws}"

Expand Down

0 comments on commit 66e8284

Please sign in to comment.