Skip to content

Commit

Permalink
Merge pull request #45 from kbss-cvut/upgrade/issue-44-upgrade-jopa
Browse files Browse the repository at this point in the history
[#44] Upgrading project build
  • Loading branch information
kostobog authored Nov 27, 2023
2 parents 9007f40 + 6b25341 commit 489d921
Show file tree
Hide file tree
Showing 20 changed files with 258 additions and 195 deletions.
22 changes: 11 additions & 11 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ buildscript {
maven { url "https://plugins.gradle.org/m2/" }
}
dependencies {
classpath "io.freefair.gradle:aspectj-plugin:3.8.4"
classpath "io.freefair.gradle:aspectj-plugin:6.4.3"
}
}

plugins {
id 'org.springframework.boot' version '2.3.4.RELEASE'
id 'io.spring.dependency-management' version '1.0.10.RELEASE'
id "io.freefair.aspectj.post-compile-weaving" version "4.1.4"
id 'org.springframework.boot' version '2.7.17'
id 'io.spring.dependency-management' version '1.1.3'
id 'io.freefair.aspectj.post-compile-weaving' version '8.4'
id 'java'
id 'war'
}
Expand All @@ -19,8 +19,8 @@ group = 'cz.cvut.kbss.analysis'
version = '0.0.1-SNAPSHOT'

compileJava {
sourceCompatibility = '1.8'
targetCompatibility = '1.8'
sourceCompatibility = '11'
targetCompatibility = '11'
}

repositories {
Expand All @@ -34,11 +34,11 @@ war {
sourceSets.main.java.srcDirs += "src/main/generated"

dependencies {
def jopaVersion = '0.14.7'
def jopaVersion = '1.1.4'
implementation "cz.cvut.kbss.jopa:jopa-impl:$jopaVersion"
implementation "cz.cvut.kbss.jopa:ontodriver-sesame:$jopaVersion"
implementation 'cz.cvut.kbss.jsonld:jb4jsonld-jackson:0.5.1'
implementation 'com.github.ledsoft:jopa-spring-transaction:0.0.7'
implementation "cz.cvut.kbss.jopa:ontodriver-rdf4j:$jopaVersion"
implementation 'cz.cvut.kbss.jsonld:jb4jsonld-jackson:0.13.2'
implementation 'com.github.ledsoft:jopa-spring-transaction:0.2.0'

implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'org.springframework.boot:spring-boot-starter-security'
Expand All @@ -53,7 +53,7 @@ dependencies {
annotationProcessor 'org.projectlombok:lombok:1.18.12'
providedRuntime 'org.springframework.boot:spring-boot-starter-tomcat'

aspect 'cz.cvut.kbss.jopa:jopa-impl:0.14.4'
aspect 'cz.cvut.kbss.jopa:jopa-impl:1.1.4'

testImplementation('org.springframework.boot:spring-boot-starter-test') {
exclude group: 'org.junit.vintage', module: 'junit-vintage-engine'
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
6 changes: 3 additions & 3 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Sun Sep 20 16:24:26 CEST 2020
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit 489d921

Please sign in to comment.