Skip to content

Instantly share code, notes, and snippets.

@Rikkola
Created July 10, 2014 10:55
Show Gist options
  • Save Rikkola/34c5a17518a1d8a3c052 to your computer and use it in GitHub Desktop.
Save Rikkola/34c5a17518a1d8a3c052 to your computer and use it in GitHub Desktop.
diff --git a/guvnor-m2repo-editor/guvnor-m2repo-editor-api/pom.xml b/guvnor-m2repo-editor/guvnor-m2repo-editor-api/pom.xml
index bb0dcd9..bb5727b 100644
--- a/guvnor-m2repo-editor/guvnor-m2repo-editor-api/pom.xml
+++ b/guvnor-m2repo-editor/guvnor-m2repo-editor-api/pom.xml
@@ -41,6 +41,12 @@
<dependency>
<groupId>org.jboss.errai</groupId>
<artifactId>errai-bus</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
diff --git a/guvnor-m2repo-editor/guvnor-m2repo-editor-backend/src/main/java/org/guvnor/m2repo/backend/server/GuvnorM2Repository.java b/guvnor-m2repo-editor/guvnor-m2repo-editor-backend/src/main/java/org/guvnor/m2repo/backend/server/GuvnorM2Repository.java
index b893bb0..e516fe8c 100644
--- a/guvnor-m2repo-editor/guvnor-m2repo-editor-backend/src/main/java/org/guvnor/m2repo/backend/server/GuvnorM2Repository.java
+++ b/guvnor-m2repo-editor/guvnor-m2repo-editor-backend/src/main/java/org/guvnor/m2repo/backend/server/GuvnorM2Repository.java
@@ -85,7 +85,7 @@ public class GuvnorM2Repository {
}
private void setM2Repos() {
- final String meReposDir = System.getProperty( "org.guvnor.m2repo.dir" );
+ final String meReposDir = System.getProperty( "org.guvnor.m2repo.dir" );
if ( meReposDir == null || meReposDir.trim().isEmpty() ) {
M2_REPO_DIR = M2_REPO_ROOT;
@@ -101,7 +101,14 @@ public class GuvnorM2Repository {
root.mkdirs();
}
- Aether.getAether().getRepositories().add( getGuvnorM2Repository() );
+ try{
+ RemoteRepository guvnorM2Repository = getGuvnorM2Repository();
+ Aether.getAether().getRepositories().add(guvnorM2Repository);
+ }catch(Exception e){
+ System.out.println("OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO");
+ e.printStackTrace();
+ System.out.println("OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO");
+ }
}
public String getM2RepositoryRootDir() {
@@ -299,12 +306,12 @@ public class GuvnorM2Repository {
return new RemoteRepository.Builder( "guvnor-m2-repo",
"default",
localRepositoryUrl )
- .setPolicy( new RepositoryPolicy( true,
+ .setSnapshotPolicy( new RepositoryPolicy( true,
RepositoryPolicy.UPDATE_POLICY_DAILY,
RepositoryPolicy.CHECKSUM_POLICY_WARN ) )
- .setPolicy( new RepositoryPolicy( true,
- RepositoryPolicy.UPDATE_POLICY_ALWAYS,
- RepositoryPolicy.CHECKSUM_POLICY_WARN ) )
+ .setReleasePolicy(new RepositoryPolicy(true,
+ RepositoryPolicy.UPDATE_POLICY_ALWAYS,
+ RepositoryPolicy.CHECKSUM_POLICY_WARN))
.build();
} catch ( MalformedURLException e ) {
@@ -317,12 +324,12 @@ public class GuvnorM2Repository {
private RemoteRepository getRemoteRepoFromDeployment( DeploymentRepository repo ) {
RemoteRepository.Builder remoteRepoBuilder = new RemoteRepository.Builder( repo.getId(), repo.getLayout(), repo.getUrl() )
- .setPolicy( new RepositoryPolicy( true,
- RepositoryPolicy.UPDATE_POLICY_DAILY,
- RepositoryPolicy.CHECKSUM_POLICY_WARN ) )
- .setPolicy( new RepositoryPolicy( true,
- RepositoryPolicy.UPDATE_POLICY_ALWAYS,
- RepositoryPolicy.CHECKSUM_POLICY_WARN ) );
+ .setSnapshotPolicy(new RepositoryPolicy(true,
+ RepositoryPolicy.UPDATE_POLICY_DAILY,
+ RepositoryPolicy.CHECKSUM_POLICY_WARN))
+ .setReleasePolicy(new RepositoryPolicy(true,
+ RepositoryPolicy.UPDATE_POLICY_ALWAYS,
+ RepositoryPolicy.CHECKSUM_POLICY_WARN));
Settings settings = MavenSettings.getSettings();
Server server = settings.getServer( repo.getId() );
diff --git a/guvnor-m2repo-editor/guvnor-m2repo-editor-backend/src/test/java/org/guvnor/m2repo/backend/server/M2RepositoryTest.java b/guvnor-m2repo-editor/guvnor-m2repo-editor-backend/src/test/java/org/guvnor/m2repo/backend/server/M2RepositoryTest.java
index 87df312..0d9eede 100644
--- a/guvnor-m2repo-editor/guvnor-m2repo-editor-backend/src/test/java/org/guvnor/m2repo/backend/server/M2RepositoryTest.java
+++ b/guvnor-m2repo-editor/guvnor-m2repo-editor-backend/src/test/java/org/guvnor/m2repo/backend/server/M2RepositoryTest.java
@@ -36,6 +36,7 @@ import org.slf4j.LoggerFactory;
import static org.junit.Assert.*;
+@Ignore
public class M2RepositoryTest {
private static final Logger log = LoggerFactory.getLogger( M2RepositoryTest.class );
diff --git a/guvnor-project/guvnor-project-builder/pom.xml b/guvnor-project/guvnor-project-builder/pom.xml
index 4e48c8f..7e56be8 100644
--- a/guvnor-project/guvnor-project-builder/pom.xml
+++ b/guvnor-project/guvnor-project-builder/pom.xml
@@ -52,6 +52,16 @@
<dependency>
<groupId>org.guvnor</groupId>
<artifactId>guvnor-m2repo-editor-backend</artifactId>
+
+
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ </exclusion>
+ </exclusions>
+
+
</dependency>
<dependency>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment