Commit d6817a9b authored by Brian Long's avatar Brian Long
Browse files

Merge branch 'develop' into stable 

Conflicts:
	pom.xml
parents 03ace4ca 06db1d5d

pom.xml

+2 −2
Original line number Diff line number Diff line
@@ -2,10 +2,10 @@ 
		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

	<modelVersion>4.0.0</modelVersion>

	<groupId>me.brianlong</groupId>

	<groupId>com.inteligr8</groupId>

	<artifactId>git-utils</artifactId>

	<packaging>jar</packaging>

	<version>1.0.0</version>

	<version>1.1.0</version>



	<name>Git Utilities</name>

src/main/java/me/brianlong/git/CachedGit.java→src/main/java/com/inteligr8/git/CachedGit.java

+5 −1
Original line number Diff line number Diff line 
package me.brianlong.git;

package com.inteligr8.git;



import org.eclipse.jgit.api.CloneCommand;

import org.eclipse.jgit.api.Git;
@@ -21,6 +21,10 @@ public class CachedGit extends Git { 
		super(repo);

	}

	

	public String getFirstRemoteUrl() throws GitAPIException {

		return this.remoteList().call().iterator().next().getURIs().iterator().next().toString();

	}

	

	@Override

	public void close() {

		LocalRepositoryCache.getInstance().release(this);

src/main/java/me/brianlong/git/CompositeIterator.java→src/main/java/com/inteligr8/git/CompositeIterator.java

+1 −1
Original line number Diff line number Diff line 
package me.brianlong.git;

package com.inteligr8.git;



import java.util.Collection;

import java.util.Iterator;

src/main/java/me/brianlong/git/CredentialedGit.java→src/main/java/com/inteligr8/git/CredentialedGit.java

+1 −1
Original line number Diff line number Diff line 
package me.brianlong.git;

package com.inteligr8.git;



import org.eclipse.jgit.api.CloneCommand;

import org.eclipse.jgit.api.FetchCommand;

src/main/java/com/inteligr8/git/DeveloperException.java

0 → 100644
+15 −0
Original line number Diff line number Diff line 
package com.inteligr8.git;



import org.slf4j.Logger;



public class DeveloperException extends RuntimeException {

	

	private static final long serialVersionUID = 1600616227925437703L;

	private static final String MESSAGE = "This is a bug that needs to be addressed by the developer";

	

	public DeveloperException(Logger logger, Throwable cause) {

		super(MESSAGE, cause);

		logger.error(MESSAGE);

	}



}