From: Matthias Sohn <matthias.sohn@sap.com>
Date: Wed, 6 Nov 2019 19:57:46 +0000 (+0100)
Subject: Merge branch 'stable-5.1' into stable-5.2
X-Git-Tag: v5.6.0.201911271000-m3~47^2^2^2^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fchanges%2F79%2F152179%2F1;p=jgit.git

Merge branch 'stable-5.1' into stable-5.2

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

Change-Id: I20e8b7155397771b1bc77e628f535f27458a24bb
---

4dd85d9bf32361c512c3ffa165e6adfc176a30c3
diff --cc org.eclipse.jgit.benchmarks/pom.xml
index e9b091b15a,4e60ab9b79..50b2db7268
--- a/org.eclipse.jgit.benchmarks/pom.xml
+++ b/org.eclipse.jgit.benchmarks/pom.xml
@@@ -41,155 -41,173 +41,173 @@@
     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>
+ <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>
+   <groupId>org.eclipse.jgit</groupId>
 -  <version>5.1.13-SNAPSHOT</version>
++  <version>5.2.3-SNAPSHOT</version>
+   <artifactId>org.eclipse.jgit.benchmarks</artifactId>
+   <packaging>jar</packaging>
  
-     <name>JGit - JMH based benchmarks</name>
+   <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>
+   <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>
+   <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>
+   <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>
+   <distributionManagement>
+     <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>