Removes all dependencies on DuraSpace thirdparty maven repo. This was…

… done by (1) moving javascript dependencies into the projects where they are used and (2) removing the JRE used by the bitrock installer for OSX. This work is part of https://jira.duraspace.org/browse/DURACLOUD-856. This change should also allow external CI builds to complete (due to the security certificate of the DuraSpace maven repo not being trusted by Java)
fozboz · Oct 31, 2014 · 65cc888 · 65cc888
1 parent 7bea7e0
commit 65cc888
Show file tree

Hide file tree

Showing 47 changed files with 145 additions and 70 deletions.
diff --git a/duradmin/pom.xml b/duradmin/pom.xml
@@ -13,7 +13,14 @@
     <version>3.2.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
-  <repositories />
+
+  <repositories>
+    <repository>
+      <id>project.local</id>
+      <name>project</name>
+      <url>file:${project.basedir}/repo</url>
+    </repository>
+  </repositories>
 
   <properties>
     <jquery.target.path>jquery</jquery.target.path>

diff --git a/duradmin/repo/org/duracloud/jquery-ui/1.8.6/jquery-ui-1.8.6.pom b/duradmin/repo/org/duracloud/jquery-ui/1.8.6/jquery-ui-1.8.6.pom
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.duracloud</groupId>
+  <artifactId>jquery-ui</artifactId>
+  <version>1.8.6</version>
+  <packaging>zip</packaging>
+  <description>POM was created by Sonatype Nexus</description>
+</project>
diff --git a/duradmin/repo/org/duracloud/jquery-ui/1.8.6/jquery-ui-1.8.6.pom.sha1 b/duradmin/repo/org/duracloud/jquery-ui/1.8.6/jquery-ui-1.8.6.pom.sha1
@@ -0,0 +1 @@
+298a7fbe876b8ded616fa2d408d7e589eeaab825
diff --git a/duradmin/repo/org/duracloud/jquery-ui/1.8.6/jquery-ui-1.8.6.zip b/duradmin/repo/org/duracloud/jquery-ui/1.8.6/jquery-ui-1.8.6.zip
diff --git a/duradmin/repo/org/duracloud/jquery-ui/1.8.6/jquery-ui-1.8.6.zip.sha1 b/duradmin/repo/org/duracloud/jquery-ui/1.8.6/jquery-ui-1.8.6.zip.sha1
@@ -0,0 +1 @@
+9e4a32c6b6ebd9010c69b3c9eb8d7d1aef822de4
diff --git a/...in/repo/org/duracloud/jquery.ba-throttle-debounce/1.1/jquery.ba-throttle-debounce-1.1.pom b/...in/repo/org/duracloud/jquery.ba-throttle-debounce/1.1/jquery.ba-throttle-debounce-1.1.pom
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.duracloud</groupId>
+  <artifactId>jquery.ba-throttle-debounce</artifactId>
+  <version>1.1</version>
+  <packaging>zip</packaging>
+  <description>POM was created by Sonatype Nexus</description>
+</project>
diff --git a/...po/org/duracloud/jquery.ba-throttle-debounce/1.1/jquery.ba-throttle-debounce-1.1.pom.sha1 b/...po/org/duracloud/jquery.ba-throttle-debounce/1.1/jquery.ba-throttle-debounce-1.1.pom.sha1
@@ -0,0 +1 @@
+299736f831c893a068a49ddc2111d92297fbdd8f
diff --git a/...in/repo/org/duracloud/jquery.ba-throttle-debounce/1.1/jquery.ba-throttle-debounce-1.1.zip b/...in/repo/org/duracloud/jquery.ba-throttle-debounce/1.1/jquery.ba-throttle-debounce-1.1.zip
diff --git a/...po/org/duracloud/jquery.ba-throttle-debounce/1.1/jquery.ba-throttle-debounce-1.1.zip.sha1 b/...po/org/duracloud/jquery.ba-throttle-debounce/1.1/jquery.ba-throttle-debounce-1.1.zip.sha1
@@ -0,0 +1 @@
+c798b1a280fc6e2acc243cb64a01da8a6571a2ea
diff --git a/duradmin/repo/org/duracloud/jquery.fancybox/1.3.1/jquery.fancybox-1.3.1.pom b/duradmin/repo/org/duracloud/jquery.fancybox/1.3.1/jquery.fancybox-1.3.1.pom
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.duracloud</groupId>
+  <artifactId>jquery.fancybox</artifactId>
+  <packaging>zip</packaging>
+  <version>1.3.1</version>
+  <description>POM was created by Sonatype Nexus</description>
+</project>
diff --git a/duradmin/repo/org/duracloud/jquery.fancybox/1.3.1/jquery.fancybox-1.3.1.pom.sha1 b/duradmin/repo/org/duracloud/jquery.fancybox/1.3.1/jquery.fancybox-1.3.1.pom.sha1
@@ -0,0 +1 @@
+cf0dbe3bb5f4d28e5926d570d5106be320addec6
diff --git a/duradmin/repo/org/duracloud/jquery.fancybox/1.3.1/jquery.fancybox-1.3.1.zip b/duradmin/repo/org/duracloud/jquery.fancybox/1.3.1/jquery.fancybox-1.3.1.zip
diff --git a/duradmin/repo/org/duracloud/jquery.fancybox/1.3.1/jquery.fancybox-1.3.1.zip.sha1 b/duradmin/repo/org/duracloud/jquery.fancybox/1.3.1/jquery.fancybox-1.3.1.zip.sha1
@@ -0,0 +1 @@
+30fb5b8b98ce5421b92094c6a011e0b6cc218cc6
diff --git a/duradmin/repo/org/duracloud/jquery.form/20130616/jquery.form-20130616.pom b/duradmin/repo/org/duracloud/jquery.form/20130616/jquery.form-20130616.pom
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.duracloud</groupId>
+  <artifactId>jquery.form</artifactId>
+  <version>20130616</version>
+  <packaging>zip</packaging>
+  <description>POM was created by Sonatype Nexus</description>
+</project>
diff --git a/duradmin/repo/org/duracloud/jquery.form/20130616/jquery.form-20130616.pom.sha1 b/duradmin/repo/org/duracloud/jquery.form/20130616/jquery.form-20130616.pom.sha1
@@ -0,0 +1 @@
+89c295fe8f9aa8eb7ad88cc331d4a64ab22058c0
diff --git a/duradmin/repo/org/duracloud/jquery.form/20130616/jquery.form-20130616.zip b/duradmin/repo/org/duracloud/jquery.form/20130616/jquery.form-20130616.zip
diff --git a/duradmin/repo/org/duracloud/jquery.form/20130616/jquery.form-20130616.zip.sha1 b/duradmin/repo/org/duracloud/jquery.form/20130616/jquery.form-20130616.zip.sha1
@@ -0,0 +1 @@
+8bcf5070d83db31063981e9356db7bbdf5e9f58e
diff --git a/duradmin/repo/org/duracloud/jquery.history/1.7.1-r2/jquery.history-1.7.1-r2.pom b/duradmin/repo/org/duracloud/jquery.history/1.7.1-r2/jquery.history-1.7.1-r2.pom
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.duracloud</groupId>
+  <artifactId>jquery.history</artifactId>
+  <version>1.7.1-r2</version>
+  <packaging>zip</packaging>
+  <description>POM was created by Sonatype Nexus</description>
+</project>
diff --git a/duradmin/repo/org/duracloud/jquery.history/1.7.1-r2/jquery.history-1.7.1-r2.pom.sha1 b/duradmin/repo/org/duracloud/jquery.history/1.7.1-r2/jquery.history-1.7.1-r2.pom.sha1
@@ -0,0 +1 @@
+43ead42c531938e4b3d65dd41d4c255a9891d1d9
diff --git a/duradmin/repo/org/duracloud/jquery.history/1.7.1-r2/jquery.history-1.7.1-r2.zip b/duradmin/repo/org/duracloud/jquery.history/1.7.1-r2/jquery.history-1.7.1-r2.zip
diff --git a/duradmin/repo/org/duracloud/jquery.history/1.7.1-r2/jquery.history-1.7.1-r2.zip.sha1 b/duradmin/repo/org/duracloud/jquery.history/1.7.1-r2/jquery.history-1.7.1-r2.zip.sha1
@@ -0,0 +1 @@
+1e64c232b968aa00685c3fcd66b94cfbd6007955
diff --git a/duradmin/repo/org/duracloud/jquery.layout/1.2.0/jquery.layout-1.2.0.pom b/duradmin/repo/org/duracloud/jquery.layout/1.2.0/jquery.layout-1.2.0.pom
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.duracloud</groupId>
+  <artifactId>jquery.layout</artifactId>
+  <version>1.2.0</version>
+  <packaging>zip</packaging>
+  <description>POM was created by Sonatype Nexus</description>
+</project>
diff --git a/duradmin/repo/org/duracloud/jquery.layout/1.2.0/jquery.layout-1.2.0.pom.sha1 b/duradmin/repo/org/duracloud/jquery.layout/1.2.0/jquery.layout-1.2.0.pom.sha1
@@ -0,0 +1 @@
+51b3ce2ebfa2dd220ab47d8091e0cf386d0aadd5
diff --git a/duradmin/repo/org/duracloud/jquery.layout/1.2.0/jquery.layout-1.2.0.zip b/duradmin/repo/org/duracloud/jquery.layout/1.2.0/jquery.layout-1.2.0.zip
diff --git a/duradmin/repo/org/duracloud/jquery.layout/1.2.0/jquery.layout-1.2.0.zip.sha1 b/duradmin/repo/org/duracloud/jquery.layout/1.2.0/jquery.layout-1.2.0.zip.sha1
@@ -0,0 +1 @@
+496a42ac1ac8e6daae599ed70f1f4a85a0be6b25
diff --git a/duradmin/repo/org/duracloud/jquery.validate/1.7/jquery.validate-1.7.pom b/duradmin/repo/org/duracloud/jquery.validate/1.7/jquery.validate-1.7.pom
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.duracloud</groupId>
+  <artifactId>jquery.validate</artifactId>
+  <version>1.7</version>
+  <packaging>zip</packaging>
+  <description>POM was created by Sonatype Nexus</description>
+</project>
diff --git a/duradmin/repo/org/duracloud/jquery.validate/1.7/jquery.validate-1.7.pom.sha1 b/duradmin/repo/org/duracloud/jquery.validate/1.7/jquery.validate-1.7.pom.sha1
@@ -0,0 +1 @@
+2f8a200c5f1475ce57d78cfa4fe24a76883c05dd
diff --git a/duradmin/repo/org/duracloud/jquery.validate/1.7/jquery.validate-1.7.zip b/duradmin/repo/org/duracloud/jquery.validate/1.7/jquery.validate-1.7.zip
diff --git a/duradmin/repo/org/duracloud/jquery.validate/1.7/jquery.validate-1.7.zip.sha1 b/duradmin/repo/org/duracloud/jquery.validate/1.7/jquery.validate-1.7.zip.sha1
@@ -0,0 +1 @@
+8fc0d3e25b4fc4d5262e141db454deb639a047fe
diff --git a/duradmin/repo/org/duracloud/jquery/1.7.1/jquery-1.7.1.pom b/duradmin/repo/org/duracloud/jquery/1.7.1/jquery-1.7.1.pom
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.duracloud</groupId>
+  <artifactId>jquery</artifactId>
+  <version>1.7.1</version>
+  <packaging>zip</packaging>
+  <description>POM was created by Sonatype Nexus</description>
+</project>
diff --git a/duradmin/repo/org/duracloud/jquery/1.7.1/jquery-1.7.1.pom.sha1 b/duradmin/repo/org/duracloud/jquery/1.7.1/jquery-1.7.1.pom.sha1
@@ -0,0 +1 @@
+7cc9528e15b6e2ff122bf6115afd8119b03c8fe1
diff --git a/duradmin/repo/org/duracloud/jquery/1.7.1/jquery-1.7.1.zip b/duradmin/repo/org/duracloud/jquery/1.7.1/jquery-1.7.1.zip
diff --git a/duradmin/repo/org/duracloud/jquery/1.7.1/jquery-1.7.1.zip.sha1 b/duradmin/repo/org/duracloud/jquery/1.7.1/jquery-1.7.1.zip.sha1
@@ -0,0 +1 @@
+a3b0dd099cff87f8607fb062ae632a64ed06d7d3
diff --git a/duradmin/repo/org/duracloud/sojo-optional/0.5.0/sojo-optional-0.5.0.jar b/duradmin/repo/org/duracloud/sojo-optional/0.5.0/sojo-optional-0.5.0.jar
diff --git a/duradmin/repo/org/duracloud/sojo-optional/0.5.0/sojo-optional-0.5.0.jar.sha1 b/duradmin/repo/org/duracloud/sojo-optional/0.5.0/sojo-optional-0.5.0.jar.sha1
@@ -0,0 +1 @@
+07ce44aca0c3d5a89969066abe8018b28324ce8e
diff --git a/duradmin/repo/org/duracloud/sojo-optional/0.5.0/sojo-optional-0.5.0.pom b/duradmin/repo/org/duracloud/sojo-optional/0.5.0/sojo-optional-0.5.0.pom
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.duracloud</groupId>
+  <artifactId>sojo-optional</artifactId>
+  <version>0.5.0</version>
+  <description>POM was created by Sonatype Nexus</description>
+</project>
diff --git a/duradmin/repo/org/duracloud/sojo-optional/0.5.0/sojo-optional-0.5.0.pom.sha1 b/duradmin/repo/org/duracloud/sojo-optional/0.5.0/sojo-optional-0.5.0.pom.sha1
@@ -0,0 +1 @@
+fbbeffd4c587382e1c1102cfb256293a86049461
diff --git a/pom.xml b/pom.xml
@@ -278,18 +278,6 @@
 
     <repositories>
 
