Update to Rug 0.10.0

atomist-attic · Jan 18, 2017 · e07ea4b · e07ea4b
1 parent 61be574
commit e07ea4b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 19 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.atomist</groupId>
 	<artifactId>rug-resolver</artifactId>
-	<version>0.9.2-SNAPSHOT</version>
+	<version>0.10.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<name>rug-resolver</name>
 	<description>Resolver library used to resolve Rug Operations and Archives</description>
@@ -14,12 +14,12 @@
 		<maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>
 		<timestamp>${maven.build.timestamp}</timestamp>
 		<java.version>1.8</java.version>
-		<aether.version>1.1.0-patch</aether.version>
+		<aether.version>1.1.0-patch2</aether.version>
 		<maven.version>3.3.9</maven.version>
 		<scala.version>2.11.8</scala.version>
 		<scala.binary.version>2.11</scala.binary.version>
 		<scoverage.plugin.version>1.3.0</scoverage.plugin.version>
-		<rug.version>0.9.0</rug.version>
+		<rug.version>0.10.0</rug.version>
 	</properties>
 	<licenses>
 		<license>
@@ -57,7 +57,7 @@
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot</artifactId>
-			<version>1.4.2.RELEASE</version>
+			<version>1.4.3.RELEASE</version>
 			<scope>provided</scope>
 			<exclusions>
 				<exclusion>

diff --git a/src/main/java/com/atomist/rug/loader/DefaultHandlerOperationsLoader.java b/src/main/java/com/atomist/rug/loader/DefaultHandlerOperationsLoader.java
@@ -148,16 +148,16 @@ protected List<SystemEventHandler> loadArtifact(String teamId, ArtifactDescripto
             LOGGER.error(String.format("Failed to load Rug archive for %s:%s:%s", artifact.group(),
                     artifact.artifact(), artifact.version()), e);
             throw new OperationsLoaderRuntimeException(
-                    String.format("Failed to load Rug archive for %s:%s:%s", artifact.group(),
-                            artifact.artifact(), artifact.version()),
+                    String.format("Failed to load Rug archive for %s:%s:%s:\n  %s", artifact.group(),
+                            artifact.artifact(), artifact.version(), e.getMessage()),
                     e);
         }
         catch (BadRugException e) {
             LOGGER.error(String.format("Failed to load Rug archive for %s:%s:%s", artifact.group(),
                     artifact.artifact(), artifact.version()), e);
             throw new OperationsLoaderRuntimeException(
-                    String.format("Failed to load Rug archive for %s:%s:%s", artifact.group(),
-                            artifact.artifact(), artifact.version()),
+                    String.format("Failed to load Rug archive for %s:%s:%s:\n  %s", artifact.group(),
+                            artifact.artifact(), artifact.version(), e.getMessage()),
                     e);
         }
     }

diff --git a/src/main/java/com/atomist/rug/loader/DefaultOperationsLoader.java b/src/main/java/com/atomist/rug/loader/DefaultOperationsLoader.java
@@ -33,14 +33,12 @@
 import com.atomist.rug.resolver.DependencyResolverException;
 import com.atomist.rug.runtime.rugdsl.DefaultEvaluator;
 import com.atomist.source.ArtifactSource;
-import com.atomist.source.FileArtifact;
 import com.atomist.source.file.FileSystemArtifactSource;
 import com.atomist.source.file.SimpleFileSystemArtifactSourceIdentifier;
 import com.atomist.source.file.ZipFileArtifactSourceReader;
 import com.atomist.source.file.ZipFileInput;
 
 import scala.Option;
-import scala.runtime.AbstractFunction1;
 
 public class DefaultOperationsLoader implements OperationsLoader {
 
@@ -187,20 +185,14 @@ protected Operations loadArtifact(ArtifactDescriptor artifact, ArtifactSource so
         try {
             return reader.findOperations(source,
                     Option.apply(artifact.group() + "." + artifact.artifact()),
-                    asScalaBufferConverter(otherOperations).asScala().toList(),
-                    new AbstractFunction1<FileArtifact, Object>() {
-                        @Override
-                        public Object apply(FileArtifact artifact) {
-                            return artifact.path().startsWith(".atomist/handlers");
-                        }
-                    });
+                    asScalaBufferConverter(otherOperations).asScala().toList());
         }
         catch (RugRuntimeException e) {
             LOGGER.error(String.format("Failed to load Rug archive for %s:%s:%s", artifact.group(),
                     artifact.artifact(), artifact.version()), e);
             throw new OperationsLoaderRuntimeException(
-                    String.format("Failed to load Rug archive for %s:%s:%s", artifact.group(),
-                            artifact.artifact(), artifact.version()),
+                    String.format("Failed to load Rug archive for %s:%s:%s:\n  %s", artifact.group(),
+                            artifact.artifact(), artifact.version(), e.getMessage()),
                     e);
         }
     }