Skip to content

Commit

Permalink
- Updated version to 0.4.1
Browse files Browse the repository at this point in the history
- Downgraded org.eclipse.jgit to Java 7 compatible version
- Raised target from Java 6 to Java 7
  • Loading branch information
Nadahar committed Jan 3, 2018
1 parent f09c76e commit 1a161f8
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
10 changes: 5 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>org.digitalmediaserver</groupId>
<artifactId>crowdin-maven-plugin</artifactId>
<version>0.4</version>
<version>0.4.1</version>
<packaging>maven-plugin</packaging>

<name>Crowdin Maven Plugin</name>
Expand Down Expand Up @@ -94,8 +94,8 @@
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit</artifactId>
<version>4.8.0.201706111038-r</version>
<artifactId>org.eclipse.jgit.java7</artifactId>
<version>3.7.1.201504261725-r</version>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
Expand Down Expand Up @@ -156,8 +156,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>${pluginPluginVersion}</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
<plugin>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ private GitUtil() {
* @param projectBasedir the project "root" folder.
* @param log the {@link Log} to use for logging.
* @return The name of the current Git branch or {@code null} if it couldn't
* be estabilished.
* be established.
*/
public static String getBranch(File projectBasedir, Log log) {
if (!projectBasedir.exists()) {
Expand All @@ -44,7 +44,7 @@ public static String getBranch(File projectBasedir, Log log) {
Repository repo = git.getRepository();
try {
String branch = repo.getBranch();
if (repo.findRef(Constants.HEAD).getTarget().getName().endsWith(branch)) {
if (repo.getRef(Constants.HEAD).getTarget().getName().endsWith(branch)) {
log.debug("Git branch determined to be \"" + branch + "\"");
return branch;
}
Expand Down

0 comments on commit 1a161f8

Please sign in to comment.