From 2469905e94f63d199a273eda1f58867acda33135 Mon Sep 17 00:00:00 2001
From: Bogdan Kostov <kostobog@fel.cvut.cz>
Date: Wed, 3 Jan 2024 11:50:18 +0100
Subject: [PATCH] [#47] Upgrade to jopa 2.0.0-SNAPSHOT

---
 build.gradle                                       | 14 +++++++-------
 .../environment/config/TestPersistenceConfig.java  |  1 -
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/build.gradle b/build.gradle
index 7d187978..fee02383 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,15 +2,11 @@ buildscript {
     repositories {
         maven { url "https://plugins.gradle.org/m2/" }
     }
-    dependencies {
-        classpath "io.freefair.gradle:aspectj-plugin:6.4.3"
-    }
 }
 
 plugins {
     id 'org.springframework.boot' version '3.1.5'
     id 'io.spring.dependency-management' version '1.1.3'
-    id 'io.freefair.aspectj.post-compile-weaving' version '8.4'
     id 'java'
     id 'war'
 }
@@ -25,6 +21,12 @@ compileJava {
 
 repositories {
     mavenCentral()
+    maven{
+        url "https://oss.sonatype.org/content/repositories/snapshots"
+        mavenContent {
+            snapshotsOnly()
+        }
+    }
 }
 
 war {
@@ -34,7 +36,7 @@ war {
 sourceSets.main.java.srcDirs += "src/main/generated"
 
 dependencies {
-    def jopaVersion = '1.1.4'
+    def jopaVersion = '2.0.0-SNAPSHOT'
     implementation "cz.cvut.kbss.jopa:jopa-impl:$jopaVersion"
     implementation "cz.cvut.kbss.jopa:ontodriver-rdf4j:$jopaVersion"
     implementation 'cz.cvut.kbss.jsonld:jb4jsonld-jackson:0.13.2'
@@ -57,8 +59,6 @@ dependencies {
 
     implementation 'javax.xml.bind:jaxb-api:2.3.1' // needed for java 17
 
-    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'
     }
diff --git a/src/test/java/cz/cvut/kbss/analysis/environment/config/TestPersistenceConfig.java b/src/test/java/cz/cvut/kbss/analysis/environment/config/TestPersistenceConfig.java
index ccc3de60..e971c421 100755
--- a/src/test/java/cz/cvut/kbss/analysis/environment/config/TestPersistenceConfig.java
+++ b/src/test/java/cz/cvut/kbss/analysis/environment/config/TestPersistenceConfig.java
@@ -9,7 +9,6 @@
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 @Configuration
-@EnableAspectJAutoProxy(proxyTargetClass = true)
 @ComponentScan(basePackages = "cz.cvut.kbss.analysis.persistence")
 @Import({TestPersistenceFactory.class})
 @EnableTransactionManagement