Skip to content
Permalink
Browse files
In the final state of this feature, a rebase on Master was executed. …
…In resolving a merge problem with the Maven project file "JClouds Project," an important instruction got overwritten, to generate test jars for each module. This modification re-adds this ability for all modules. Counter versa, defining this build step repeatedly, e.g., in the api/oauth module, is no longer required. Also, correct a typo, add groupId.

Note: Previously, the maven jar plugin contained a configuration embedded in each module's generated manifest files. The configuration got relocated to the project/bnd.bnd file in a previous commit, and gets handled through the bnd plugin.
  • Loading branch information
markus-gritsch authored and gaul committed Oct 26, 2020
1 parent 083bd50 commit 9215bfcb707a7291d0141134cad206029138a746
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 16 deletions.
@@ -77,21 +77,6 @@
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>live</id>
@@ -108,6 +108,7 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
@@ -119,7 +120,7 @@
<configuration>
<!--
These files are excluded to avoid corrupting the classpath with ProviderMetadata implementation
classes that should only be availble when running the core tests.
classes that should only be available when running the core tests.
-->
<excludes>
<exclude>META-INF/services/</exclude>
@@ -633,6 +633,13 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>${maven-jar-plugin.version}</version>
<executions>
<execution>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
<configuration>
<archive>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>

0 comments on commit 9215bfc

Please sign in to comment.