-        <repository>
-            <id>duraspace-thirdparty</id>
-            <name>DuraSpace Thirdparty</name>
-            <url>https://m2.duraspace.org/content/repositories/thirdparty</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-
         <repository>
             <id>central</id>
             <name>Maven Repository Switchboard</name>

diff --git a/synctoolui/pom.xml b/synctoolui/pom.xml
@@ -30,6 +30,14 @@
     <jre.unpack.dir>${project.build.directory}/jre</jre.unpack.dir>
   </properties>
 
+  <repositories>
+    <repository>
+      <id>project.local</id>
+      <name>project</name>
+      <url>file:${project.basedir}/repo</url>
+    </repository>
+  </repositories>
+
   <build>
 
     <resources>
@@ -458,12 +466,6 @@
       <artifactId>easymock</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>com.bitrock.installbuilder</groupId>
-      <artifactId>jre</artifactId>
-      <version>1.7.0_40-osx</version>
-      <type>zip</type>
-    </dependency>
   </dependencies>
 
   <profiles>
@@ -494,26 +496,6 @@
             </executions>
           </plugin>
 
-          <plugin>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <executions>
-              <execution>
-                <phase>install</phase>
-                <configuration>
-                  <tasks>
-                    <copy todir="${project.build.directory}/install"
-                      overwrite="true">
-                      <fileset dir="${jre.unpack.dir}/jre1.7.0_40-osx" />
-                    </copy>
-                  </tasks>
-                </configuration>
-                <goals>
-                  <goal>run</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-
           <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>exec-maven-plugin</artifactId>
