Skip to content

Commit 57624db

Browse files
refactor: flatten structure, bom as separate project
Signed-off-by: Marcello Rinaldo Martina <martina.marcello.rinaldo@outlook.com>
1 parent fdf0611 commit 57624db

26 files changed

Lines changed: 313 additions & 289 deletions

File tree

kura/tools/kura-addon-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,48 +30,51 @@
3030

3131
<fileSets>
3232
<fileSet filtered="true" encoding="UTF-8">
33-
<directory>parent/target-definition</directory>
33+
<directory>bom</directory>
34+
</fileSet>
35+
<fileSet filtered="true" encoding="UTF-8">
36+
<directory>target-definition</directory>
3437
</fileSet>
3538
<fileSet filtered="true" encoding="UTF-8">
3639
<directory>distrib</directory>
3740
</fileSet>
3841
<!-- exclude keystores from filtering, otherwise they get corrupted -->
3942
<fileSet filtered="true" encoding="UTF-8">
40-
<directory>parent/tests/test-env</directory>
43+
<directory>tests/test-env</directory>
4144
<excludes>
4245
<exclude>**/*.ks</exclude>
4346
</excludes>
4447
</fileSet>
4548
<!-- include keystores without filtering -->
4649
<fileSet filtered="false">
47-
<directory>parent/tests/test-env</directory>
50+
<directory>tests/test-env</directory>
4851
<includes>
4952
<include>**/*.ks</include>
5053
</includes>
5154
</fileSet>
5255
<!-- include bundles and tests without java file, they are selected as packaged below -->
5356
<fileSet filtered="true" encoding="UTF-8">
54-
<directory>parent/__package__</directory>
57+
<directory>__package__</directory>
5558
<excludes>
5659
<exclude>**/*.java</exclude>
5760
</excludes>
5861
</fileSet>
5962
<fileSet filtered="true" encoding="UTF-8">
60-
<directory>parent</directory>
63+
<!-- <directory>./</directory> -->
6164
<excludes>
6265
<exclude>**/*.java</exclude>
6366
<exclude>**/src/main/java/test</exclude>
6467
<exclude>**/src/test/java/test</exclude>
6568
</excludes>
6669
</fileSet>
6770
<fileSet filtered="true" packaged="true">
68-
<directory>parent/__package__/src/main/java</directory>
71+
<directory>__package__/src/main/java</directory>
6972
</fileSet>
7073
<fileSet filtered="true" packaged="true">
71-
<directory>parent/tests/__package__.test/src/main/java</directory>
74+
<directory>tests/__package__.test/src/main/java</directory>
7275
</fileSet>
7376
<fileSet filtered="true" packaged="true">
74-
<directory>parent/tests/__package__.test/src/test/java</directory>
77+
<directory>tests/__package__.test/src/test/java</directory>
7578
</fileSet>
7679
<fileSet encoding="UTF-8">
7780
<directory></directory>

kura/tools/kura-addon-archetype/src/main/resources/archetype-resources/parent/__package__/META-INF/MANIFEST.MF renamed to kura/tools/kura-addon-archetype/src/main/resources/archetype-resources/__package__/META-INF/MANIFEST.MF

File renamed without changes.

kura/tools/kura-addon-archetype/src/main/resources/archetype-resources/parent/__package__/build.properties renamed to kura/tools/kura-addon-archetype/src/main/resources/archetype-resources/__package__/build.properties

File renamed without changes.

kura/tools/kura-addon-archetype/src/main/resources/archetype-resources/parent/__package__/pom.xml renamed to kura/tools/kura-addon-archetype/src/main/resources/archetype-resources/__package__/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
<parent>
2222
<groupId>${groupId}</groupId>
23-
<artifactId>${artifactId}-parent</artifactId>
23+
<artifactId>${artifactId}</artifactId>
2424
<version>${version}</version>
2525
</parent>
2626

kura/tools/kura-addon-archetype/src/main/resources/archetype-resources/parent/__package__/src/main/java/ExampleComponent.java renamed to kura/tools/kura-addon-archetype/src/main/resources/archetype-resources/__package__/src/main/java/ExampleComponent.java

File renamed without changes.

kura/tools/kura-addon-archetype/src/main/resources/archetype-resources/parent/__package__/src/main/java/ExampleComponentOCD.java renamed to kura/tools/kura-addon-archetype/src/main/resources/archetype-resources/__package__/src/main/java/ExampleComponentOCD.java

File renamed without changes.

kura/tools/kura-addon-archetype/src/main/resources/archetype-resources/parent/__package__/src/main/java/ExampleComponentOptions.java renamed to kura/tools/kura-addon-archetype/src/main/resources/archetype-resources/__package__/src/main/java/ExampleComponentOptions.java

File renamed without changes.

kura/tools/kura-addon-archetype/src/main/resources/archetype-resources/parent/__package__/src/main/java/ExampleDependencyService.java renamed to kura/tools/kura-addon-archetype/src/main/resources/archetype-resources/__package__/src/main/java/ExampleDependencyService.java

File renamed without changes.

kura/tools/kura-addon-archetype/src/main/resources/archetype-resources/parent/__package__/src/main/java/ExampleDependencyServiceComponent.java renamed to kura/tools/kura-addon-archetype/src/main/resources/archetype-resources/__package__/src/main/java/ExampleDependencyServiceComponent.java

File renamed without changes.

kura/tools/kura-addon-archetype/src/main/resources/archetype-resources/parent/__package__/src/main/java/Property.java renamed to kura/tools/kura-addon-archetype/src/main/resources/archetype-resources/__package__/src/main/java/Property.java

File renamed without changes.

0 commit comments

Comments
 (0)