Merge branch 'stable-5.4' into stable-5.5

* stable-5.4:
  Fix benchmark pom.xml to include distribution managment config

Change-Id: I1863f641880e8d9fbd26c02ede6bf5d773e8c8a0
This commit is contained in:
Matthias Sohn 2019-11-06 21:05:07 +01:00
commit b7810be174
1 changed files with 164 additions and 146 deletions

View File

@ -41,155 +41,173 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--> -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <project xmlns="http://maven.apache.org/POM/4.0.0"
<modelVersion>4.0.0</modelVersion> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.jgit</groupId> <groupId>org.eclipse.jgit</groupId>
<version>5.5.2-SNAPSHOT</version> <version>5.5.2-SNAPSHOT</version>
<artifactId>org.eclipse.jgit.benchmarks</artifactId> <artifactId>org.eclipse.jgit.benchmarks</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>JGit - JMH based benchmarks</name> <name>JGit - JMH based benchmarks</name>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<javac.target>1.8</javac.target> <javac.target>1.8</javac.target>
<jmh.version>1.21</jmh.version> <jmh.version>1.21</jmh.version>
<uberjar.name>benchmarks</uberjar.name> <uberjar.name>benchmarks</uberjar.name>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.openjdk.jmh</groupId> <groupId>org.openjdk.jmh</groupId>
<artifactId>jmh-core</artifactId> <artifactId>jmh-core</artifactId>
<version>${jmh.version}</version> <version>${jmh.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.openjdk.jmh</groupId> <groupId>org.openjdk.jmh</groupId>
<artifactId>jmh-generator-annprocess</artifactId> <artifactId>jmh-generator-annprocess</artifactId>
<version>${jmh.version}</version> <version>${jmh.version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jgit</groupId> <groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit</artifactId> <artifactId>org.eclipse.jgit</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<sourceDirectory>src/</sourceDirectory> <sourceDirectory>src/</sourceDirectory>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version> <version>3.8.1</version>
<configuration> <configuration>
<compilerVersion>${javac.target}</compilerVersion> <compilerVersion>${javac.target}</compilerVersion>
<source>${javac.target}</source> <source>${javac.target}</source>
<target>${javac.target}</target> <target>${javac.target}</target>
<generatedSourcesDirectory>.apt_generated</generatedSourcesDirectory> <generatedSourcesDirectory>.apt_generated</generatedSourcesDirectory>
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
<id>compile-with-errorprone</id> <id>compile-with-errorprone</id>
<phase>compile</phase> <phase>compile</phase>
<goals> <goals>
<goal>compile</goal> <goal>compile</goal>
</goals> </goals>
<configuration> <configuration>
<compilerId>javac-with-errorprone</compilerId> <compilerId>javac-with-errorprone</compilerId>
<forceJavacCompilerUse>true</forceJavacCompilerUse> <forceJavacCompilerUse>true</forceJavacCompilerUse>
<compilerArgs> <compilerArgs>
<arg>-Xep:ExpectedExceptionChecker:ERROR</arg> <arg>-Xep:ExpectedExceptionChecker:ERROR</arg>
</compilerArgs> </compilerArgs>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-compiler-javac</artifactId> <artifactId>plexus-compiler-javac</artifactId>
<version>2.8.5</version> <version>2.8.5</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-compiler-javac-errorprone</artifactId> <artifactId>plexus-compiler-javac-errorprone</artifactId>
<version>2.8.5</version> <version>2.8.5</version>
</dependency> </dependency>
<!-- override plexus-compiler-javac-errorprone's dependency on <!-- override plexus-compiler-javac-errorprone's dependency on
Error Prone with the latest version --> Error Prone with the latest version -->
<dependency> <dependency>
<groupId>com.google.errorprone</groupId> <groupId>com.google.errorprone</groupId>
<artifactId>error_prone_core</artifactId> <artifactId>error_prone_core</artifactId>
<version>2.3.3</version> <version>2.3.3</version>
</dependency> </dependency>
</dependencies> </dependencies>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId> <artifactId>maven-shade-plugin</artifactId>
<executions> <executions>
<execution> <execution>
<phase>package</phase> <phase>package</phase>
<goals> <goals>
<goal>shade</goal> <goal>shade</goal>
</goals> </goals>
<configuration> <configuration>
<finalName>${uberjar.name}</finalName> <finalName>${uberjar.name}</finalName>
<transformers> <transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>org.openjdk.jmh.Main</mainClass> <mainClass>org.openjdk.jmh.Main</mainClass>
</transformer> </transformer>
</transformers> </transformers>
<filters> <filters>
<filter> <filter>
<!-- <!-- Shading signed JARs will fail without this.
Shading signed JARs will fail without this. http://stackoverflow.com/questions/999489/invalid-signature-file-when-attempting-to-run-a-jar -->
http://stackoverflow.com/questions/999489/invalid-signature-file-when-attempting-to-run-a-jar <artifact>*:*</artifact>
--> <excludes>
<artifact>*:*</artifact> <exclude>META-INF/*.SF</exclude>
<excludes> <exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.SF</exclude> <exclude>META-INF/*.RSA</exclude>
<exclude>META-INF/*.DSA</exclude> </excludes>
<exclude>META-INF/*.RSA</exclude> </filter>
</excludes> </filters>
</filter> </configuration>
</filters> </execution>
</configuration> </executions>
</execution> </plugin>
</executions> </plugins>
</plugin> <pluginManagement>
</plugins> <plugins>
<pluginManagement> <!--This plugin's configuration is used to store Eclipse m2e settings only.
<plugins> It has no influence on the Maven build itself. -->
<!--This plugin's configuration is used to store Eclipse m2e settings only. <plugin>
It has no influence on the Maven build itself.--> <groupId>org.eclipse.m2e</groupId>
<plugin> <artifactId>lifecycle-mapping</artifactId>
<groupId>org.eclipse.m2e</groupId> <version>1.0.0</version>
<artifactId>lifecycle-mapping</artifactId> <configuration>
<version>1.0.0</version> <lifecycleMappingMetadata>
<configuration> <pluginExecutions>
<lifecycleMappingMetadata> <pluginExecution>
<pluginExecutions> <pluginExecutionFilter>
<pluginExecution> <groupId>org.apache.maven.plugins</groupId>
<pluginExecutionFilter> <artifactId>maven-antrun-plugin</artifactId>
<groupId>org.apache.maven.plugins</groupId> <versionRange>[1.8,)</versionRange>
<artifactId>maven-antrun-plugin</artifactId> <goals>
<versionRange>[1.8,)</versionRange> <goal>run</goal>
<goals> </goals>
<goal>run</goal> </pluginExecutionFilter>
</goals> <action>
</pluginExecutionFilter> <ignore></ignore>
<action> </action>
<ignore></ignore> </pluginExecution>
</action> </pluginExecutions>
</pluginExecution> </lifecycleMappingMetadata>
</pluginExecutions> </configuration>
</lifecycleMappingMetadata> </plugin>
</configuration> </plugins>
</plugin> </pluginManagement>
</plugins> </build>
</pluginManagement> <distributionManagement>
</build> <repository>
<id>repo.eclipse.org</id>
<name>JGit Maven Repository - Releases</name>
<url>https://repo.eclipse.org/content/repositories/jgit-releases/</url>
</repository>
<snapshotRepository>
<id>repo.eclipse.org</id>
<name>JGit Maven Repository - Snapshots</name>
<url>https://repo.eclipse.org/content/repositories/jgit-snapshots/</url>
<uniqueVersion>true</uniqueVersion>
</snapshotRepository>
<site>
<id>jgit.website</id>
<name>JGit Website</name>
<url>${jgit.website.url}</url>
</site>
</distributionManagement>
</project> </project>