@@ -565,24 +547,6 @@
                 </configuration>
               </execution>
 
-              <execution>
-                <id>osx-with-jre</id>
-                <phase>install</phase>
-                <goals>
-                  <goal>exec</goal>
-                </goals>
-                <configuration>
-                  <executable>${installbuilder.executable.path}</executable>
-                  <arguments>
-                    <argument>build</argument>
-                    <argument>${project.build.directory}/install/installbuilder.xml</argument>
-                    <argument>osx</argument>
-                    <argument>--setvars</argument>
-                    <argument>java_install_jre=1</argument>
-                  </arguments>
-                </configuration>
-              </execution>
-
               <execution>
                 <id>linux</id>
                 <phase>install</phase>
@@ -637,19 +601,6 @@
                   <finalName>${alternateArtifactId}-${project.version}</finalName>
                 </configuration>
               </execution>
-              <execution>
-                <id>install-with-jre</id>
-                <phase>install</phase>
-                <goals>
-                  <goal>single</goal>
-                </goals>
-                <configuration>
-                  <descriptors>
-                    <descriptor>src/main/install/osx-with-jre-installer-zip.xml</descriptor>
-                  </descriptors>
-                  <finalName>${alternateArtifactId}-${project.version}</finalName>
-                </configuration>
-              </execution>
             </executions>
           </plugin>
 

