Exclude submodules from zip downloads (issue 151)

James Moger

2012-10-18 13417cf9c6eec555b51da49742e47939d2f5715b

 src/com/gitblit/build/Build.java

@@ -20,6 +20,7 @@
import java.io.File;

import java.io.FileInputStream;

import java.io.FileWriter;

import java.io.FilenameFilter;

import java.io.IOException;

import java.io.InputStream;

import java.io.RandomAccessFile;

@@ -92,6 +93,8 @@
      downloadFromApache(MavenObject.LUCENE, BuildType.RUNTIME);

      downloadFromApache(MavenObject.LUCENE_HIGHLIGHTER, BuildType.RUNTIME);

      downloadFromApache(MavenObject.LUCENE_MEMORY, BuildType.RUNTIME);

      downloadFromApache(MavenObject.LUCENE_QUERIES, BuildType.RUNTIME);

      downloadFromApache(MavenObject.JAKARTA_REGEXP, BuildType.RUNTIME);

      downloadFromApache(MavenObject.UNBOUND_ID, BuildType.RUNTIME);

      downloadFromApache(MavenObject.IVY, BuildType.RUNTIME);



@@ -101,6 +104,7 @@


   public static void compiletime() {

      downloadFromApache(MavenObject.JUNIT, BuildType.RUNTIME);

      downloadFromApache(MavenObject.HAMCREST, BuildType.RUNTIME);

      downloadFromApache(MavenObject.JCOMMANDER, BuildType.COMPILETIME);

      downloadFromApache(MavenObject.JETTY, BuildType.COMPILETIME);

      downloadFromApache(MavenObject.JETTY_AJP, BuildType.COMPILETIME);

@@ -124,6 +128,8 @@
      downloadFromApache(MavenObject.LUCENE, BuildType.COMPILETIME);

      downloadFromApache(MavenObject.LUCENE_HIGHLIGHTER, BuildType.COMPILETIME);

      downloadFromApache(MavenObject.LUCENE_MEMORY, BuildType.COMPILETIME);

      downloadFromApache(MavenObject.LUCENE_QUERIES, BuildType.COMPILETIME);

      downloadFromApache(MavenObject.JAKARTA_REGEXP, BuildType.COMPILETIME);

      downloadFromApache(MavenObject.UNBOUND_ID, BuildType.COMPILETIME);

      downloadFromApache(MavenObject.IVY, BuildType.COMPILETIME);

      

@@ -143,6 +149,11 @@
      downloadFromApache(MavenObject.LOG4J, BuildType.RUNTIME);

      downloadFromApache(MavenObject.GSON, BuildType.RUNTIME);

      downloadFromApache(MavenObject.JSCH, BuildType.RUNTIME);

      downloadFromApache(MavenObject.LUCENE, BuildType.RUNTIME);

      downloadFromApache(MavenObject.LUCENE_HIGHLIGHTER, BuildType.RUNTIME);

      downloadFromApache(MavenObject.LUCENE_MEMORY, BuildType.RUNTIME);

      downloadFromApache(MavenObject.LUCENE_QUERIES, BuildType.RUNTIME);

      downloadFromApache(MavenObject.JAKARTA_REGEXP, BuildType.RUNTIME);



      downloadFromEclipse(MavenObject.JGIT, BuildType.RUNTIME);

   }

