Skip to content

Commit

Permalink
Merge pull request #327 from spotify/dependabot/maven/com.spotify-fos…
Browse files Browse the repository at this point in the history 
…s-root-16

build(deps): bump com.spotify:foss-root from 15 to 16
  • Loading branch information
@caesar-ralf
caesar-ralf authored Jul 28, 2023
2 parents 16c0622 + 754fd36 commit 62e0c67
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 88 deletions.
1 change: 1 addition & 0 deletions benchmarks/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
<findbugs.skip>true</findbugs.skip>
<jmh.version>1.36</jmh.version>
<uberjar.name>benchmarks</uberjar.name>
<unitTests.failIfNoTests>false</unitTests.failIfNoTests>
</properties>

<dependencies>
Expand Down
4 changes: 1 addition & 3 deletions core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<configuration>
<configuration combine.children="append">
<annotationProcessorPaths>
<path>
<groupId>io.norberg</groupId>
Expand All @@ -59,5 +58,4 @@
</plugin>
</plugins>
</build>

</project>
90 changes: 5 additions & 85 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.spotify</groupId>
<artifactId>foss-root</artifactId>
<version>15</version>
<version>16</version>
</parent>

<artifactId>missinglink-parent</artifactId>
Expand Down Expand Up @@ -130,110 +130,30 @@
<useIncrementalCompilation>false</useIncrementalCompilation>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>3.1.1</version>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.3.0</version>
<configuration>
<rules>
<requireMavenVersion>
<version>3.0</version>
</requireMavenVersion>
</rules>
</configuration>
<executions>
<execution>
<id>enforce-maven</id>
<goals>
<goal>enforce</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>3.0.5</version>
<executions>
<execution>
<goals>
<goal>check</goal>
</goals>
<phase>pre-integration-test</phase>
</execution>
</executions>
</plugin>
<!-- format code within the Maven build. CI will run fmt:check to reject unformatted changes -->
<plugin>
<groupId>com.coveo</groupId>
<artifactId>fmt-maven-plugin</artifactId>
<!-- 2.9.1 is the last version that can run on Java 8 -->
<version>2.9.1</version>
<executions>
<execution>
<goals>
<goal>format</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.10</version>
<executions>
<execution>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<!-- bind the report goal to the test phase instead of its default of verify-->
<execution>
<id>report</id>
<phase>test</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>release</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>3.1.0</version>
<executions>
<execution>
<id>sign-artifacts</id>
<goals>
<goal>sign</goal>
</goals>
<phase>verify</phase>
<configuration>
<gpgArguments>
<arg>--pinentry-mode</arg>
<arg>loopback</arg>
</gpgArguments>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>

0 comments on commit 62e0c67

Please sign in to comment.