]> source.dussan.org Git - jgit.git/commitdiff
Merge branch 'stable-5.1' into stable-5.2 73/151973/2
authorMatthias Sohn <matthias.sohn@sap.com>
Tue, 5 Nov 2019 14:07:39 +0000 (15:07 +0100)
committerMatthias Sohn <matthias.sohn@sap.com>
Tue, 5 Nov 2019 14:18:45 +0000 (15:18 +0100)
* stable-5.1:
  Run JMH benchmarks using bazel
  Benchmark for creating files and FileSnapshots
  Implement benchmark for looking up FileStore of a given Path
  JMH benchmark for SimpleLruCache
  Remove unused API problem filters
  Silence API errors for new API added since 5.1.0

Change-Id: If91c55a192d3b2c441d9c8d414f2e24a7261b1b6
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
1  2 
WORKSPACE
org.eclipse.jgit.benchmarks/pom.xml
pom.xml

diff --cc WORKSPACE
index 9a4a9a9c391b7af985488d1f13ae1baed5bad48a,0ddbf8fbdcde2cd8e830bfe2f0e2431e1cfad81d..81f9eccf1a94797c2c906f64c04106d541966b0b
+++ b/WORKSPACE
@@@ -22,12 -22,36 +22,42 @@@ load
      "maven_jar",
  )
  
