corda/crash.shell is not obtainable from jitpack.io

cli/pom.xml

@@ -2,13 +2,12 @@
   <parent>
     <artifactId>crsh.parent</artifactId>
     <groupId>org.crsh</groupId>
-    <version>1.2.6</version>
+    <version>1.2.12-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.crsh</groupId>
   <artifactId>crsh.cli</artifactId>
   <packaging>jar</packaging>
-  <version>1.2.6</version>
+  <version>1.2.12-SNAPSHOT</version>
 
   <name>CRaSH CLI</name>
   <description>The CRaSH command line interface module</description>

cli/src/main/java/org/crsh/cli/descriptor/OptionDescriptor.java

@@ -64,6 +64,7 @@ public class OptionDescriptor extends ParameterDescriptor {
   static {
     for (char c = 'a';c <= 'z';c++) {
       A.set(c);
+      A.set(c + 'A' - 'a');
     }
     B.or(A);
     B.set('-');

cli/src/test/java/org/crsh/cli/impl/CommandInfoTestCase.java

@@ -72,6 +72,17 @@ class A {
     assertEquals(Arrays.asList("i"),i.getNames());
   }
 
+  public void testOptionWithUpperCase() throws IntrospectionException {
+    class A {
+      @Option(names = "I")
+      private int i;
+    }
+    CommandDescriptor<A> ai = CommandFactory.DEFAULT.create(A.class);
+    assertEquals(1,ai.getOptions().size());
+    OptionDescriptor i = ai.getOption("-I");
+    assertEquals(Arrays.asList("I"),i.getNames());
+  }
+
   public void testArgument1() throws IntrospectionException {
     class A {
       @Argument()

distrib/pom.xml

@@ -2,13 +2,12 @@
   <parent>
     <artifactId>crsh.parent</artifactId>
     <groupId>org.crsh</groupId>
-    <version>1.2.6</version>
+    <version>1.2.12-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.crsh</groupId>
   <artifactId>crsh.distrib</artifactId>
   <packaging>jar</packaging>
-  <version>1.2.6</version>
+  <version>1.2.12-SNAPSHOT</version>
 
   <name>CRaSH distrib</name>
   <description>The CRaSH distribution</description>
@@ -198,76 +197,95 @@
               </descriptors>
             </configuration>
           </execution>
+          <execution>
+            <id>make-gvm</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+            <configuration>
+              <attach>false</attach>
+              <descriptors>
+                <descriptor>src/main/assembly/gvm.xml</descriptor>
+              </descriptors>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
     </plugins>
   </build>
 
   <profiles>
+    <!--
+     | This profile will publish the gvm artifact in Bintray, guidelines:
+     | * checkout the tag to release (not mandatory)
+     | * execute with the bintrayUser and bintrayApiKey properties
+     | * only upload cr or final versions
+     | * drop the -SNAPSHOT if any (Bintray will not like it)
+    -->
     <profile>
-      <id>upload</id>
+      <id>gvm</id>
+      <dependencies>
+        <dependency>
+          <groupId>org.codehaus.groovy</groupId>
+          <artifactId>groovy-all</artifactId>
+          <version>2.0.7</version>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.ant</groupId>
+          <artifactId>ant</artifactId>
+          <version>1.9.2</version>
+        </dependency>
+        <dependency>
+          <groupId>org.codehaus.groovy.modules.http-builder</groupId>
+          <artifactId>http-builder</artifactId>
+          <version>0.7.1</version>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.commons</groupId>
+          <artifactId>commons-compress</artifactId>
+          <version>1.8.1</version>
+        </dependency>
+      </dependencies>
       <build>
         <plugins>
           <plugin>
-            <groupId>com.googlecode.maven-gcu-plugin</groupId>
-            <artifactId>maven-gcu-plugin</artifactId>
+            <groupId>org.codehaus.gmaven</groupId>
+            <artifactId>gmaven-plugin</artifactId>
+            <version>1.5</version>
             <executions>
               <execution>
+                <configuration>
+                  <source>${basedir}/src/bintrayUpload.groovy</source>
+                </configuration>
                 <phase>install</phase>
                 <goals>
-                  <goal>upload</goal>
+                  <goal>execute</goal>
                 </goals>
-                <configuration>
-                  <serverId>googlecode</serverId>
-                  <failsOnError>true</failsOnError>
-                  <projectName>crsh</projectName>
-                  <uploads>
-                    <upload>
-                      <file>${project.build.directory}/crash-${project.version}-gatein.tar.gz</file>
-                      <summary>CRaSH GateIn web archive ${project.version}</summary>
-                      <labels>
-                        <label>GateIn</label>
-                      </labels>
-                    </upload>
-                    <upload>
-                      <file>${project.build.directory}/crash-${project.version}-mule-app.tar.gz</file>
-                      <summary>CRaSH Mule application ${project.version}</summary>
-                      <labels>
-                        <label>Mule</label>
-                      </labels>
-                    </upload>
-                    <upload>
-                      <file>${project.build.directory}/crash-${project.version}-spring.tar.gz</file>
-                      <summary>CRaSH Spring web archive ${project.version}</summary>
-                      <labels>
-                        <label>Spring</label>
-                      </labels>
-                    </upload>
-                    <upload>
-                      <file>${project.build.directory}/crash-${project.version}-war.tar.gz</file>
-                      <summary>CRaSH Standalone web archive ${project.version}</summary>
-                      <labels>
-                        <label>Servlet</label>
-                      </labels>
-                    </upload>
-                    <upload>
-                      <file>${project.build.directory}/crash-${project.version}-docs.tar.gz</file>
-                      <summary>CRaSH Documentation and sources bundle ${project.version}</summary>
-                      <labels>
-                        <label>Documentation</label>
-                      </labels>
-                    </upload>
-                    <upload>
-                      <file>${project.build.directory}/crash-${project.version}.tar.gz</file>
-                      <summary>CRaSH Standalone ${project.version}</summary>
-                      <labels>
-                        <label>Standalone</label>
-                      </labels>
-                    </upload>
-                  </uploads>
-                </configuration>
               </execution>
             </executions>
+            <dependencies>
+              <dependency>
+                <groupId>org.codehaus.groovy</groupId>
+                <artifactId>groovy-all</artifactId>
+                <version>2.0.7</version>
+              </dependency>
+              <dependency>
+                <groupId>org.apache.ant</groupId>
+                <artifactId>ant</artifactId>
+                <version>1.9.2</version>
+              </dependency>
+              <dependency>
+                <groupId>org.codehaus.groovy.modules.http-builder</groupId>
+                <artifactId>http-builder</artifactId>
+                <version>0.7.1</version>
+              </dependency>
+              <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-compress</artifactId>
+                <version>1.8.1</version>
+              </dependency>
+            </dependencies>
           </plugin>
         </plugins>
       </build>

distrib/src/bintrayUpload.groovy

@@ -0,0 +1,127 @@
+// This script uploads the gvm zip in bintray account
+// it follows the gvm versionning scheme
+// version with empty qualifiers or "crXYZ" will be uploaded
+// SNAPSHOT version will be truncated to remove the SNAPSHOT as bintray does not accept them
+// SNAPSHOT should be used for testing purpose
+
+import groovyx.net.http.HTTPBuilder
+import org.apache.commons.compress.archivers.ArchiveOutputStream
+import org.apache.commons.compress.archivers.ArchiveStreamFactory
+import org.apache.commons.compress.archivers.zip.ZipArchiveEntry
+import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream
+import org.apache.log4j.ConsoleAppender;
+import org.apache.log4j.PatternLayout;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger
+
+import static groovyx.net.http.ContentType.BINARY
+import static groovyx.net.http.Method.*
+
+// Configure log4j
+def console = new ConsoleAppender()
+console.setLayout(new PatternLayout("%d [%p|%c|%C{1}] %m%n"));
+console.setThreshold(Level.ALL);
+console.activateOptions();
+Logger.getRootLogger().addAppender(console);
+Logger.getRootLogger().setLevel(Level.INFO);
+Logger.getLogger(HTTPBuilder.class).setLevel(Level.ALL)
+
+// Version check / change and so on
+def pattern = ~/([0-9\.]+)(\-.+)?/
+def matcher = pattern.matcher(project.version);
+if (!matcher.matches()) {
+  throw new Exception("Invalid version ${project.version} !")
+}
+def mmm = matcher.group(1);
+def qualifier = matcher.group(2)
+def version
+if (qualifier != null && qualifier != "-SNAPSHOT") {
+  def qualifierPattern = ~/\-cr([0-9]+)(?:-SNAPSHOT)?/
+  def qualifierMatcher = qualifierPattern.matcher(qualifier);
+  if (!qualifierMatcher.matches()) {
+    // Only candidate releases
+    return;
+  }
+  version = "${mmm}.RC${qualifierMatcher.group(1)}"
+} else {
+  version = mmm;
+}
+
+// Check we have the file to upload first
+def file = new File(project.build.directory, "crash-${project.version}-gvm.zip")
+if (!file.exists()) {
+  throw new Exception("${file.absolutePath} does not exists");
+}
+if (!file.isFile()) {
+  throw new Exception("${file.absolutePath} is not a file");
+}
+
+// Transform file to prefix
+ByteArrayOutputStream baos = new ByteArrayOutputStream((int)file.length())
+ZipArchiveInputStream zipIn = new ZipArchiveInputStream(new BufferedInputStream(new FileInputStream(file)));
+ArchiveOutputStream zipOut = new ArchiveStreamFactory().createArchiveOutputStream("zip", baos);
+byte[] buffer = new byte[512];
+while (true) {
+  ZipArchiveEntry entry = zipIn.getNextZipEntry();
+  if (entry == null) {
+    break;
+  } else {
+    def length = (int)entry.size
+    entry.name = "crash-${version}/${entry.name}";
+    if (entry.name.endsWith(".sh") || entry.name.endsWith(".bat")) {
+      entry.setUnixMode(0100755);
+    }
+    zipOut.putArchiveEntry(entry);
+    while (length > 0) {
+      def amount = zipIn.read(buffer, 0, Math.min(length, buffer.length));
+      zipOut.write(buffer, 0, amount);
+      length -= amount;
+    }
+    zipOut.closeArchiveEntry();
+  }
+}
+zipOut.close();
+
+// Credentials
+def bintrayUser = project.properties.bintrayUser;
+def bintrayApiKey = project.properties.bintrayApiKey;
+if (bintrayUser == null) {
+  throw new Exception("Property bintrayUser not found");
+}
+if (bintrayApiKey == null) {
+  throw new Exception("Property bintrayApiKey not found");
+}
+
+//
+def repoPath = "crashub/crash"
+def packageName = "gvm"
+def packagePath = "$repoPath/gvm"
+def uploadUri = "/content/$packagePath/${version}/crash-${version}.zip";
+
+//
+def http = new HTTPBuilder("https://api.bintray.com");
+http.headers.Authorization = "Basic ${"$bintrayUser:$bintrayApiKey".toString().bytes.encodeBase64()}"
+
+println("Uploading ${file.absolutePath} to ${uploadUri}");
+def result = http.request(PUT) {
+  uri.path = uploadUri
+  requestContentType = BINARY
+  body = new ByteArrayInputStream(baos.toByteArray());
+  response.success = { resp ->
+    return "Package ${packageName} uploaded.";
+  }
+  response.failure = { resp ->
+    def msg = "Cannot upload: ${resp.statusLine.statusCode} : ${resp.statusLine.reasonPhrase}";
+    def entity = resp.entity;
+    if (entity != null) {
+      msg += "\n" + org.apache.http.util.EntityUtils.toString(entity);
+    }
+    return new Exception(msg);
+  }
+}
+
+if (result instanceof Exception) {
+  throw result;
+} else if (result != null) {
+  println(result)
+}

distrib/src/main/assembly/gvm.xml

@@ -0,0 +1,44 @@
+<!--
+  ~ Copyright (C) 2012 eXo Platform SAS.
+  ~
+  ~ This is free software; you can redistribute it and/or modify it
+  ~ under the terms of the GNU Lesser General Public License as
+  ~ published by the Free Software Foundation; either version 2.1 of
+  ~ the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  ~ Lesser General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU Lesser General Public
+  ~ License along with this software; if not, write to the Free
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  -->
+
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1 http://maven.apache.org/xsd/assembly-1.1.1.xsd">
+  <id>gvm</id>
+  <formats>
+    <format>zip</format>
+  </formats>
+
+  <baseDirectory>/</baseDirectory>
+
+  <componentDescriptors>
+    <componentDescriptor>src/main/assembly/distrib.xml</componentDescriptor>
+  </componentDescriptors>
+
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>/</outputDirectory>
+      <unpack>true</unpack>
+      <includes>
+        <include>org.crsh:crsh.shell.packaging:tar.gz</include>
+      </includes>
+    </dependencySet>
+  </dependencySets>
+
+</assembly>

distrib/src/main/assembly/packaging.xml

@@ -41,4 +41,4 @@
     </dependencySet>
   </dependencySets>
 
-</assembly>
+</assembly>