diff --git a/.gitignore b/.gitignore
index 296d3f0..4a391bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
.gradle
**/build/
!**/src/**/build/
+**.bak
# Ignore Gradle GUI config
gradle-app.setting
diff --git a/1-architecture/build.gradle b/1-architecture/build.gradle
index 7797b89..63b9205 100644
--- a/1-architecture/build.gradle
+++ b/1-architecture/build.gradle
@@ -1,7 +1,7 @@
plugins {
id 'base'
- id 'name.jurgenei.gradle.archi' version '0.1.10'
- id 'name.jurgenei.gradle.xml' version '0.1.11'
+ id 'name.jurgenei.gradle.archi'
+ id 'name.jurgenei.gradle.xml'
}
group = rootProject.group
@@ -10,7 +10,7 @@ version = rootProject.version
def archimateInput = file('src/main/resources/archimate/test-lineage.archimate')
def archiExportDir = layout.buildDirectory.dir('archi-export')
def archiXmlOutput = layout.buildDirectory.file('archi-export/test-lineage.export.xml')
-def archiModelXmlOutput = layout.buildDirectory.file('archi-export/test-lineage.sexpr')
+def archiModelXmlOutput = layout.buildDirectory.file('archi-export/test-lineage.xir')
def archiXlsxOutput = layout.buildDirectory.file('archi-export/test-lineage.xlsx')
def obsoleteExportDir = layout.buildDirectory.dir('archimate-export')
diff --git a/1-architecture/src/main/resources/archimate/test-lineage.archimate b/1-architecture/src/main/resources/archimate/test-lineage.archimate
index 026318f..162171d 100644
--- a/1-architecture/src/main/resources/archimate/test-lineage.archimate
+++ b/1-architecture/src/main/resources/archimate/test-lineage.archimate
@@ -3,7 +3,7 @@
-
+
# testapp
Application to test linage functionality
@@ -18,16 +18,60 @@ Application to test linage functionality
</app>
```
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/2-application/src/test/java/name/jurgenei/example/lineage/GrowthCrossModuleContractTest.java b/2-application/src/test/java/name/jurgenei/example/lineage/GrowthCrossModuleContractTest.java
index d8fe0d8..e82d67c 100644
--- a/2-application/src/test/java/name/jurgenei/example/lineage/GrowthCrossModuleContractTest.java
+++ b/2-application/src/test/java/name/jurgenei/example/lineage/GrowthCrossModuleContractTest.java
@@ -17,7 +17,7 @@ void shouldDefineArchimateExportContract() throws Exception {
assertThat(architectureBuild).contains("name.jurgenei.gradle.archi");
assertThat(architectureBuild).contains("name.jurgenei.gradle.xml");
assertThat(architectureBuild).contains("test-lineage.export.xml");
- assertThat(architectureBuild).contains("test-lineage.sexpr");
+ assertThat(architectureBuild).contains("test-lineage.xir");
assertThat(architectureBuild).contains("test-lineage.xlsx");
assertThat(architectureBuild).contains("archi-export/pdf");
}
diff --git a/3-lineage/build.gradle b/3-lineage/build.gradle
index 450f9c3..e28788e 100644
--- a/3-lineage/build.gradle
+++ b/3-lineage/build.gradle
@@ -1,7 +1,7 @@
plugins {
id 'base'
- id 'name.jurgenei.gradle.antlr.plsql' version '0.1.4'
- id 'name.jurgenei.gradle.xml' version '0.1.11'
+ id 'name.jurgenei.gradle.antlr.plsql'
+ id 'name.jurgenei.gradle.xml'
}
group = rootProject.group
@@ -16,8 +16,8 @@ def configureParTask = { Object t ->
t.aggressiveGc.set(true)
t.gcEveryFiles.set(20)
t.gcHeapThresholdPercent.set(80)
- t.targetExtension.set('.sexpr')
- t.sexprFormat.set('beautified')
+ t.targetExtension.set('.xir')
+ t.xirFormat.set('beautified')
t.continueOnError.set(true)
}
@@ -62,9 +62,9 @@ tasks.register('extract', XsltTask) {
dependsOn('ast')
style 'src/main/xsl/extract.xsl'
source(fileTree(astDir) {
- include '**/*.sexpr'
+ include '**/*.xir'
})
- outputExtension.set('.sexpr')
+ outputExtension.set('.xir')
sexprFormat.set('beautified')
outputDir.set(file(extractDir))
// workers.set(4)
diff --git a/build.gradle b/build.gradle
index 9aa9d3b..9f0bf2d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,9 +2,12 @@ plugins {
id 'base'
id 'org.owasp.dependencycheck' version '13.0.0' apply false
id 'com.github.spotbugs' version '6.5.11' apply false
+ id 'name.jurgenei.gradle.archi' version '0.1.10' apply false
+ id 'name.jurgenei.gradle.xml' version '0.1.12' apply false
+ id 'name.jurgenei.gradle.antlr.plsql' version '0.1.5' apply false
}
-version = '0.1.3'
+version = '0.1.4'
group = 'name.jurgenei.example.lineage.plsql'
allprojects {
@@ -86,7 +89,7 @@ tasks.register('assembleArchitecture') {
def exportDir = project(':architecture').layout.buildDirectory.dir('archi-export').get().asFile
def pdfDir = new File(exportDir, 'pdf')
requireFiles([
- new File(exportDir, 'test-lineage.sexpr'),
+ new File(exportDir, 'test-lineage.xir'),
new File(exportDir, 'test-lineage.xlsx')
])
def pdfFiles = (pdfDir.listFiles() ?: [] as File[]).findAll { it.isFile() && it.name.endsWith('.pdf') }