+ JMH_VERS = "1.21"
+ maven_jar(
+     name = "jmh-core",
+     artifact = "org.openjdk.jmh:jmh-core:" + JMH_VERS,
+     attach_source = False,
+     sha1 = "442447101f63074c61063858033fbfde8a076873",
+ )
+ maven_jar(
+     name = "jmh-annotations",
+     artifact = "org.openjdk.jmh:jmh-generator-annprocess:" + JMH_VERS,
+     attach_source = False,
+     sha1 = "7aac374614a8a76cad16b91f1a4419d31a7dcda3",
+ )
+ maven_jar(
+     name = "jopt",
+     artifact = "net.sf.jopt-simple:jopt-simple:5.0.4",
+     attach_source = False,
+     sha1 = "4fdac2fbe92dfad86aa6e9301736f6b4342a3f5c",
+ )
+ maven_jar(
+     name = "math3",
+     artifact = "org.apache.commons:commons-math3:3.6.1",
+     attach_source = False,
+     sha1 = "e4ba98f1d4b3c80ec46392f25e094a6a2e58fcbf",
+ )
 +maven_jar(
 +    name = "eddsa",
 +    artifact = "net.i2p.crypto:eddsa:0.3.0",
 +    sha1 = "1901c8d4d8bffb7d79027686cfb91e704217c3e1",
 +)
 +
  maven_jar(
      name = "jsch",
      artifact = "com.jcraft:jsch:0.1.55",
index 0000000000000000000000000000000000000000,949367a6650ad2934715cf3182f0a2ec1cba2483..e9b091b15adf07bb9aa273247c9860af4ac4ff43
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,195 +1,195 @@@
 -    <version>5.1.13-SNAPSHOT</version>
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!--
+    Copyright (C) 2019, Matthias Sohn <matthias.sohn@sap.com>
+    and other copyright owners as documented in the project's IP log.
+    This program and the accompanying materials are made available
+    under the terms of the Eclipse Distribution License v1.0 which
+    accompanies this distribution, is reproduced below, and is
+    available at http://www.eclipse.org/org/documents/edl-v10.php
+    All rights reserved.
+    Redistribution and use in source and binary forms, with or
+    without modification, are permitted provided that the following
+    conditions are met:
+    - Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    - Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    - Neither the name of the Eclipse Foundation, Inc. nor the
+      names of its contributors may be used to endorse or promote
+      products derived from this software without specific prior
+      written permission.
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+    CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+    OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+    ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+    CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+    SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+    NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+    LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+    CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+    STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+    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">
+     <modelVersion>4.0.0</modelVersion>
+     <groupId>org.eclipse.jgit</groupId>
++    <version>5.2.3-SNAPSHOT</version>
+     <artifactId>org.eclipse.jgit.benchmarks</artifactId>
+     <packaging>jar</packaging>
+     <name>JGit - JMH based benchmarks</name>
+     <properties>
+         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+         <javac.target>1.8</javac.target>
+         <jmh.version>1.21</jmh.version>
+         <uberjar.name>benchmarks</uberjar.name>
+     </properties>
+     <dependencies>
+         <dependency>
+             <groupId>org.openjdk.jmh</groupId>
+             <artifactId>jmh-core</artifactId>
+             <version>${jmh.version}</version>
+         </dependency>
+         <dependency>
+             <groupId>org.openjdk.jmh</groupId>
+             <artifactId>jmh-generator-annprocess</artifactId>
+             <version>${jmh.version}</version>
+             <scope>provided</scope>
+         </dependency>
+         <dependency>
+            <groupId>org.eclipse.jgit</groupId>
+            <artifactId>org.eclipse.jgit</artifactId>
+            <version>${project.version}</version>
+         </dependency>
+     </dependencies>
+     <build>
+         <sourceDirectory>src/</sourceDirectory>
+         <plugins>
+             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+                <configuration>
+                   <compilerVersion>${javac.target}</compilerVersion>
+                   <source>${javac.target}</source>
+                   <target>${javac.target}</target>
+                   <generatedSourcesDirectory>.apt_generated</generatedSourcesDirectory>
+                </configuration>
+                <executions>
+                   <execution>
+                      <id>compile-with-errorprone</id>
+                      <phase>compile</phase>
+                      <goals>
+                         <goal>compile</goal>
+                      </goals>
+                      <configuration>
+                         <compilerId>javac-with-errorprone</compilerId>
+                         <forceJavacCompilerUse>true</forceJavacCompilerUse>
+                         <compilerArgs>
+                            <arg>-Xep:ExpectedExceptionChecker:ERROR</arg>
+                         </compilerArgs>
+                      </configuration>
+                   </execution>
+                </executions>
+                <dependencies>
+                   <dependency>
+                      <groupId>org.codehaus.plexus</groupId>
+                      <artifactId>plexus-compiler-javac</artifactId>
+                      <version>2.8.5</version>
+                   </dependency>
+                   <dependency>
+                      <groupId>org.codehaus.plexus</groupId>
+                      <artifactId>plexus-compiler-javac-errorprone</artifactId>
+                      <version>2.8.5</version>
+                   </dependency>
+                   <!-- override plexus-compiler-javac-errorprone's dependency on
+                        Error Prone with the latest version -->
+                   <dependency>
+                      <groupId>com.google.errorprone</groupId>
+                      <artifactId>error_prone_core</artifactId>
+                      <version>2.3.3</version>
+                   </dependency>
+                </dependencies>
+             </plugin>
+             <plugin>
+                 <groupId>org.apache.maven.plugins</groupId>
+                 <artifactId>maven-shade-plugin</artifactId>
+                 <executions>
+                     <execution>
+                         <phase>package</phase>
+                         <goals>
+                             <goal>shade</goal>
+                         </goals>
+                         <configuration>
+                             <finalName>${uberjar.name}</finalName>
+                             <transformers>
+                                 <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                     <mainClass>org.openjdk.jmh.Main</mainClass>
+                                 </transformer>
+                             </transformers>
+                             <filters>
+                                 <filter>
+                                     <!--
+                                         Shading signed JARs will fail without this.
+                                         http://stackoverflow.com/questions/999489/invalid-signature-file-when-attempting-to-run-a-jar
+                                     -->
+                                     <artifact>*:*</artifact>
+                                     <excludes>
+                                         <exclude>META-INF/*.SF</exclude>
+                                         <exclude>META-INF/*.DSA</exclude>
+                                         <exclude>META-INF/*.RSA</exclude>
+                                     </excludes>
+                                 </filter>
+                             </filters>
+                         </configuration>
+                     </execution>
+                 </executions>
+             </plugin>
+         </plugins>
+         <pluginManagement>
+            <plugins>
+               <!--This plugin's configuration is used to store Eclipse m2e settings only.
+               It has no influence on the Maven build itself.-->
+               <plugin>
+                  <groupId>org.eclipse.m2e</groupId>
+                  <artifactId>lifecycle-mapping</artifactId>
+                  <version>1.0.0</version>
+                  <configuration>
+                     <lifecycleMappingMetadata>
+                        <pluginExecutions>
+                           <pluginExecution>
+                              <pluginExecutionFilter>
+                                 <groupId>org.apache.maven.plugins</groupId>
+                                 <artifactId>maven-antrun-plugin</artifactId>
+                                 <versionRange>[1.8,)</versionRange>
+                                 <goals>
+                                    <goal>run</goal>
+                                 </goals>
+                              </pluginExecutionFilter>
+                              <action>
+                                 <ignore></ignore>
+                              </action>
+                           </pluginExecution>
+                        </pluginExecutions>
+                     </lifecycleMappingMetadata>
+                  </configuration>
+               </plugin>
+            </plugins>
+         </pluginManagement>
+     </build>
+ </project>
diff --cc pom.xml
index 732308b7cc693c0bb8e5704259e7454a2010cdc5,28f180e68a3f41f9d01b7a8072fd535289769591..5efbc2832ede132c50c5ac52979e2213ffddf945
+++ b/pom.xml
      <module>org.eclipse.jgit.pgm.test</module>
      <module>org.eclipse.jgit.lfs.test</module>
      <module>org.eclipse.jgit.lfs.server.test</module>
 +    <module>org.eclipse.jgit.ssh.apache.test</module>
+     <module>org.eclipse.jgit.benchmarks</module>
    </modules>
  
  </project>