Skip to content

Commit a03ace7

Browse files
alien11689alien11689
authored
Merge pull request #343 from apache/dependabot/maven/org.apache.maven.plugins-maven-jar-plugin-3.4.2
Bump org.apache.maven.plugins:maven-jar-plugin from 2.3 to 3.4.2
2 parents d6cd5b2 + 3222f3c commit a03ace7

File tree

1 file changed

+66
-21
lines changed

1 file changed

+66
-21
lines changed

‎subsystem/subsystem-itests/pom.xml

+66-21
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@
4444
<easymock.version>3.0</easymock.version>
4545
<exam.version>4.13.5</exam.version>
4646
<logback.version>1.5.16</logback.version>
47-
<maven-jar-plugin.version>2.3</maven-jar-plugin.version>
47+
<maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version>
48+
<maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
4849
<maven-surefire-plugin.version>3.5.2</maven-surefire-plugin.version>
4950
<org.apache.aries.application.api.version>1.0.0</org.apache.aries.application.api.version>
5051
<org.apache.aries.application.modeller.version>1.0.0</org.apache.aries.application.modeller.version>
@@ -371,7 +372,7 @@
371372
</excludes>
372373
<classesDirectory>${project.build.directory}/test-classes</classesDirectory>
373374
<outputDirectory>${project.build.directory}/test-classes/nobsn</outputDirectory>
374-
<finalName>tb1</finalName>
375+
<classifier>tb1-nobsn</classifier>
375376
</configuration>
376377
<phase>process-test-classes</phase>
377378
</execution>
@@ -389,7 +390,7 @@
389390
</excludes>
390391
<classesDirectory>${project.build.directory}/test-classes</classesDirectory>
391392
<outputDirectory>${project.build.directory}/test-classes/application1</outputDirectory>
392-
<finalName>tb1</finalName>
393+
<classifier>tb1-application1</classifier>
393394
</configuration>
394395
<phase>process-test-classes</phase>
395396
</execution>
@@ -407,7 +408,7 @@
407408
<include>org/apache/aries/subsystem/itests/tb1/**</include>
408409
</includes>
409410
<outputDirectory>${project.build.directory}/test-classes/feature1</outputDirectory>
410-
<finalName>tb1</finalName>
411+
<classifier>tb1-feature1</classifier>
411412
</configuration>
412413
<phase>process-test-classes</phase>
413414
</execution>
@@ -426,7 +427,7 @@
426427
<include>org/apache/aries/subsystem/itests/tb3/**</include>
427428
</includes>
428429
<outputDirectory>${project.build.directory}/test-classes/feature2</outputDirectory>
429-
<finalName>tb2</finalName>
430+
<classifier>tb2-feature2</classifier>
430431
</configuration>
431432
<phase>process-test-classes</phase>
432433
</execution>
@@ -444,7 +445,7 @@
444445
<include>org/apache/aries/subsystem/itests/tb3/**</include>
445446
</includes>
446447
<outputDirectory>${project.build.directory}/test-classes/feature1</outputDirectory>
447-
<finalName>tb3</finalName>
448+
<classifier>tb3-feature1</classifier>
448449
</configuration>
449450
<phase>process-test-classes</phase>
450451
</execution>
@@ -462,7 +463,7 @@
462463
<include>org/apache/aries/subsystem/itests/tb3/**</include>
463464
</includes>
464465
<outputDirectory>${project.build.directory}/test-classes/feature2</outputDirectory>
465-
<finalName>tb3</finalName>
466+
<classifier>tb3-feature2</classifier>
466467
</configuration>
467468
<phase>process-test-classes</phase>
468469
</execution>
@@ -480,7 +481,7 @@
480481
<include>org/apache/aries/subsystem/itests/tb3/**</include>
481482
</includes>
482483
<outputDirectory>${project.build.directory}/test-classes/feature3</outputDirectory>
483-
<finalName>tb3</finalName>
484+
<classifier>tb3-feature3</classifier>
484485
</configuration>
485486
<phase>process-test-classes</phase>
486487
</execution>
@@ -498,7 +499,7 @@
498499
<include>org/apache/aries/subsystem/itests/tb4/**</include>
499500
</includes>
500501
<outputDirectory>${project.build.directory}/test-classes/composite2</outputDirectory>
501-
<finalName>tb4</finalName>
502+
<classifier>tb4-composite2</classifier>
502503
</configuration>
503504
<phase>process-test-classes</phase>
504505
</execution>
@@ -519,7 +520,7 @@
519520
<include>org/apache/aries/subsystem/itests/hello/impl/**</include>
520521
</includes>
521522
<outputDirectory>${project.build.directory}/test-classes/hello</outputDirectory>
522-
<finalName>helloImpl</finalName>
523+
<classifier>hello-impl</classifier>
523524
</configuration>
524525
<phase>process-test-classes</phase>
525526
</execution>
@@ -538,7 +539,7 @@
538539
<include>org/apache/aries/subsystem/itests/cmcontent/impl/**</include>
539540
</includes>
540541
<outputDirectory>${project.build.directory}/test-classes/cmContent</outputDirectory>
541-
<finalName>cmContentBundleZ</finalName>
542+
<classifier>cm-content-bundleZ</classifier>
542543
</configuration>
543544
<phase>process-test-classes</phase>
544545
</execution>
@@ -553,7 +554,7 @@
553554
<manifestFile>src/test/bundles/customContentBundleA/META-INF/MANIFEST.MF</manifestFile>
554555
</archive>
555556
<outputDirectory>${project.build.directory}/test-classes/customContent</outputDirectory>
556-
<finalName>customContentBundleA</finalName>
557+
<classifier>custom-content-bundleA</classifier>
557558
</configuration>
558559
<phase>process-test-classes</phase>
559560
</execution>
@@ -568,7 +569,7 @@
568569
<manifestFile>src/test/bundles/customContentBundleB/META-INF/MANIFEST.MF</manifestFile>
569570
</archive>
570571
<outputDirectory>${project.build.directory}/test-classes/customContent1</outputDirectory>
571-
<finalName>customContentBundleB</finalName>
572+
<classifier>custom-content-bundleB</classifier>
572573
</configuration>
573574
<phase>process-test-classes</phase>
574575
</execution>
@@ -583,7 +584,7 @@
583584
<manifestFile>src/test/bundles/customContentBundleC/META-INF/MANIFEST.MF</manifestFile>
584585
</archive>
585586
<outputDirectory>${project.build.directory}/test-classes/customContent2</outputDirectory>
586-
<finalName>customContentBundleC</finalName>
587+
<classifier>custom-content-bundleC</classifier>
587588
</configuration>
588589
<phase>process-test-classes</phase>
589590
</execution>
@@ -598,7 +599,7 @@
598599
<manifestFile>src/test/bundles/customContentBundleD/META-INF/MANIFEST.MF</manifestFile>
599600
</archive>
600601
<outputDirectory>${project.build.directory}/test-classes/customContent3</outputDirectory>
601-
<finalName>customContentBundleD</finalName>
602+
<classifier>custom-content-bundleD</classifier>
602603
</configuration>
603604
<phase>process-test-classes</phase>
604605
</execution>
@@ -617,7 +618,7 @@
617618
<include>org/apache/aries/subsystem/itests/dynamicImport/**</include>
618619
</includes>
619620
<outputDirectory>${project.build.directory}/test-classes/dynamicImport</outputDirectory>
620-
<finalName>dynamicImport</finalName>
621+
<classifier>dynamic-import-impl</classifier>
621622
</configuration>
622623
<phase>process-test-classes</phase>
623624
</execution>
@@ -638,7 +639,7 @@
638639
<include>org/apache/aries/subsystem/itests/aries1608provider/**</include>
639640
</includes>
640641
<outputDirectory>${project.build.directory}/test-classes/aries1608</outputDirectory>
641-
<finalName>aries1608provider</finalName>
642+
<classifier>aries1608provider</classifier>
642643
</configuration>
643644
<phase>process-test-classes</phase>
644645
</execution>
@@ -657,7 +658,7 @@
657658
<include>org/apache/aries/subsystem/itests/aries1608required/**</include>
658659
</includes>
659660
<outputDirectory>${project.build.directory}/test-classes/aries1608</outputDirectory>
660-
<finalName>aries1608required</finalName>
661+
<classifier>aries-bundlearies1608required</classifier>
661662
</configuration>
662663
<phase>process-test-classes</phase>
663664
</execution>
@@ -676,7 +677,7 @@
676677
<include>org/apache/aries/subsystem/itests/aries1523host/**</include>
677678
</includes>
678679
<outputDirectory>${project.build.directory}/test-classes/aries1523</outputDirectory>
679-
<finalName>aries1523host</finalName>
680+
<classifier>aries1523host</classifier>
680681
</configuration>
681682
<phase>process-test-classes</phase>
682683
</execution>
@@ -695,11 +696,46 @@
695696
<include>org/apache/aries/subsystem/itests/aries1523fragment/**</include>
696697
</includes>
697698
<outputDirectory>${project.build.directory}/test-classes/aries1523</outputDirectory>
698-
<finalName>aries1523fragment</finalName>
699+
<classifier>aries1523fragment</classifier>
699700
</configuration>
700701
<phase>process-test-classes</phase>
701702
</execution>
702-
703+
</executions>
704+
</plugin>
705+
<plugin>
706+
<groupId>org.apache.maven.plugins</groupId>
707+
<artifactId>maven-antrun-plugin</artifactId>
708+
<version>${maven-antrun-plugin.version}</version>
709+
<executions>
710+
<execution>
711+
<phase>process-test-classes</phase>
712+
<goals>
713+
<goal>run</goal>
714+
</goals>
715+
<configuration>
716+
<target>
717+
<copy file="${project.build.directory}/test-classes/nobsn/${project.artifactId}-${project.version}-tb1-nobsn.jar" tofile="${project.build.directory}/test-classes/nobsn/tb1.jar"/>
718+
<copy file="${project.build.directory}/test-classes/application1/${project.artifactId}-${project.version}-tb1-application1.jar" tofile="${project.build.directory}/test-classes/application1/tb1.jar"/>
719+
<copy file="${project.build.directory}/test-classes/feature1/${project.artifactId}-${project.version}-tb1-feature1.jar" tofile="${project.build.directory}/test-classes/feature1/tb1.jar"/>
720+
<copy file="${project.build.directory}/test-classes/feature2/${project.artifactId}-${project.version}-tb2-feature2.jar" tofile="${project.build.directory}/test-classes/feature2/tb2.jar"/>
721+
<copy file="${project.build.directory}/test-classes/feature1/${project.artifactId}-${project.version}-tb3-feature1.jar" tofile="${project.build.directory}/test-classes/feature1/tb3.jar"/>
722+
<copy file="${project.build.directory}/test-classes/feature2/${project.artifactId}-${project.version}-tb3-feature2.jar" tofile="${project.build.directory}/test-classes/feature2/tb3.jar"/>
723+
<copy file="${project.build.directory}/test-classes/feature3/${project.artifactId}-${project.version}-tb3-feature3.jar" tofile="${project.build.directory}/test-classes/feature3/tb3.jar"/>
724+
<copy file="${project.build.directory}/test-classes/composite2/${project.artifactId}-${project.version}-tb4-composite2.jar" tofile="${project.build.directory}/test-classes/composite2/tb4.jar"/>
725+
<copy file="${project.build.directory}/test-classes/hello/${project.artifactId}-${project.version}-hello-impl.jar" tofile="${project.build.directory}/test-classes/hello/helloImpl.jar"/>
726+
<copy file="${project.build.directory}/test-classes/cmContent/${project.artifactId}-${project.version}-cm-content-bundleZ.jar" tofile="${project.build.directory}/test-classes/cmContent/cmContentBundleZ.jar"/>
727+
<copy file="${project.build.directory}/test-classes/customContent/${project.artifactId}-${project.version}-custom-content-bundleA.jar" tofile="${project.build.directory}/test-classes/customContent/customContentBundleA.jar"/>
728+
<copy file="${project.build.directory}/test-classes/customContent1/${project.artifactId}-${project.version}-custom-content-bundleB.jar" tofile="${project.build.directory}/test-classes/customContent1/customContentBundleB.jar"/>
729+
<copy file="${project.build.directory}/test-classes/customContent2/${project.artifactId}-${project.version}-custom-content-bundleC.jar" tofile="${project.build.directory}/test-classes/customContent2/customContentBundleC.jar"/>
730+
<copy file="${project.build.directory}/test-classes/customContent3/${project.artifactId}-${project.version}-custom-content-bundleD.jar" tofile="${project.build.directory}/test-classes/customContent3/customContentBundleD.jar"/>
731+
<copy file="${project.build.directory}/test-classes/dynamicImport/${project.artifactId}-${project.version}-dynamic-import-impl.jar" tofile="${project.build.directory}/test-classes/dynamicImport/dynamicImport.jar"/>
732+
<copy file="${project.build.directory}/test-classes/aries1608/${project.artifactId}-${project.version}-aries1608provider.jar" tofile="${project.build.directory}/test-classes/aries1608/aries1608provider.jar"/>
733+
<copy file="${project.build.directory}/test-classes/aries1608/${project.artifactId}-${project.version}-aries-bundlearies1608required.jar" tofile="${project.build.directory}/test-classes/aries1608/aries1608required.jar"/>
734+
<copy file="${project.build.directory}/test-classes/aries1523/${project.artifactId}-${project.version}-aries1523host.jar" tofile="${project.build.directory}/test-classes/aries1523/aries1523host.jar"/>
735+
<copy file="${project.build.directory}/test-classes/aries1523/${project.artifactId}-${project.version}-aries1523fragment.jar" tofile="${project.build.directory}/test-classes/aries1523/aries1523fragment.jar"/>
736+
</target>
737+
</configuration>
738+
</execution>
703739
</executions>
704740
</plugin>
705741
<plugin>
@@ -888,6 +924,15 @@
888924
<reuseForks>false</reuseForks>
889925
</configuration>
890926
</plugin>
927+
928+
<plugin>
929+
<groupId>org.codehaus.mojo</groupId>
930+
<artifactId>ianal-maven-plugin</artifactId>
931+
<configuration>
932+
<!-- test artifacts does not contain necessary files and are never rele -->
933+
<skip>true</skip>
934+
</configuration>
935+
</plugin>
891936
</plugins>
892937
</build>
893938

0 commit comments

Comments
 (0)