Skip to content

Commit 02f3166

Browse files
ruhan1claude
andcommitted
Update parent version to 21 and fix assembly descriptors
- Update parent version from 18 to 21 for release to central portal - Fix assembly descriptor dependency patterns for maven-assembly-plugin 3.6.0 compatibility by updating from *:tar.gz:classifier:* to *:*:tar.gz:classifier:* format (groupId:artifactId:type:classifier:version) - Remove obsolete fileSet from data.xml that referenced non-existent target/var/lib/indy/data directory This resolves the "archive cannot be empty" build error with parent version 21. Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
1 parent 731f46b commit 02f3166

File tree

5 files changed

+13
-20
lines changed

5 files changed

+13
-20
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.commonjava</groupId>
2323
<artifactId>commonjava</artifactId>
24-
<version>18</version>
24+
<version>21</version>
2525
</parent>
2626

2727
<groupId>org.commonjava.indy</groupId>

tools/assemblies/src/main/resources/assemblies/complete.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
<useProjectArtifact>false</useProjectArtifact>
6464
<scope>provided</scope>
6565
<includes>
66-
<include>*:tar.gz:dataset:*</include>
66+
<include>*:*:tar.gz:dataset:*</include>
6767
</includes>
6868
<outputDirectory>var/lib/indy/data</outputDirectory>
6969
<unpack>true</unpack>
@@ -73,7 +73,7 @@
7373
<useProjectArtifact>false</useProjectArtifact>
7474
<scope>provided</scope>
7575
<includes>
76-
<include>*:tar.gz:docset:*</include>
76+
<include>*:*:tar.gz:docset:*</include>
7777
</includes>
7878
<outputDirectory>usr/share/doc/indy</outputDirectory>
7979
<unpack>true</unpack>
@@ -83,7 +83,7 @@
8383
<useProjectArtifact>false</useProjectArtifact>
8484
<scope>provided</scope>
8585
<includes>
86-
<include>*:tar.gz:binset:*</include>
86+
<include>*:*:tar.gz:binset:*</include>
8787
</includes>
8888
<outputDirectory>bin</outputDirectory>
8989
<unpack>true</unpack>
@@ -93,7 +93,7 @@
9393
<useProjectArtifact>false</useProjectArtifact>
9494
<scope>provided</scope>
9595
<includes>
96-
<include>*:tar.gz:confset:*</include>
96+
<include>*:*:tar.gz:confset:*</include>
9797
</includes>
9898
<outputDirectory>etc/indy</outputDirectory>
9999
<unpack>true</unpack>
@@ -103,7 +103,7 @@
103103
<useProjectArtifact>false</useProjectArtifact>
104104
<scope>provided</scope>
105105
<includes>
106-
<include>*:tar.gz:uiset:*</include>
106+
<include>*:*:tar.gz:uiset:*</include>
107107
</includes>
108108
<outputDirectory>var/lib/indy/ui</outputDirectory>
109109
<unpack>true</unpack>
@@ -113,7 +113,7 @@
113113
<useProjectArtifact>false</useProjectArtifact>
114114
<scope>provided</scope>
115115
<includes>
116-
<include>*:tar.gz:reactui:*</include>
116+
<include>*:*:tar.gz:reactui:*</include>
117117
</includes>
118118
<outputDirectory>var/lib/indy/ui</outputDirectory>
119119
<unpack>true</unpack>

tools/assemblies/src/main/resources/assemblies/data.xml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,11 @@
2323
<useProjectArtifact>false</useProjectArtifact>
2424
<scope>provided</scope>
2525
<includes>
26-
<include>*:tar.gz:dataset:*</include>
26+
<include>*:*:tar.gz:dataset:*</include>
2727
</includes>
2828
<outputDirectory>/</outputDirectory>
2929
<unpack>true</unpack>
3030
</dependencySet>
3131
</dependencySets>
32-
33-
<fileSets>
34-
<fileSet>
35-
<directory>${project.build.directory}/var/lib/indy/data</directory>
36-
<outputDirectory>/</outputDirectory>
37-
</fileSet>
38-
</fileSets>
39-
32+
4033
</assembly>

tools/assemblies/src/main/resources/assemblies/etc.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<useProjectArtifact>false</useProjectArtifact>
2424
<scope>provided</scope>
2525
<includes>
26-
<include>*:tar.gz:confset:*</include>
26+
<include>*:*:tar.gz:confset:*</include>
2727
</includes>
2828
<outputDirectory>/</outputDirectory>
2929
<unpack>true</unpack>

tools/assemblies/src/main/resources/assemblies/skinny.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
<useProjectArtifact>false</useProjectArtifact>
6464
<scope>provided</scope>
6565
<includes>
66-
<include>*:tar.gz:binset:*</include>
66+
<include>*:*:tar.gz:binset:*</include>
6767
</includes>
6868
<outputDirectory>bin</outputDirectory>
6969
<unpack>true</unpack>
@@ -73,7 +73,7 @@
7373
<useProjectArtifact>false</useProjectArtifact>
7474
<scope>provided</scope>
7575
<includes>
76-
<include>*:tar.gz:uiset:*</include>
76+
<include>*:*:tar.gz:uiset:*</include>
7777
</includes>
7878
<outputDirectory>var/lib/indy/ui</outputDirectory>
7979
<unpack>true</unpack>
@@ -83,7 +83,7 @@
8383
<useProjectArtifact>false</useProjectArtifact>
8484
<scope>provided</scope>
8585
<includes>
86-
<include>*:tar.gz:reactui:*</include>
86+
<include>*:*:tar.gz:reactui:*</include>
8787
</includes>
8888
<outputDirectory>var/lib/indy/ui</outputDirectory>
8989
<unpack>true</unpack>

0 commit comments

Comments
 (0)