diff --git a/synctoolui/repo/org/duracloud/jquery-ui-war/1.8.6/jquery-ui-war-1.8.6.pom b/synctoolui/repo/org/duracloud/jquery-ui-war/1.8.6/jquery-ui-war-1.8.6.pom
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.duracloud</groupId>
+  <artifactId>jquery-ui-war</artifactId>
+  <version>1.8.6</version>
+  <packaging>war</packaging>
+  <description>POM was created by Sonatype Nexus</description>
+</project>
diff --git a/synctoolui/repo/org/duracloud/jquery-ui-war/1.8.6/jquery-ui-war-1.8.6.pom.sha1 b/synctoolui/repo/org/duracloud/jquery-ui-war/1.8.6/jquery-ui-war-1.8.6.pom.sha1
@@ -0,0 +1 @@
+28d66060636fd222a8f3e64410288c817a0b708b
diff --git a/synctoolui/repo/org/duracloud/jquery-ui-war/1.8.6/jquery-ui-war-1.8.6.war b/synctoolui/repo/org/duracloud/jquery-ui-war/1.8.6/jquery-ui-war-1.8.6.war
diff --git a/synctoolui/repo/org/duracloud/jquery-ui-war/1.8.6/jquery-ui-war-1.8.6.war.sha1 b/synctoolui/repo/org/duracloud/jquery-ui-war/1.8.6/jquery-ui-war-1.8.6.war.sha1
@@ -0,0 +1 @@
+a41f0d199794966b46c256d8ee0c0087fedd75fa
diff --git a/synctoolui/repo/org/duracloud/jquery-war/1.7.1/jquery-war-1.7.1.pom b/synctoolui/repo/org/duracloud/jquery-war/1.7.1/jquery-war-1.7.1.pom
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.duracloud</groupId>
+  <artifactId>jquery-war</artifactId>
+  <version>1.7.1</version>
+  <packaging>war</packaging>
+  <description>POM was created by Sonatype Nexus</description>
+</project>
diff --git a/synctoolui/repo/org/duracloud/jquery-war/1.7.1/jquery-war-1.7.1.pom.sha1 b/synctoolui/repo/org/duracloud/jquery-war/1.7.1/jquery-war-1.7.1.pom.sha1
@@ -0,0 +1 @@
+76bc5e2e614f162c30aaaf14348bbce5978583c9
diff --git a/synctoolui/repo/org/duracloud/jquery-war/1.7.1/jquery-war-1.7.1.war b/synctoolui/repo/org/duracloud/jquery-war/1.7.1/jquery-war-1.7.1.war
diff --git a/synctoolui/repo/org/duracloud/jquery-war/1.7.1/jquery-war-1.7.1.war.sha1 b/synctoolui/repo/org/duracloud/jquery-war/1.7.1/jquery-war-1.7.1.war.sha1
@@ -0,0 +1 @@
+99e3f333660c1338835c59d94b9e0bea8ef5aa20