diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2011-12-16 08:49:59 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2011-12-16 08:50:49 +0100 |
| commit | f1019b9738089650ed24ae24a41e1567f28ea269 (patch) | |
| tree | 332f582bff1d0854f8c5f9e5ec8a03dbd3f0e263 /pom.xml | |
| parent | 84c80be1dc45885969e2d0fa0421f709b8706453 (diff) | |
| parent | 78ebffd5f4a65a098a2a41b241747c54905be63d (diff) | |
| download | jgit-f1019b9738089650ed24ae24a41e1567f28ea269.tar.gz jgit-f1019b9738089650ed24ae24a41e1567f28ea269.zip | |
Merge branch 'stable-1.2'
* stable-1.2:
Add API checking using clirr
Fix MergeCommandTest to pass if File.executable is not supported
Fix ResolveMerger not to add paths with FileMode 0
Change-Id: I86e7194a40acd6dfa3d433f1d17c01bdf5bb0d9c
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 19 |
1 files changed, 19 insertions, 0 deletions
@@ -130,14 +130,23 @@ <maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format> <bundle-manifest>${project.build.directory}/META-INF/MANIFEST.MF</bundle-manifest> + <jgit-last-release-version>1.1.0.201109151100-r</jgit-last-release-version> <jsch-version>0.1.44-1</jsch-version> <junit-version>4.5</junit-version> <args4j-version>2.0.12</args4j-version> <servlet-api-version>2.5</servlet-api-version> <jetty-version>7.1.6.v20100715</jetty-version> <protobuf-version>2.4.0a</protobuf-version> + <clirr-version>2.3</clirr-version> </properties> + <repositories> + <repository> + <id>jgit-repository</id> + <url>http://download.eclipse.org/jgit/maven</url> + </repository> + </repositories> + <build> <pluginManagement> <plugins> @@ -246,6 +255,16 @@ </execution> </executions> </plugin> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>clirr-maven-plugin</artifactId> + <version>${clirr-version}</version> + <configuration> + <comparisonVersion>${jgit-last-release-version}</comparisonVersion> + <minSeverity>info</minSeverity> + </configuration> + </plugin> </plugins> </pluginManagement> |