@@ -357,8 +368,19 @@
      }

      for (String jar : jars) {

         File targetFile = mo.getLocalFile("ext", jar);

         if ("-sources".equals(jar)) {

            File relocated = new File("ext/src", targetFile.getName());

            if (targetFile.exists()) {

               // move -sources jar to ext/src folder

               targetFile.renameTo(relocated);

            }

            // -sources jars are located in ext/src

            targetFile = relocated;

         }

			
         if (targetFile.exists()) {

            downloads.add(targetFile);

            removeObsoleteArtifacts(mo, type, targetFile.getParentFile());

            continue;

         }

         String expectedSHA1 = mo.getSHA1(jar);

@@ -434,8 +456,40 @@
            throw new RuntimeException("Error writing to file " + targetFile, e);

         }

         downloads.add(targetFile);

			
         removeObsoleteArtifacts(mo, type, targetFile.getParentFile());

      }

      return downloads;

   }

	
   private static void removeObsoleteArtifacts(final MavenObject mo, final BuildType type, File folder) {

      File [] removals = folder.listFiles(new FilenameFilter() {

         @Override

         public boolean accept(File dir, String name) {

            String n = name.toLowerCase();

            String dep = mo.artifact.toLowerCase();

            if (n.startsWith(dep)) {

               String suffix = "-" + mo.version;

               if (type.equals(BuildType.COMPILETIME)) {

                  suffix += "-sources.jar";

               } else {

                  suffix += ".jar";

               }

               if (!n.endsWith(suffix)) {

                  return true;

               }

            }

            return false;

         }

      });

		
      // delete any matches

      if (removals != null) {

         for (File file : removals) {

            System.out.println("deleting " + file);

            file.delete();

         }

      }

   }



   private static void updateDownload(float progress, File file) {

@@ -467,14 +521,14 @@
            "c7adc475ca40c288c93054e0f4fe58f3a98c0cb5");



      public static final MavenObject JETTY = new MavenObject("Jetty",

            "org/eclipse/jetty/aggregate", "jetty-webapp", "7.4.3.v20110701", 1000000, 680000,

            2720000, "bde072b178f9650e2308f0babe58a4baaa469e3c",

            "bc75f05dd4f7fa848720ac669b8b438ee4a6b146",

            "dcd42f672e734521d1a6ccc0c2f9ecded1a1a281");

            "org/eclipse/jetty/aggregate", "jetty-webapp", "7.6.7.v20120910", 1000000, 680000,

            2720000, "d621fa6419aaa37edbcab8e16a5e6b05c9527e62",

            "b505f7b493c5aa262d371d90754bded8b392ffb0",

            "");



      public static final MavenObject JETTY_AJP = new MavenObject("Jetty-AJP",

            "org/eclipse/jetty", "jetty-ajp", "7.4.3.v20110701", 32000, 22000,

            97000, "ddeb533bcf29e9b95555a9c0f34c1de3ab14c430", "bc4798286d705ea972643b3a0b31f46a0c53f605", "");

            "org/eclipse/jetty", "jetty-ajp", "7.6.7.v20120910", 32000, 22000,

            97000, "578d502bc78ed7aa1c0b6afef4cd59477041ec37", "6cfed9a1354f720fcde12ec15d5e1ae9cf97000c", "");

      

      public static final MavenObject SERVLET = new MavenObject("Servlet 3.0", "javax/servlet",

            "javax.servlet-api", "3.0.1", 84000, 211000, 0,

@@ -499,31 +553,34 @@
            "c10c20168206896442f3192d5417815df7fcbf9a");



      public static final MavenObject WICKET = new MavenObject("Apache Wicket",

            "org/apache/wicket", "wicket", "1.4.20", 1960000, 1906000, 6818000,

            "bafe47d8ce8647cabeff691b5fc1ffd241ffee00",

            "7a6570df4ee7fbad71a38042c53780d46b5856db",

            "org/apache/wicket", "wicket", "1.4.21", 1960000, 1906000, 6818000,

            "cce9dfd3088e18a3cdcf9be33b5b76caa48dc4c6",

            "e8c2bfe2c96a2da7a0eca947a2f60dc3242e7229",

            "");



      public static final MavenObject WICKET_EXT = new MavenObject("Apache Wicket Extensions",

            "org/apache/wicket", "wicket-extensions", "1.4.20", 1180000, 1118000, 1458000,

            "5dc6353c3c69e39e6d5a0aaeedbbaf7a53e539c4",

            "c30112665f4c4874489d7df9fc8f866c57f93cc8",

            "org/apache/wicket", "wicket-extensions", "1.4.21", 1180000, 1118000, 1458000,

            "fac510c7ee4399a29b927405ec3de40b67d105d8",

            "ee3409ce9ed64ad8cc8d69abbd7d63f07e10851a",

            "");



      public static final MavenObject WICKET_AUTH_ROLES = new MavenObject(

            "Apache Wicket Auth Roles", "org/apache/wicket", "wicket-auth-roles", "1.4.20",

            44000, 45000, 166000, "7e8f99b96bce03cc0a115e6a70d9eed7fbcf6a4b",

            "d7d0479ecca239bd020b247e82562fe047f53620",

            "Apache Wicket Auth Roles", "org/apache/wicket", "wicket-auth-roles", "1.4.21",

            44000, 45000, 166000, "e78df70ca942e2e15287c393f236b32fbe6f9a30",

            "47c301212cce43a70caa72f41a9a1aefcf26a533",

            "");



      public static final MavenObject WICKET_GOOGLE_CHARTS = new MavenObject(

            "Apache Wicket Google Charts Add-On", "org/wicketstuff", "googlecharts", "1.4.20",

            34000, 18750, 161000, "a4bed7d4a3632f95f3e204017ee60332a95da7c6",

            "16bda0794345b113c8dd5c8775e1ce493541dc67",

            "Apache Wicket Google Charts Add-On", "org/wicketstuff", "googlecharts", "1.4.21",

            34000, 18750, 161000, "73d7540267afc3a0e91ca6148d3073e050dba180",

            "627b125cc6029d4d5c59c3a910c1bef347384d97",

            "");



      public static final MavenObject JUNIT = new MavenObject("JUnit", "junit", "junit", "4.8.2",

            237000, 0, 0, "c94f54227b08100974c36170dcb53329435fe5ad", "", "");

      public static final MavenObject JUNIT = new MavenObject("JUnit", "junit", "junit", "4.10",

            253000, 141000, 0, "e4f1766ce7404a08f45d859fb9c226fc9e41a861", "6c98d6766e72d5575f96c9479d1c1d3b865c6e25", "");



      public static final MavenObject HAMCREST = new MavenObject("Hamcrest Core", "org/hamcrest", "hamcrest-core", "1.1",

            77000, 0, 0, "860340562250678d1a344907ac75754e259cdb14", null, "");



      public static final MavenObject MARKDOWNPAPERS = new MavenObject("MarkdownPapers",

            "org/tautua/markdownpapers", "markdownpapers-core", "1.2.7", 87000, 58000, 268000,

@@ -544,15 +601,15 @@
            "3b7c5f3938f202311bdca0bf7ed46bc0118af081");



      public static final MavenObject JGIT = new MavenObject("JGit", "org/eclipse/jgit",

            "org.eclipse.jgit", "2.0.0.201206130900-r", 1600000, 1565000, 3460000,

            "c8934e903ef26ec9aa1d0d3b604979c77eda4137",

            "7e2c1486bf13e7bbdf39b68554e9010abe385c32",

            "org.eclipse.jgit", "2.1.0.201209190230-r", 1600000, 1565000, 3460000,

            "5e7296d21645a479a1054fc96f3ec8469cede137",

            "5f492aaeae1beda2a31d1efa182f5d34e76d7b77",

            "");



      public static final MavenObject JGIT_HTTP = new MavenObject("JGit", "org/eclipse/jgit",

            "org.eclipse.jgit.http.server", "2.0.0.201206130900-r", 68000, 62000, 110000,

            "d42535d996ccfc487092a8850e6e78d368de72d6",

            "85d5ba16db13144815634aeff31ad6c7d92107e6",

            "org.eclipse.jgit.http.server", "2.1.0.201209190230-r", 68000, 62000, 110000,

            "0bd9e5801c246d6f8ad9268d18c45ca9915f9a50",

            "210c434c38ddcf2126af250018d5845ea41ff502",

            "");



      public static final MavenObject JSCH = new MavenObject("JSch", "com/jcraft", "jsch",

@@ -585,20 +642,28 @@
            "5875e2729de83a4e46391f8f979ec8bd03810c10", null);



      public static final MavenObject GROOVY = new MavenObject("groovy", "org/codehaus/groovy", "groovy-all",

            "1.8.5", 6143000, 2290000, 4608000, "3be3914c49ca7d8e8afb29a7772a74c30a1f1b28",

            "1435cc8c90e3a91e5fee7bb53e83aad96e93aeb7", "5a214b52286523f9e2a4b5fed526506c763fa6f1");

            "1.8.8", 6143000, 2290000, 4608000, "98a489343d3c30da817d36cbea5de11ed07bef31",

            "5f847ed18009f8a034bad3906e39f771c01728c1", "");



      public static final MavenObject LUCENE = new MavenObject("lucene", "org/apache/lucene", "lucene-core",

            "3.6.0", 1470000, 1347000, 3608000, "8a0429de6b7c9918841fa2c441a6ef4cc07f2a18",

            "7b0dd31b657868c23220e037d9dc7ba38da1896e", "126f6b68e707ad54bf1ac126199ef0cd289d8f59");

            "3.6.1", 1540000, 1431000, 3608000, "6ae2c83c77a1ffa5840b9151a271ab3f451f6e0c",

            "6925deb6b78e63bbcac382004f00b98133327057", "");



      public static final MavenObject LUCENE_HIGHLIGHTER = new MavenObject("lucene highlighter", "org/apache/lucene", "lucene-highlighter",

            "3.6.0", 88000, 82334, 0, "9ee691f1dcc60f093df433c165d6a686c6d24553",

            "6e6d7cbb5079519e5925dcd1759ffd538e66df7d", "");

            "3.6.1", 89200, 85000, 0, "2bd49695e9891697c5f290aa94c3412dfb95b096",

            "20ae81816ce9c27186ef0f2e92a57812c9ee3b6c", "");



      public static final MavenObject LUCENE_MEMORY = new MavenObject("lucene memory", "org/apache/lucene", "lucene-memory",

            "3.6.0", 30000, 23000, 0, "d257d393aa09ed472e7864e20288019a705e637e",

            "f24912b8aa835ddf45e439b2d7ab099e63269c1e", "");

            "3.6.1", 30000, 23000, 0, "8c7ca5572edea50973dc0d26cf75c27047eebe7e",

            "2e291e96d25132e002b1c8240e361d1272d113e1", "");



      public static final MavenObject LUCENE_QUERIES = new MavenObject("lucene queries", "org/apache/lucene", "lucene-queries",

            "3.6.1", 47400, 48600, 0, "4ed6022dd4aa80b932a1546e7e39e3b8bbe7acb7",

            "dc425c75d988e4975d314772035a46b6a17dcc8d", "");



      public static final MavenObject JAKARTA_REGEXP = new MavenObject("jakarta regexp", "jakarta-regexp", "jakarta-regexp",

            "1.4", 28500, 0, 0, "0ea514a179ac1dd7e81c7e6594468b9b9910d298",

            null, "");

      

      public static final MavenObject UNBOUND_ID = new MavenObject("unbound id", "com/unboundid", "unboundid-ldapsdk",

            "2.3.0", 1383417, 1439721, 0, "6fde8d9fb4ee3e7e3d7e764e3ea57195971e2eb2",