You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fineract.apache.org by ju...@apache.org on 2020/05/13 17:13:42 UTC
[fineract-cn-data-jpa] branch spring_boot_2 updated: update spring
dependencies
This is an automated email from the ASF dual-hosted git repository.
juhan pushed a commit to branch spring_boot_2
in repository https://gitbox.apache.org/repos/asf/fineract-cn-data-jpa.git
The following commit(s) were added to refs/heads/spring_boot_2 by this push:
new ed96861 update spring dependencies
new edbdd48 Merge pull request #10 from muellners/spring_boot_2
ed96861 is described below
commit ed968611c49a2870cc081a6d697ba5baac7258ed
Author: xurror <ka...@outlook.com>
AuthorDate: Sun Apr 19 15:25:33 2020 +0100
update spring dependencies
Update deps
update spring dependencies
fix gradle build
update dependencies
---
.gitignore | 4 ++
build.gradle | 49 ++++++++++++----------
gradle/wrapper/gradle-wrapper.properties | 2 +-
.../fineract/cn/core/data/jpa/TestDataJpa.java | 5 ++-
4 files changed, 35 insertions(+), 25 deletions(-)
diff --git a/.gitignore b/.gitignore
index 0e7231f..d2fbec4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,10 @@
**/build/
**/target/
**/out/
+.project
+.settings
+.classpath
+bin
# Ignore Gradle GUI config
gradle-app.setting
diff --git a/build.gradle b/build.gradle
index a26d2fb..8f7dbd0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -22,28 +22,21 @@ buildscript {
url 'http://repo.spring.io/plugins-release'
}
}
-
- dependencies {
- classpath 'org.springframework.build.gradle:propdeps-plugin:0.0.7'
- classpath 'io.spring.gradle:dependency-management-plugin:0.6.1.RELEASE'
- }
}
plugins {
- id "com.github.hierynomus.license" version "0.13.1"
- id("org.nosphere.apache.rat") version "0.3.1"
- 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 'idea'
id 'java'
}
group 'org.apache.fineract.cn'
-version '0.1.0-BUILD-SNAPSHOT'
-
-apply plugin: 'propdeps'
-apply plugin: 'propdeps-idea'
+version 'spring_boot_2-SNAPSHOT'
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
@@ -56,25 +49,34 @@ repositories {
dependencyManagement {
imports {
- mavenBom 'io.spring.platform:platform-bom:Athens-RELEASE'
+ mavenBom 'io.spring.platform:platform-bom:Cairo-SR8'
}
}
dependencies {
compile (
- [group: 'org.springframework.boot', name: 'spring-boot-starter-data-jpa', version: '1.4.1.RELEASE'],
- [group: 'org.apache.commons', name: 'commons-dbcp2', version: '2.1.1'],
- [group: 'org.liquibase', name: 'liquibase-core', version: '3.5.3'],
- [group: 'org.apache.fineract.cn', name: 'lang', version: '0.1.0-BUILD-SNAPSHOT'],
+ [group: 'org.springframework.boot', name: 'spring-boot-starter-data-jpa'],
+ [group: 'org.apache.commons', name: 'commons-dbcp2'],
+ [group: 'org.liquibase', name: 'liquibase-core'],
+ [group: 'org.apache.fineract.cn', name: 'lang', version: 'spring_boot_2-SNAPSHOT'],
[group: 'com.google.code.findbugs', name: 'jsr305']
)
testCompile (
[group: 'org.springframework.boot', name: 'spring-boot-starter-test'],
- [group: 'org.hsqldb', name: 'hsqldb', version: '2.3.4']
+ [group: 'org.hsqldb', name: 'hsqldb'],
+ [group: 'junit', name: 'junit']
)
}
+bootJar {
+ enabled = false
+}
+
+jar {
+ enabled = true
+}
+
publishing {
publications {
databaseConnector(MavenPublication) {
@@ -122,7 +124,10 @@ rat {
"**/build/**",
"gradlew",
"gradlew.bat",
- "README.md"
+ "README.md",
+ ".project",
+ ".classpath",
+ ".settings/**",
+ "**/bin/**"
]
- plainOutput = true
-}
+}
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 290541c..6623300 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-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/src/test/java/org/apache/fineract/cn/core/data/jpa/TestDataJpa.java b/src/test/java/org/apache/fineract/cn/core/data/jpa/TestDataJpa.java
index 1770db3..031c723 100644
--- a/src/test/java/org/apache/fineract/cn/core/data/jpa/TestDataJpa.java
+++ b/src/test/java/org/apache/fineract/cn/core/data/jpa/TestDataJpa.java
@@ -18,6 +18,7 @@
*/
package org.apache.fineract.cn.core.data.jpa;
+
import org.apache.fineract.cn.core.data.jpa.local.repository.DataSourceInstance;
import org.apache.fineract.cn.core.data.jpa.local.repository.DataSourceInstanceRepository;
import org.apache.fineract.cn.lang.AutoTenantContext;
@@ -57,10 +58,10 @@ public class TestDataJpa {
dataSourceInstance.setUsername("SA");
this.dataSourceInstanceRepository.save(dataSourceInstance);
- Assert.assertNotNull(this.dataSourceInstanceRepository.findOne(randomIdentifier));
+ Assert.assertNotNull(this.dataSourceInstanceRepository.findById(randomIdentifier));
try (final AutoTenantContext autoTenantContext = new AutoTenantContext(randomIdentifier)) {
- this.dataSourceInstanceRepository.findOne(randomIdentifier);
+ this.dataSourceInstanceRepository.findById(randomIdentifier);
Assert.fail();
} catch (final Exception ex) {
// do nothing expected