diff --git a/build.gradle b/build.gradle index 4d538cf7..9a6d3523 100644 --- a/build.gradle +++ b/build.gradle @@ -83,15 +83,14 @@ modifyPom { repositories { mavenLocal() mavenCentral() - jcenter() } dependencies { // https://mvnrepository.com/artifact/org.fulib/fulibScenarios - fulibScenarios group: 'org.fulib', name: 'fulibScenarios', version: '1.6.2' + fulibScenarios group: 'org.fulib', name: 'fulibScenarios', version: '1.7.0' // https://mvnrepository.com/artifact/org.antlr/antlr4 - antlr group: 'org.antlr', name: 'antlr4', version: '4.9.1' + antlr group: 'org.antlr', name: 'antlr4', version: '4.9.2' // https://mvnrepository.com/artifact/org.fulib/fulibYaml api group: 'org.fulib', name: 'fulibYaml', version: '1.5.0' @@ -100,24 +99,24 @@ dependencies { implementation group: 'org.antlr', name: 'ST4', version: '4.3.1' // https://mvnrepository.com/artifact/org.antlr/antlr4-runtime - implementation group: 'org.antlr', name: 'antlr4-runtime', version: '4.9.1' + implementation group: 'org.antlr', name: 'antlr4-runtime', version: '4.9.2' // https://mvnrepository.com/artifact/org.hamcrest/hamcrest-library testImplementation group: 'org.hamcrest', name: 'hamcrest-library', version: '2.2' // https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api - testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.7.1' + testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.7.2' // https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-params - testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: '5.7.1' + testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: '5.7.2' // https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-engine - testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.7.1' + testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.7.2' - genCompile sourceSets.main.output + sourceSets.main.runtimeClasspath + genImplementation sourceSets.main.output + sourceSets.main.runtimeClasspath // https://mvnrepository.com/artifact/org.fulib/fulibTools - genCompile group: 'org.fulib', name: 'fulibTools', version: '1.4.1' + genImplementation group: 'org.fulib', name: 'fulibTools', version: '1.5.1' } if (JavaVersion.current().java11Compatible) { diff --git a/src/main/java/org/fulib/classmodel/Attribute.java b/src/main/java/org/fulib/classmodel/Attribute.java index 59394083..39fbffd7 100644 --- a/src/main/java/org/fulib/classmodel/Attribute.java +++ b/src/main/java/org/fulib/classmodel/Attribute.java @@ -171,6 +171,7 @@ private static String buildTypeSignature(String type) * * @since 1.5 */ + @Deprecated public boolean isBoolean() { return Type.BOOLEAN.equals(this.type); diff --git a/test/build.gradle b/test/build.gradle index ff6b2eac..b8ddd7dc 100644 --- a/test/build.gradle +++ b/test/build.gradle @@ -9,12 +9,11 @@ version = '0.1.0' repositories { mavenLocal() mavenCentral() - jcenter() } dependencies { // https://mvnrepository.com/artifact/org.fulib/fulibScenarios - fulibScenarios group: 'org.fulib', name: 'fulibScenarios', version: '1.4.2', { + fulibScenarios group: 'org.fulib', name: 'fulibScenarios', version: '1.7.0', { exclude group: 'org.fulib', module: 'fulib' } @@ -22,16 +21,16 @@ dependencies { fulibScenarios rootProject // https://mvnrepository.com/artifact/it.unimi.dsi/fastutil - def fastUtil = [ group: 'it.unimi.dsi', name: 'fastutil', version: '8.4.2' ] + def fastUtil = [ group: 'it.unimi.dsi', name: 'fastutil', version: '8.5.4' ] - compile fastUtil - genCompile fastUtil + implementation fastUtil + genImplementation fastUtil // https://mvnrepository.com/artifact/junit/junit - testCompile group: 'junit', name: 'junit', version: '4.13' + testImplementation group: 'junit', name: 'junit', version: '4.13.2' // https://mvnrepository.com/artifact/org.fulib/fulibTools - testCompile group: 'org.fulib', name: 'fulibTools', version: '1.2.1' + testImplementation group: 'org.fulib', name: 'fulibTools', version: '1.5.1' } generateScenarioSource { diff --git a/test/doc/images/studyRightObjects.png b/test/doc/images/studyRightObjects.png index 6492763c..3d85dfd8 100644 Binary files a/test/doc/images/studyRightObjects.png and b/test/doc/images/studyRightObjects.png differ diff --git a/test/src/main/java/de/uniks/studyright/classDiagram.png b/test/src/main/java/de/uniks/studyright/classDiagram.png index d7ec1a39..e29543e5 100644 Binary files a/test/src/main/java/de/uniks/studyright/classDiagram.png and b/test/src/main/java/de/uniks/studyright/classDiagram.png differ diff --git a/test/src/main/java/org/fulib/docs/classDiagram.png b/test/src/main/java/org/fulib/docs/classDiagram.png index 9d3cdeab..6979ed70 100644 Binary files a/test/src/main/java/org/fulib/docs/classDiagram.png and b/test/src/main/java/org/fulib/docs/classDiagram.png differ diff --git a/test/src/main/java/org/fulib/docs/dtos/dto/classDiagram.png b/test/src/main/java/org/fulib/docs/dtos/dto/classDiagram.png index dc3d3919..7d9b3577 100644 Binary files a/test/src/main/java/org/fulib/docs/dtos/dto/classDiagram.png and b/test/src/main/java/org/fulib/docs/dtos/dto/classDiagram.png differ diff --git a/test/src/main/java/org/fulib/docs/dtos/model/classDiagram.png b/test/src/main/java/org/fulib/docs/dtos/model/classDiagram.png index a3f54b3b..30c5bff5 100644 Binary files a/test/src/main/java/org/fulib/docs/dtos/model/classDiagram.png and b/test/src/main/java/org/fulib/docs/dtos/model/classDiagram.png differ