This is an automated email from the ASF dual-hosted git repository.
kaze pushed a commit to branch spring_boot_2
in repository https://gitbox.apache.org/repos/asf/fineract-cn-provisioner.git
The following commit(s) were added to refs/heads/spring_boot_2 by this push:
new 38410a9 update to spring boot 2
new ab046fe Merge pull request #17 from muellners/spring_boot_2
38410a9 is described below
commit 38410a90de593021248edd6983a5a26c717321ea
Author: xurror <[email protected]>
AuthorDate: Fri May 15 14:21:08 2020 +0100
update to spring boot 2
---
.gitignore | 4 +++
api/build.gradle | 14 +++++---
.../cn/provisioner/api/v1/client/Provisioner.java | 2 +-
component-test/build.gradle | 17 +++++----
.../cn/provisioner/AbstractServiceTest.java | 2 +-
.../tenant/TestTenantApplicationAssignment.java | 14 ++++----
gradle/wrapper/gradle-wrapper.properties | 2 +-
service/build.gradle | 23 +++++++-----
shared.gradle | 41 ++++++++++++----------
9 files changed, 71 insertions(+), 48 deletions(-)
diff --git a/.gitignore b/.gitignore
index c17a923..64d293a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,10 @@
**/build/
**/target/
**/out/
+.settings/
+.project
+.classpath
+bin/
# Ignore Gradle GUI config
gradle-app.setting
diff --git a/api/build.gradle b/api/build.gradle
index f846390..0d42cd9 100644
--- a/api/build.gradle
+++ b/api/build.gradle
@@ -23,10 +23,10 @@ buildscript {
}
plugins {
- id 'com.github.hierynomus.license' version '0.13.1'
- id("org.nosphere.apache.rat") version "0.5.2"
- id "com.jfrog.artifactory" version "4.9.5"
- id "io.spring.dependency-management" version "1.0.8.RELEASE"
+ id 'com.github.hierynomus.license' version '0.15.0'
+ id 'org.nosphere.apache.rat' version '0.6.0'
+ id 'com.jfrog.artifactory' version '4.15.1'
+ id "io.spring.dependency-management" version "1.0.9.RELEASE"
id 'maven-publish'
id 'java'
}
@@ -35,7 +35,7 @@ apply from: '../shared.gradle'
dependencies {
compile(
- [group: 'org.springframework.cloud', name:
'spring-cloud-starter-feign'],
+ [group: 'org.springframework.cloud', name:
'spring-cloud-starter-openfeign'],
[group: 'org.apache.fineract.cn', name: 'api', version:
versions.frameworkapi],
[group: 'org.hibernate', name: 'hibernate-validator', version:
versions.validator]
)
@@ -45,6 +45,10 @@ dependencies {
)
}
+jar {
+ enabled = true
+}
+
publishing {
publications {
api(MavenPublication) {
diff --git
a/api/src/main/java/org/apache/fineract/cn/provisioner/api/v1/client/Provisioner.java
b/api/src/main/java/org/apache/fineract/cn/provisioner/api/v1/client/Provisioner.java
index 7c0d27a..7868d19 100644
---
a/api/src/main/java/org/apache/fineract/cn/provisioner/api/v1/client/Provisioner.java
+++
b/api/src/main/java/org/apache/fineract/cn/provisioner/api/v1/client/Provisioner.java
@@ -29,7 +29,7 @@ import java.util.List;
import javax.validation.Valid;
import org.apache.fineract.cn.api.annotation.ThrowsException;
import org.apache.fineract.cn.api.util.CustomFeignClientsConfiguration;
-import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.PathVariable;
diff --git a/component-test/build.gradle b/component-test/build.gradle
index ab06748..6a4bcc5 100644
--- a/component-test/build.gradle
+++ b/component-test/build.gradle
@@ -17,7 +17,7 @@
buildscript {
ext {
- springBootVersion = '1.4.1.RELEASE'
+ springBootVersion = '2.2.6.RELEASE'
}
repositories {
@@ -30,10 +30,11 @@ buildscript {
}
plugins {
- id 'com.github.hierynomus.license' version '0.13.1'
- id("org.nosphere.apache.rat") version "0.5.2"
- id "com.jfrog.artifactory" version "4.9.5"
- id "org.springframework.boot" version "1.4.3.RELEASE"
+ id 'com.github.hierynomus.license' version '0.15.0'
+ id 'org.nosphere.apache.rat' version '0.6.0'
+ id 'com.jfrog.artifactory' version '4.15.1'
+ id "io.spring.dependency-management" version "1.0.9.RELEASE"
+ id "org.springframework.boot" version "2.2.6.RELEASE"
id 'maven-publish'
id 'java'
}
@@ -41,7 +42,7 @@ plugins {
apply from: '../shared.gradle'
apply plugin: 'org.asciidoctor.convert'
-bootRepackage {
+bootJar {
enabled = false
}
@@ -69,6 +70,10 @@ asciidoctor {
attributes "source-highlighter": "highlightjs", 'snippets':
file('build/doc/generated-snippets/')
}
+jar {
+ enabled = true
+}
+
publishing {
publications {
componentTest(MavenPublication) {
diff --git
a/component-test/src/main/java/org/apache/fineract/cn/provisioner/AbstractServiceTest.java
b/component-test/src/main/java/org/apache/fineract/cn/provisioner/AbstractServiceTest.java
index 4e1ce2a..44f602b 100644
---
a/component-test/src/main/java/org/apache/fineract/cn/provisioner/AbstractServiceTest.java
+++
b/component-test/src/main/java/org/apache/fineract/cn/provisioner/AbstractServiceTest.java
@@ -30,7 +30,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.netflix.feign.EnableFeignClients;
+import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.cloud.netflix.ribbon.RibbonClient;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
diff --git
a/component-test/src/main/java/org/apache/fineract/cn/provisioner/tenant/TestTenantApplicationAssignment.java
b/component-test/src/main/java/org/apache/fineract/cn/provisioner/tenant/TestTenantApplicationAssignment.java
index 02b4605..27c228e 100644
---
a/component-test/src/main/java/org/apache/fineract/cn/provisioner/tenant/TestTenantApplicationAssignment.java
+++
b/component-test/src/main/java/org/apache/fineract/cn/provisioner/tenant/TestTenantApplicationAssignment.java
@@ -77,7 +77,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.netflix.feign.EnableFeignClients;
+import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.cloud.netflix.ribbon.RibbonClient;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -262,8 +262,8 @@ public class TestTenantApplicationAssignment {
@Override
public ApplicationSignatureSet answer(final InvocationOnMock invocation)
throws Throwable {
- final String timestamp = invocation.getArgumentAt(0, String.class);
- final Signature identityManagerSignature = invocation.getArgumentAt(1,
Signature.class);
+ final String timestamp = invocation.getArgument(0, String.class);
+ final Signature identityManagerSignature = invocation.getArgument(1,
Signature.class);
validSecurityContext =
systemSecurityEnvironment.isValidSystemSecurityContext(target, "1",
tenantIdentifier);
return new ApplicationSignatureSet(
@@ -339,7 +339,7 @@ public class TestTenantApplicationAssignment {
validSecurityContext = validSecurityContext &&
validSecurityContextForThisCall;
callCount++;
- final PermittableGroup arg = invocation.getArgumentAt(0,
PermittableGroup.class);
+ final PermittableGroup arg = invocation.getArgument(0,
PermittableGroup.class);
identityListener.onCreatePermittableGroup(tenantIdentifier,
arg.getIdentifier());
return null;
}
@@ -366,8 +366,8 @@ public class TestTenantApplicationAssignment {
public Void answer(final InvocationOnMock invocation) throws Throwable {
validSecurityContext =
systemSecurityEnvironment.isValidSystemSecurityContext("identity", "1",
tenantIdentifier);
- final String applicationIdentifier = invocation.getArgumentAt(0,
String.class);
- final String keyTimestamp = invocation.getArgumentAt(1, String.class);
+ final String applicationIdentifier = invocation.getArgument(0,
String.class);
+ final String keyTimestamp = invocation.getArgument(1, String.class);
identityListener.onSetApplicationSignature(tenantIdentifier,
gson.toJson(new ApplicationSignatureEvent(applicationIdentifier,
keyTimestamp)));
return null;
@@ -396,7 +396,7 @@ public class TestTenantApplicationAssignment {
validSecurityContext = validSecurityContext &&
validSecurityContextForThisCall;
callCount++;
- final String callApplicationIdentifier = invocation.getArgumentAt(0,
String.class);
+ final String callApplicationIdentifier = invocation.getArgument(0,
String.class);
Assert.assertEquals(this.applicationIdentifier,
callApplicationIdentifier);
return null;
}
diff --git a/gradle/wrapper/gradle-wrapper.properties
b/gradle/wrapper/gradle-wrapper.properties
index 290541c..a4b4429 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/service/build.gradle b/service/build.gradle
index 09003e6..4bc0c41 100644
--- a/service/build.gradle
+++ b/service/build.gradle
@@ -17,7 +17,7 @@
buildscript {
ext {
- springBootVersion = '1.4.1.RELEASE'
+ springBootVersion = '2.2.6.RELEASE'
}
repositories {
@@ -26,10 +26,11 @@ buildscript {
}
plugins {
- id 'com.github.hierynomus.license' version '0.13.1'
- id("org.nosphere.apache.rat") version "0.5.2"
- id "com.jfrog.artifactory" version "4.9.5"
- id "org.springframework.boot" version "1.4.3.RELEASE"
+ id 'com.github.hierynomus.license' version '0.15.0'
+ id 'org.nosphere.apache.rat' version '0.6.0'
+ id 'com.jfrog.artifactory' version '4.15.1'
+ id "io.spring.dependency-management" version "1.0.9.RELEASE"
+ id 'org.springframework.boot' version '2.2.6.RELEASE'
id 'maven'
id 'maven-publish'
id 'java'
@@ -38,7 +39,7 @@ plugins {
apply from: '../shared.gradle'
-bootRepackage {
+bootJar {
enabled = true
classifier = 'boot'
}
@@ -46,7 +47,7 @@ bootRepackage {
dependencies {
compile(
[group: 'org.springframework.cloud', name:
'spring-cloud-starter-config'],
- [group: 'org.springframework.cloud', name:
'spring-cloud-starter-eureka'],
+ [group: 'org.springframework.cloud', name:
'spring-cloud-starter-netflix-eureka-client'],
[group: 'org.springframework.boot', name:
'spring-boot-starter-jetty'],
[group: 'org.springframework', name: 'spring-jms', version:
versions.springcontext],
[group: 'org.apache.activemq', name: 'activemq-broker', version:
versions.activeMQ],
@@ -72,8 +73,12 @@ dependencies {
)
}
+jar {
+ enabled = true
+}
+
tasks.withType(PublishToMavenLocal) { task ->
- task.dependsOn 'bootRepackage'
+ task.dependsOn 'bootJar'
}
publishing {
@@ -86,7 +91,7 @@ publishing {
}
bootService(MavenPublication) {
// "boot" jar
-
artifact(file("$buildDir/libs/$project.name-$project.version-${bootRepackage.classifier}.jar"))
+
artifact(file("$buildDir/libs/$project.name-$project.version-${bootJar.classifier}.jar"))
groupId project.group
artifactId ("$project.name-boot")
version project.findProperty('externalVersion') ?: project.version
diff --git a/shared.gradle b/shared.gradle
index df19a19..d687098 100644
--- a/shared.gradle
+++ b/shared.gradle
@@ -16,22 +16,22 @@
*/
group 'org.apache.fineract.cn.provisioner'
-version '0.1.0-BUILD-SNAPSHOT'
+version 'spring_boot_2-SNAPSHOT'
ext.versions = [
- fineractidentityservice : '0.1.0-BUILD-SNAPSHOT',
- frameworkanubis : '0.1.0-BUILD-SNAPSHOT',
- frameworkanput : '0.1.0-BUILD-SNAPSHOT',
- frameworkapi : '0.1.0-BUILD-SNAPSHOT',
- frameworklang : '0.1.0-BUILD-SNAPSHOT',
- frameworkasync : '0.1.0-BUILD-SNAPSHOT',
- frameworkcassandra : '0.1.0-BUILD-SNAPSHOT',
- frameworkmariadb : '0.1.0-BUILD-SNAPSHOT',
- frameworkcrypto : '0.1.0-BUILD-SNAPSHOT',
- frameworktest : '0.1.0-BUILD-SNAPSHOT',
- springcontext : '4.3.3.RELEASE',
+ fineractidentityservice : 'spring_boot_2-SNAPSHOT',
+ frameworkanubis : 'spring_boot_2-SNAPSHOT',
+ frameworkanput : 'spring_boot_2-SNAPSHOT',
+ frameworkapi : 'spring_boot_2-SNAPSHOT',
+ frameworklang : 'spring_boot_2-SNAPSHOT',
+ frameworkasync : 'spring_boot_2-SNAPSHOT',
+ frameworkcassandra : 'spring_boot_2-SNAPSHOT',
+ frameworkmariadb : 'spring_boot_2-SNAPSHOT',
+ frameworkcrypto : 'spring_boot_2-SNAPSHOT',
+ frameworktest : 'spring_boot_2-SNAPSHOT',
+ springcontext : '5.2.5.RELEASE',
activeMQ : '5.13.2',
- validator : '5.3.0.Final'
+ validator : '6.1.4.Final'
]
tasks.withType(JavaCompile) {
@@ -47,8 +47,8 @@ repositories {
dependencyManagement {
imports {
- mavenBom 'io.spring.platform:platform-bom:Athens-RELEASE'
- mavenBom
'org.springframework.cloud:spring-cloud-dependencies:Camden.SR1'
+ mavenBom 'io.spring.platform:platform-bom:Cairo-SR8'
+ mavenBom
'org.springframework.cloud:spring-cloud-dependencies:Hoxton.SR3'
}
}
@@ -61,8 +61,9 @@ ext['spring-data-releasetrain.version'] = 'Gosling-SR2A'
dependencies {
compile(
[group: 'com.google.code.findbugs', name: 'jsr305'],
- [group: 'org.apache.fineract.cn', name: 'postgresql', version:
'0.1.0-BUILD-SNAPSHOT'],
- [group: 'postgresql', name: 'postgresql', version: '9.0-801.jdbc4']
+ [group: 'org.apache.fineract.cn', name: 'postgresql', version:
'spring_boot_2-SNAPSHOT'],
+ [group: 'org.postgresql', name: 'postgresql', version: '42.2.12'],
+ [group: 'org.mockito', name: 'mockito-core', version: '3.3.3']
)
testCompile(
@@ -115,6 +116,10 @@ rat {
"README.md",
"**/.dockerignore/**",
"**/logs/**/*.log",
- "**/banner.txt"
+ "**/banner.txt",
+ ".settings/**",
+ ".project",
+ ".classpath",
+ "**/bin/**"
]
}
