Skip to content

Commit

Permalink
fix: update samples/snippets pom.xml configuration to avoid fat jar (#…
Browse files Browse the repository at this point in the history
…2100)

* fix: update samples/snippets pom.xml configuration to avoid fat jar

* fix: refactor path of jar creation and remove assembly-descriptor.xml file

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
  • Loading branch information
harshachinta and gcf-owl-bot[bot] committed Dec 5, 2022
1 parent 028505b commit 19058b4
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 42 deletions.
27 changes: 0 additions & 27 deletions samples/snippets/assembly-descriptor.xml

This file was deleted.

61 changes: 46 additions & 15 deletions samples/snippets/pom.xml
Expand Up @@ -115,30 +115,61 @@
</dependency>
</dependencies>
<build>
<finalName>spanner-google-cloud-samples</finalName>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.4.2</version>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<id>copy-resources</id>
<phase>validate</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/spanner-snippets</outputDirectory>
<resources>
<resource>
<directory>resources</directory>
<filtering>true</filtering>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>copy-dependencies</id>
<phase>prepare-package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/spanner-snippets/lib</outputDirectory>
<overWriteReleases>false</overWriteReleases>
<overWriteSnapshots>false</overWriteSnapshots>
<overWriteIfNewer>true</overWriteIfNewer>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<descriptors>
<descriptor>assembly-descriptor.xml</descriptor>
</descriptors>
<finalName>spanner-snippets/spanner-google-cloud-samples</finalName>
<archive>
<index>false</index>
<manifest>
<mainClass>com.example.spanner.SpannerSample</mainClass>
<addClasspath>true</addClasspath>
<classpathPrefix>lib/</classpathPrefix>
</manifest>
</archive>
</configuration>
<executions>
<execution>
<id>make-assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down

0 comments on commit 19058b4

Please sign in to comment.