flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cd...@apache.org
Subject [flex-utilities] branch feature/flash-downloader updated: - Updated the project to a somewhat releasable state
Date Mon, 11 Nov 2019 10:43:11 GMT
This is an automated email from the ASF dual-hosted git repository.

cdutz pushed a commit to branch feature/flash-downloader
in repository https://gitbox.apache.org/repos/asf/flex-utilities.git


The following commit(s) were added to refs/heads/feature/flash-downloader by this push:
     new 133b6ec  - Updated the project to a somewhat releasable state
133b6ec is described below

commit 133b6ec00ba486fd32fdb9ef34a3c200c4f6fc10
Author: Christofer Dutz <christofer.dutz@c-ware.de>
AuthorDate: Mon Nov 11 11:42:52 2019 +0100

    - Updated the project to a somewhat releasable state
---
 flex-maven-tools/flex-sdk-converter/api/pom.xml    |   4 +-
 flex-maven-tools/flex-sdk-converter/cli/pom.xml    |  12 +-
 .../flex-sdk-converter/converters/air/pom.xml      |   6 +-
 .../flex-sdk-converter/converters/base/pom.xml     |   6 +-
 .../flex-sdk-converter/converters/flash/pom.xml    |   7 +-
 .../flex-sdk-converter/converters/flex/pom.xml     |  13 +-
 .../flex-sdk-converter/converters/fontkit/pom.xml  |   6 +-
 .../flex-sdk-converter/converters/pom.xml          |   3 +-
 .../flex-sdk-converter/converters/wrapper/pom.xml  |   6 +-
 .../flex-sdk-converter/deployers/aether/pom.xml    |   4 +-
 .../flex-sdk-converter/deployers/maven/pom.xml     |   4 +-
 .../flex-sdk-converter/deployers/pom.xml           |   3 +-
 .../flex-sdk-converter/maven-extension/pom.xml     |  16 +-
 flex-maven-tools/flex-sdk-converter/pom.xml        | 177 +-----------
 .../flex-sdk-converter/retrievers/base/pom.xml     |   6 +-
 .../flex-sdk-converter/retrievers/download/pom.xml |  15 +-
 .../retrievers/download/utils/DmgExtractor.java    | 319 ---------------------
 .../download/utils/utils/ApplePartitionMap.java    | 209 --------------
 .../download/utils/utils/DmgBlkxBlock.java         | 125 --------
 .../download/utils/utils/DmgBlockChunkEntry.java   |  95 ------
 .../download/utils/utils/DmgTrailer.java           | 174 -----------
 .../download/utils/utils/DmgUdifChecksum.java      |  42 ---
 .../download/utils/utils/DriverDescriptor.java     |  38 ---
 .../download/utils/utils/DriverDescriptorMap.java  |  85 ------
 .../download/utils/utils/HFSVolumeFactory.java     |  24 --
 .../download/utils/utils/IHFSVolumeHeader.java     |  10 -
 .../utils/utils/btree/BTreeDescriptor.java         |  99 -------
 .../utils/utils/btree/BTreeHeaderNode.java         |  55 ----
 .../utils/utils/btree/BTreeHeaderRecord.java       | 168 -----------
 .../download/utils/utils/btree/BTreeIndexNode.java |  36 ---
 .../download/utils/utils/btree/BTreeLeafNode.java  |  36 ---
 .../download/utils/utils/btree/BTreeMapNode.java   |  36 ---
 .../download/utils/utils/btree/BTreeMapRecord.java |  29 --
 .../download/utils/utils/btree/BTreeNode.java      |  42 ---
 .../utils/utils/btree/BTreeUserDataRecord.java     |  28 --
 .../download/utils/utils/hfs/HFSVolumeHeader.java  |  29 --
 .../utils/utils/hfsplus/HFSPlusExtent.java         |  56 ----
 .../utils/utils/hfsplus/HFSPlusFinderInfo.java     |  72 -----
 .../utils/utils/hfsplus/HFSPlusForkData.java       |  74 -----
 .../utils/utils/hfsplus/HFSPlusVolumeHeader.java   | 311 --------------------
 .../utils/utils/hfsx/HFSXVolumeHeader.java         |  29 --
 .../converter/retrievers/download/ProxyTest.java   |   4 +-
 .../flex-sdk-converter/retrievers/pom.xml          |   3 +-
 43 files changed, 46 insertions(+), 2470 deletions(-)

diff --git a/flex-maven-tools/flex-sdk-converter/api/pom.xml b/flex-maven-tools/flex-sdk-converter/api/pom.xml
index 15e1a2a..0ba4943 100644
--- a/flex-maven-tools/flex-sdk-converter/api/pom.xml
+++ b/flex-maven-tools/flex-sdk-converter/api/pom.xml
@@ -23,11 +23,9 @@
     <parent>
         <groupId>org.apache.flex.utilities.converter</groupId>
         <artifactId>apache-flex-sdk-converter</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>api</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <packaging>jar</packaging>
 
 </project>
diff --git a/flex-maven-tools/flex-sdk-converter/cli/pom.xml b/flex-maven-tools/flex-sdk-converter/cli/pom.xml
index 095617f..2f307e2 100644
--- a/flex-maven-tools/flex-sdk-converter/cli/pom.xml
+++ b/flex-maven-tools/flex-sdk-converter/cli/pom.xml
@@ -23,12 +23,10 @@
     <parent>
         <groupId>org.apache.flex.utilities.converter</groupId>
         <artifactId>apache-flex-sdk-converter</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>cli</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <packaging>jar</packaging>
 
     <build>
         <plugins>
@@ -68,23 +66,23 @@
         <dependency>
             <groupId>org.apache.flex.utilities.converter</groupId>
             <artifactId>api</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>1.1.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.flex.utilities.converter</groupId>
             <artifactId>download-retriever</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>1.1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.flex.utilities.converter</groupId>
             <artifactId>flex-converter</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>1.1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.flex.utilities.converter</groupId>
             <artifactId>aether-deployer</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>1.1.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/flex-maven-tools/flex-sdk-converter/converters/air/pom.xml b/flex-maven-tools/flex-sdk-converter/converters/air/pom.xml
index 88d61aa..a82218f 100644
--- a/flex-maven-tools/flex-sdk-converter/converters/air/pom.xml
+++ b/flex-maven-tools/flex-sdk-converter/converters/air/pom.xml
@@ -23,18 +23,16 @@
     <parent>
         <groupId>org.apache.flex.utilities.converter</groupId>
         <artifactId>converters</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>air-converter</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.flex.utilities.converter</groupId>
             <artifactId>base-converter</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>1.1.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/flex-maven-tools/flex-sdk-converter/converters/base/pom.xml b/flex-maven-tools/flex-sdk-converter/converters/base/pom.xml
index fcc4881..ae030e7 100644
--- a/flex-maven-tools/flex-sdk-converter/converters/base/pom.xml
+++ b/flex-maven-tools/flex-sdk-converter/converters/base/pom.xml
@@ -23,18 +23,16 @@
     <parent>
         <groupId>org.apache.flex.utilities.converter</groupId>
         <artifactId>converters</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>base-converter</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.flex.utilities.converter</groupId>
             <artifactId>api</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>1.1.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/flex-maven-tools/flex-sdk-converter/converters/flash/pom.xml b/flex-maven-tools/flex-sdk-converter/converters/flash/pom.xml
index 6afc519..7676291 100644
--- a/flex-maven-tools/flex-sdk-converter/converters/flash/pom.xml
+++ b/flex-maven-tools/flex-sdk-converter/converters/flash/pom.xml
@@ -23,19 +23,18 @@
     <parent>
         <groupId>org.apache.flex.utilities.converter</groupId>
         <artifactId>converters</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>flash-converter</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.flex.utilities.converter</groupId>
             <artifactId>base-converter</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>1.1.0-SNAPSHOT</version>
         </dependency>
+
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-compress</artifactId>
diff --git a/flex-maven-tools/flex-sdk-converter/converters/flex/pom.xml b/flex-maven-tools/flex-sdk-converter/converters/flex/pom.xml
index 480bc83..28aa034 100644
--- a/flex-maven-tools/flex-sdk-converter/converters/flex/pom.xml
+++ b/flex-maven-tools/flex-sdk-converter/converters/flex/pom.xml
@@ -23,18 +23,17 @@
     <parent>
         <groupId>org.apache.flex.utilities.converter</groupId>
         <artifactId>converters</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>flex-converter</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.flex.utilities.converter</groupId>
             <artifactId>base-converter</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>1.1.0-SNAPSHOT</version>
         </dependency>
         <!--
             Flex usually contains Air and Flash artifacts, so we need to reference them.
@@ -42,22 +41,22 @@
         <dependency>
             <groupId>org.apache.flex.utilities.converter</groupId>
             <artifactId>air-converter</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>1.1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.flex.utilities.converter</groupId>
             <artifactId>flash-converter</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>1.1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.flex.utilities.converter</groupId>
             <artifactId>fontkit-converter</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>1.1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.flex.utilities.converter</groupId>
             <artifactId>wrapper-converter</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>1.1.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/flex-maven-tools/flex-sdk-converter/converters/fontkit/pom.xml b/flex-maven-tools/flex-sdk-converter/converters/fontkit/pom.xml
index 3d472e0..cc0d332 100644
--- a/flex-maven-tools/flex-sdk-converter/converters/fontkit/pom.xml
+++ b/flex-maven-tools/flex-sdk-converter/converters/fontkit/pom.xml
@@ -23,18 +23,16 @@
     <parent>
         <groupId>org.apache.flex.utilities.converter</groupId>
         <artifactId>converters</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>fontkit-converter</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.flex.utilities.converter</groupId>
             <artifactId>base-converter</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>1.1.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/flex-maven-tools/flex-sdk-converter/converters/pom.xml b/flex-maven-tools/flex-sdk-converter/converters/pom.xml
index 69a859b..c617f1f 100644
--- a/flex-maven-tools/flex-sdk-converter/converters/pom.xml
+++ b/flex-maven-tools/flex-sdk-converter/converters/pom.xml
@@ -23,11 +23,10 @@
     <parent>
         <groupId>org.apache.flex.utilities.converter</groupId>
         <artifactId>apache-flex-sdk-converter</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>converters</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <modules>
diff --git a/flex-maven-tools/flex-sdk-converter/converters/wrapper/pom.xml b/flex-maven-tools/flex-sdk-converter/converters/wrapper/pom.xml
index 86f8a43..d0fef5e 100644
--- a/flex-maven-tools/flex-sdk-converter/converters/wrapper/pom.xml
+++ b/flex-maven-tools/flex-sdk-converter/converters/wrapper/pom.xml
@@ -23,18 +23,16 @@
     <parent>
         <groupId>org.apache.flex.utilities.converter</groupId>
         <artifactId>converters</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>wrapper-converter</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.flex.utilities.converter</groupId>
             <artifactId>base-converter</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>1.1.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/flex-maven-tools/flex-sdk-converter/deployers/aether/pom.xml b/flex-maven-tools/flex-sdk-converter/deployers/aether/pom.xml
index 692b99c..1bb54db 100644
--- a/flex-maven-tools/flex-sdk-converter/deployers/aether/pom.xml
+++ b/flex-maven-tools/flex-sdk-converter/deployers/aether/pom.xml
@@ -23,12 +23,10 @@
     <parent>
         <groupId>org.apache.flex.utilities.converter</groupId>
         <artifactId>deployers</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>aether-deployer</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <packaging>jar</packaging>
 
     <build>
         <plugins>
diff --git a/flex-maven-tools/flex-sdk-converter/deployers/maven/pom.xml b/flex-maven-tools/flex-sdk-converter/deployers/maven/pom.xml
index c1fc93c..b292743 100644
--- a/flex-maven-tools/flex-sdk-converter/deployers/maven/pom.xml
+++ b/flex-maven-tools/flex-sdk-converter/deployers/maven/pom.xml
@@ -23,12 +23,10 @@
     <parent>
         <groupId>org.apache.flex.utilities.converter</groupId>
         <artifactId>deployers</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>maven-deployer</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <packaging>jar</packaging>
 
     <build>
         <plugins>
diff --git a/flex-maven-tools/flex-sdk-converter/deployers/pom.xml b/flex-maven-tools/flex-sdk-converter/deployers/pom.xml
index 692b45d..2ef112e 100644
--- a/flex-maven-tools/flex-sdk-converter/deployers/pom.xml
+++ b/flex-maven-tools/flex-sdk-converter/deployers/pom.xml
@@ -23,11 +23,10 @@
     <parent>
         <groupId>org.apache.flex.utilities.converter</groupId>
         <artifactId>apache-flex-sdk-converter</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>deployers</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <modules>
diff --git a/flex-maven-tools/flex-sdk-converter/maven-extension/pom.xml b/flex-maven-tools/flex-sdk-converter/maven-extension/pom.xml
index b96654b..f24fca3 100644
--- a/flex-maven-tools/flex-sdk-converter/maven-extension/pom.xml
+++ b/flex-maven-tools/flex-sdk-converter/maven-extension/pom.xml
@@ -24,12 +24,10 @@
     <parent>
         <groupId>org.apache.flex.utilities.converter</groupId>
         <artifactId>apache-flex-sdk-converter</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>flex-sdk-converter-maven-extension</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <packaging>jar</packaging>
 
     <build>
         <plugins>
@@ -73,32 +71,32 @@
         <dependency>
             <groupId>org.apache.flex.utilities.converter</groupId>
             <artifactId>download-retriever</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>1.1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.flex.utilities.converter</groupId>
             <artifactId>flex-converter</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>1.1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.flex.utilities.converter</groupId>
             <artifactId>flash-converter</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>1.1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.flex.utilities.converter</groupId>
             <artifactId>air-converter</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>1.1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.flex.utilities.converter</groupId>
             <artifactId>fontkit-converter</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>1.1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.flex.utilities.converter</groupId>
             <artifactId>wrapper-converter</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>1.1.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/flex-maven-tools/flex-sdk-converter/pom.xml b/flex-maven-tools/flex-sdk-converter/pom.xml
index 1aebab9..c283699 100644
--- a/flex-maven-tools/flex-sdk-converter/pom.xml
+++ b/flex-maven-tools/flex-sdk-converter/pom.xml
@@ -23,29 +23,21 @@
     <parent>
         <groupId>org.apache</groupId>
         <artifactId>apache</artifactId>
-        <version>16</version>
+        <version>21</version>
     </parent>
 
     <groupId>org.apache.flex.utilities.converter</groupId>
     <artifactId>apache-flex-sdk-converter</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Apache Flex - SDK-Converter</name>
 
     <properties>
-        <java.version>1.6</java.version>
+        <java.version>1.7</java.version>
         <mavenVersion>3.1.1</mavenVersion>
         <aetherVersion>0.9.0.M4</aetherVersion>
         <wagonVersion>2.2</wagonVersion>
-
-        <!-- URL of the ASF SonarQube server -->
-        <sonar.host.url>https://builds.apache.org/analysis</sonar.host.url>
-        <!-- Tell sonar where the coverage reports are located -->
-        <sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco-ut.exec</sonar.jacoco.reportPath>
-        <sonar.jacoco.itReportPath>${project.build.directory}/coverage-reports/jacoco-it.exec</sonar.jacoco.itReportPath>
-        <!-- Exclude all generated code -->
-        <sonar.exclusions>file:**/generated-sources/**</sonar.exclusions>
     </properties>
 
     <mailingLists>
@@ -64,7 +56,6 @@
         <connection>scm:git:https://git-wip-us.apache.org/repos/asf/flex-utilities.git</connection>
         <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/flex-utilities.git</developerConnection>
         <url>https://git-wip-us.apache.org/repos/asf/flex-utilities.git</url>
-        <tag>HEAD</tag>
     </scm>
 
     <modules>
@@ -81,174 +72,12 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.5.1</version>
                 <configuration>
                     <source>${java.version}</source>
                     <target>${java.version}</target>
                     <encoding>${project.build.sourceEncoding}</encoding>
                 </configuration>
             </plugin>
-
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.7.6.201602180812</version>
-                <executions>
-                    <!--
-                        Prepares the property pointing to the JaCoCo runtime agent which
-                        is passed as VM argument when Maven the Surefire plugin is executed.
-                    -->
-                    <execution>
-                        <id>pre-unit-test</id>
-                        <goals>
-                            <goal>prepare-agent</goal>
-                        </goals>
-                        <configuration>
-                            <!-- Sets the path to the file which contains the execution data. -->
-                            <destFile>${project.build.directory}/coverage-reports/jacoco-ut.exec</destFile>
-                            <!--
-                                Sets the name of the property containing the settings
-                                for JaCoCo runtime agent.
-                            -->
-                            <propertyName>surefireArgLine</propertyName>
-                        </configuration>
-                    </execution>
-                    <!--
-                        Ensures that the code coverage report for unit tests is created after
-                        unit tests have been run.
-                    -->
-                    <execution>
-                        <id>post-unit-test</id>
-                        <phase>test</phase>
-                        <goals>
-                            <goal>report</goal>
-                        </goals>
-                        <configuration>
-                            <!-- Sets the path to the file which contains the execution data. -->
-                            <dataFile>${project.build.directory}/coverage-reports/jacoco-ut.exec</dataFile>
-                            <!-- Sets the output directory for the code coverage report. -->
-                            <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
-                        </configuration>
-                    </execution>
-                    <!--
-                        Prepares the property pointing to the JaCoCo runtime agent which
-                        is passed as VM argument when Maven the Failsafe plugin is executed.
-                    -->
-                    <execution>
-                        <id>pre-integration-test</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>prepare-agent</goal>
-                        </goals>
-                        <configuration>
-                            <!-- Sets the path to the file which contains the execution data. -->
-                            <destFile>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile>
-                            <!--
-                                Sets the name of the property containing the settings
-                                for JaCoCo runtime agent.
-                            -->
-                            <propertyName>failsafeArgLine</propertyName>
-                        </configuration>
-                    </execution>
-                    <!--
-                        Ensures that the code coverage report for integration tests after
-                        integration tests have been run.
-                    -->
-                    <execution>
-                        <id>post-integration-test</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>report</goal>
-                        </goals>
-                        <configuration>
-                            <!-- Sets the path to the file which contains the execution data. -->
-                            <dataFile>${project.build.directory}/coverage-reports/jacoco-it.exec</dataFile>
-                            <!-- Sets the output directory for the code coverage report. -->
-                            <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <!-- Make the surefire execute all unit-tests -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.19</version>
-                <configuration>
-                    <argLine>${surefireArgLine}</argLine>
-                    <systemPropertyVariables>
-                        <buildType>Maven</buildType>
-                        <flexVersion>${flex.version}</flexVersion>
-                        <flashVersion>${flash.version}</flashVersion>
-                        <airVersion>${air.version}</airVersion>
-                        <mavenLocalRepoDir>${settings.localRepository}</mavenLocalRepoDir>
-                    </systemPropertyVariables>
-                    <!--
-                        Currently some tests need this to be disabled,
-                        but actually this is a bug. For now I'll disable
-                        them to avoid problems during the maven migration.
-                        After this is finished, we should defnitely fix
-                        the tests so assertions can be enabled.
-                    -->
-                    <enableAssertions>false</enableAssertions>
-                </configuration>
-            </plugin>
-
-            <!-- Make the failsafe execute all integration-tests -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-failsafe-plugin</artifactId>
-                <version>2.18.1</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>integration-test</goal>
-                            <goal>verify</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <argLine>${failsafeArgLine}</argLine>
-                    <systemPropertyVariables>
-                        <buildType>Maven</buildType>
-                        <flexVersion>${flex.version}</flexVersion>
-                        <flashVersion>${flash.version}</flashVersion>
-                        <airVersion>${air.version}</airVersion>
-                        <mavenLocalRepoDir>${settings.localRepository}</mavenLocalRepoDir>
-                        <FLASHPLAYER_DEBUGGER>${env.FLASHPLAYER_DEBUGGER}</FLASHPLAYER_DEBUGGER>
-                    </systemPropertyVariables>
-                </configuration>
-            </plugin>
-
-            <!-- Plugin to detect problems with JDK incompatibilities -->
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>animal-sniffer-maven-plugin</artifactId>
-                <version>1.15</version>
-                <executions>
-                    <execution>
-                        <id>check-jdk-1.6</id>
-                        <phase>test</phase>
-                        <goals>
-                            <goal>check</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <signature>
-                        <groupId>org.codehaus.mojo.signature</groupId>
-                        <artifactId>java16</artifactId>
-                        <version>1.1</version>
-                    </signature>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.sonarsource.scanner.maven</groupId>
-                <artifactId>sonar-maven-plugin</artifactId>
-                <version>3.0.2</version>
-            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/flex-maven-tools/flex-sdk-converter/retrievers/base/pom.xml b/flex-maven-tools/flex-sdk-converter/retrievers/base/pom.xml
index 53db71c..983c821 100644
--- a/flex-maven-tools/flex-sdk-converter/retrievers/base/pom.xml
+++ b/flex-maven-tools/flex-sdk-converter/retrievers/base/pom.xml
@@ -23,12 +23,10 @@
     <parent>
         <groupId>org.apache.flex.utilities.converter</groupId>
         <artifactId>retrievers</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>base-retriever</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <packaging>jar</packaging>
 
     <properties>
         <powermock.version>1.6.2</powermock.version>
@@ -39,7 +37,7 @@
         <dependency>
             <groupId>org.apache.flex.utilities.converter</groupId>
             <artifactId>api</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>1.1.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/flex-maven-tools/flex-sdk-converter/retrievers/download/pom.xml b/flex-maven-tools/flex-sdk-converter/retrievers/download/pom.xml
index bfb3cbf..f28a72d 100644
--- a/flex-maven-tools/flex-sdk-converter/retrievers/download/pom.xml
+++ b/flex-maven-tools/flex-sdk-converter/retrievers/download/pom.xml
@@ -23,18 +23,16 @@
     <parent>
         <groupId>org.apache.flex.utilities.converter</groupId>
         <artifactId>retrievers</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>download-retriever</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.flex.utilities.converter</groupId>
             <artifactId>base-retriever</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>1.1.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -60,18 +58,11 @@
             <artifactId>sevenzipjbinding-all-platforms</artifactId>
             <version>9.20-2.00beta</version>
         </dependency>
-        <!--dependency>
-            <groupId>org.catacombae</groupId>
-            <artifactId>dmgextractor</artifactId>
-            <version>0.7</version>
-            <scope>system</scope>
-            <systemPath>${basedir}/libs/dmgextractor-0_70-standalone.jar</systemPath>
-        </dependency-->
 
         <dependency>
             <groupId>org.mock-server</groupId>
             <artifactId>mockserver-netty</artifactId>
-            <version>RELEASE</version>
+            <version>5.1.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/DmgExtractor.java b/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/DmgExtractor.java
deleted file mode 100644
index 8c4b768..0000000
--- a/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/DmgExtractor.java
+++ /dev/null
@@ -1,319 +0,0 @@
-package org.apache.flex.utilities.converter.retrievers.download.utils;
-
-import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream;
-import org.apache.commons.io.input.NullInputStream;
-import org.apache.flex.utilities.converter.retrievers.download.utils.utils.*;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-
-import javax.xml.bind.DatatypeConverter;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.xpath.XPath;
-import javax.xml.xpath.XPathConstants;
-import javax.xml.xpath.XPathExpressionException;
-import javax.xml.xpath.XPathFactory;
-import java.io.*;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-/**
- * Tool to read and unpack a dmg image. Based upon the format description at:
- * http://newosxbook.com/DMG.html
- *
- * HFSleuth> fs flashplayer_20_sa_debug.dmg
- * KOLY header found at 14457517:
- *         UDIF version 4, Header Size: 512
- *         Flags:1
- *         Rsrc fork: None
- *         Data fork: from 0, spanning 14444891 bytes
- *         XML plist: from 14444891, spanning 12626 bytes (to 14457517)
- *         Segment #: 1, Count: 1
- *         Segment UUID: 8a7e1df1-6648ad9f-78cb06a4-2c5be967
- *         Running Data fork offset 0
- *         Sectors: 70816
- * Apple_HFS detected
- * Found Terminator in last block. Good
- * decompression done - Writing to /tmp/decompressed.dmg..
- * processBTree: Node kind 0, 0 records - should be kind 1, 3 records - but it isn't!
- * node is 0
- * RC was 0
- *
- * Created by christoferdutz on 24.02.16.
- */
-public class DmgExtractor {
-
-    // Hex for "koly", which are the DMG magic bytes.
-    private static final byte[] DMG_TRAILER_MAGIC_BYTES = {0x6B, 0x6F, 0x6C, 0x79};
-
-    public File extract(File inputFile) {
-        try {
-            // Try to find the DMG trailer.
-            // (A header containing the metadata, but located at the end)
-            DmgTrailer dmgTrailer = findDmgTrailer(inputFile);
-            if(dmgTrailer != null) {
-                float sizeInMegabytes = dmgTrailer.getDataForkLength() / (1024 * 1024);
-                System.out.println(" - Preparing to extract " + sizeInMegabytes + " MB");
-
-                // Read the property-list Xml document in the DMG file.
-                List<DmgPropertyListMishBlock> mishBlocks = getPropertyList(inputFile, dmgTrailer);
-
-                byte[] buffer = new byte[1024];
-                int blockCounter = 0;
-                for(DmgPropertyListMishBlock mishBlock : mishBlocks) {
-                    System.out.println("   - Processing block: " + blockCounter + " - " + mishBlock.getBlockName());
-                    int chunkCounter = 0;
-                    for(DmgBlockChunkEntry blockChunkEntry : mishBlock.getBlockChunkEntries()) {
-                        System.out.println("     - Processing chunk: " + chunkCounter + " - " + blockChunkEntry.toString());
-                        FileInputStream fis = new FileInputStream(inputFile);
-
-                        try {
-                            // Position the read head at the beginning of this entry.
-                            fis.skip(mishBlock.getDataOffset() + blockChunkEntry.getCompressedOffset());
-
-                            // Depending on the chunk entry type, process the input data.
-                            InputStream is = null;
-                            switch (blockChunkEntry.getEntryType()) {
-                                case 0x00000000:
-                                    //entryTypeName = "Zero-Fill";
-                                    is = new NullInputStream(blockChunkEntry.getCompressedLength());
-                                    break;
-                                case 0x00000001:
-                                    //entryTypeName = "UDRW/UDRO - RAW or NULL compression (uncompressed)";
-                                    is = fis;
-                                    break;
-                                case 0x00000002:
-                                    //entryTypeName = "Ignored/unknown";
-                                    // TODO: Implement
-                                    break;
-                                case 0x80000004:
-                                    //entryTypeName = "UDCO - Apple Data Compression (ADC)";
-                                    // TODO: Implement
-                                    break;
-                                case 0x80000005:
-                                    //entryTypeName = "UDZO - zLib data compression";
-                                    // TODO: Implement
-                                    break;
-                                case 0x80000006:
-                                    //entryTypeName = "UDBZ - bz2lib data compression";
-                                    is = new BZip2CompressorInputStream(fis);
-                                    break;
-                                case 0x7ffffffe:
-                                    //entryTypeName = "No blocks - Comment: +beg and +end";
-                                    // TODO: Implement
-                                default:
-                            }
-
-                            if (is != null) {
-                                // Read the data into a byte-buffer.
-                                ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                                int n;
-                                while ((n = is.read(buffer)) != -1) {
-                                    baos.write(buffer, 0, n);
-                                }
-
-                                System.out.println("        - Number of sectors: " + blockChunkEntry.getSectorCount() +
-                                        " sector size: " + (baos.size() / blockChunkEntry.getSectorCount()));
-
-                                ByteArrayInputStream bis = new ByteArrayInputStream(baos.toByteArray());
-                                DataInputStream dis = new DataInputStream(bis);
-                                // Depending on the type, process the data in the buffer.
-                                if (mishBlock.getBlockName().contains("Driver Descriptor Map")) {
-                                    DriverDescriptorMap driverDescriptorMap = new DriverDescriptorMap(dis);
-                                    System.out.println("        - " + driverDescriptorMap.toString());
-                                }
-                                if (mishBlock.getBlockName().contains("Apple_partition_map")) {
-                                    List<ApplePartitionMap> partitionMaps =
-                                            new ArrayList<ApplePartitionMap>((int) blockChunkEntry.getSectorCount());
-                                    for(int i = 0; i < blockChunkEntry.getSectorCount(); i++) {
-                                        try {
-                                            ApplePartitionMap partitionMap = new ApplePartitionMap(dis);
-                                            System.out.println("        - Partition " + i + " - " +
-                                                    partitionMap.getTypeOfPartition() + " - " +
-                                                    partitionMap.toString());
-                                            partitionMaps.add(partitionMap);
-                                        } catch(Exception e) {
-                                            break;
-                                        }
-                                    }
-                                }
-                                // See: https://en.wikipedia.org/wiki/Hierarchical_File_System
-                                else if (mishBlock.getBlockName().contains("Apple_HFS")) {
-                                    // Block 0 and 1 contain the boot blocks (each 512 bytes)
-                                    // We need to skip these.
-                                    // TODO: Eventually implement.
-                                    dis.skipBytes(1024);
-                                    System.out.println("        - Skipped boot block (0 and 1)");
-                                    // Block 2 contains the master directory block
-                                    // TODO: Actually this could also be a normal HFS volume ...
-                                    IHFSVolumeHeader iHfsVolumeHeader = HFSVolumeFactory.readHfsVolumeHeader(dis);
-                                    System.out.println("        - " + iHfsVolumeHeader.toString());
-                                    // In the old HFS format the third block contains the volume
-                                    // bitmap, in HFS+ this is located as a normal file in the volume.
-                                    if(iHfsVolumeHeader instanceof HFSVolumeHeader) {
-                                        HFSVolumeHeader hfsVolumeHeader = (HFSVolumeHeader) iHfsVolumeHeader;
-                                        // Block 3 contains the volume bitmap
-                                        // (one bit represents the usage of one block)
-                                        // https://en.wikipedia.org/wiki/Hierarchical_File_System
-                                        /*int volumeBitmapSize = hfsVolumeHeader.getTotalBlocks() / 8;
-                                        byte[] volumeBitmap = new byte[volumeBitmapSize];
-                                        dis.read(volumeBitmap);
-                                        System.out.println(volumeBitmap);*/
-                                    }
-                                    else if(iHfsVolumeHeader instanceof HFSPlusVolumeHeader) {
-                                        HFSPlusVolumeHeader hfsPlusVolumeHeader =
-                                                (HFSPlusVolumeHeader) iHfsVolumeHeader;
-                                        // https://en.wikipedia.org/wiki/HFS_Plus
-                                        // http://pages.cs.wisc.edu/~legault/miniproj-736.pdf
-                                    }
-                                }
-                                chunkCounter++;
-                            }
-                        } catch(IOException ioe) {
-                            ioe.printStackTrace();
-                        } finally {
-                            try {
-                                fis.close();
-                            } catch(IOException e) {
-                                // Ignore
-                            }
-                        }
-                    }
-                    blockCounter++;
-                }
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-        } catch (ParserConfigurationException e) {
-            e.printStackTrace();
-        } catch (SAXException e) {
-            e.printStackTrace();
-        } catch (XPathExpressionException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    private DmgTrailer findDmgTrailer(File inputFile) throws IOException {
-        long startTime = new Date().getTime();
-
-        RandomAccessFile raf = new RandomAccessFile(inputFile, "r");
-        // The size of the DMG trailer is 512 bytes. As it's located at the
-        // end of the file there is no use starting to search for it from the
-        // beginning. So we read a block that's slightly bigger than the
-        // trailer and search for the magic words in this block.
-        long curBlockStartPosition = raf.length() - 600;
-        long dmgTrailerPosition = -1;
-        do {
-            // Position the read "head".
-            raf.seek(curBlockStartPosition);
-
-            // Read a block of 600 bytes.
-            byte[] curBlock = new byte[600];
-            raf.read(curBlock);
-
-            // Scan the current block for the magic bytes.
-            int curMagicWordPosition = 0;
-            for (int curBlockPosition = 0; curBlockPosition < 600; curBlockPosition++) {
-                if (curBlock[curBlockPosition] == DMG_TRAILER_MAGIC_BYTES[curMagicWordPosition]) {
-                    curMagicWordPosition++;
-                } else {
-                    curMagicWordPosition = 0;
-                }
-                if (curMagicWordPosition == 4) {
-                    // We are just comparing the last byte of the magic word
-                    // so we only have to go back 3 bytes.
-                    dmgTrailerPosition = curBlockStartPosition + (long) curBlockPosition - 3;
-                    break;
-                }
-            }
-
-            // If we were in the first block, quit searching.
-            if(curBlockStartPosition == 0) {
-                break;
-            }
-            // We shift the search box back, but keep 4 bytes of overlap
-            // just in case the magic word was at the boundary of the block.
-            // This way we will be able to read it in the next pass.
-            curBlockStartPosition = Math.max(0, curBlockStartPosition - 596);
-        } while(dmgTrailerPosition == -1);
-        long endTime = new Date().getTime();
-        System.out.println("Found DMG trailer at position " + dmgTrailerPosition + " in " + (endTime - startTime) + "ms");
-
-        // Read and parse the trailer data.
-        if(dmgTrailerPosition != -1) {
-            raf.seek(dmgTrailerPosition);
-            byte[] dmgTrailerData = new byte[512];
-            raf.read(dmgTrailerData);
-            return new DmgTrailer(dmgTrailerData);
-        }
-
-        return null;
-    }
-
-    private List<DmgPropertyListMishBlock> getPropertyList(File inputFile, DmgTrailer dmgTrailer) throws IOException,
-            ParserConfigurationException, SAXException, XPathExpressionException {
-        // Read the block of bytes containing the property list data.
-        byte[] propertyListData = new byte[(int) dmgTrailer.getXmlLength()];
-        RandomAccessFile raf = new RandomAccessFile(inputFile, "r");
-        raf.seek(dmgTrailer.getXmlOffset());
-        raf.read(propertyListData);
-
-        // Parse the xml document data.
-        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-        factory.setNamespaceAware(true);
-        DocumentBuilder builder = factory.newDocumentBuilder();
-        Document propertyListDoc = builder.parse(new ByteArrayInputStream(propertyListData));
-
-        try {
-            TransformerFactory tf = TransformerFactory.newInstance();
-            Transformer transformer = tf.newTransformer();
-            transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "no");
-            transformer.setOutputProperty(OutputKeys.METHOD, "xml");
-            transformer.setOutputProperty(OutputKeys.INDENT, "yes");
-            transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
-            transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "4");
-
-            transformer.transform(new DOMSource(propertyListDoc),
-                    new StreamResult(new OutputStreamWriter(System.out, "UTF-8")));
-        } catch(Exception e) {
-            // Ignore ...
-        }
-
-        List<DmgPropertyListMishBlock> mishBlocks = new ArrayList<DmgPropertyListMishBlock>();
-        XPath xPath = XPathFactory.newInstance().newXPath();
-        NodeList nodes = (NodeList) xPath.evaluate("//array/dict[key='CFName']/data",
-                propertyListDoc.getDocumentElement(), XPathConstants.NODESET);
-        for (int i = 0; i < nodes.getLength(); ++i) {
-            Element dataElement = (Element) nodes.item(i);
-            Element nameElement = (Element) dataElement.getPreviousSibling().getPreviousSibling()
-                    .getPreviousSibling().getPreviousSibling();
-            byte[] dataBlock = DatatypeConverter.parseBase64Binary(dataElement.getTextContent());
-            DmgPropertyListMishBlock mishBlock = new DmgPropertyListMishBlock(nameElement.getTextContent(), dataBlock);
-            mishBlocks.add(mishBlock);
-        }
-        return mishBlocks;
-    }
-
-    public static void main(String[] args) throws Exception {
-        File input = new File("/Users/christoferdutz/Downloads/flashplayer_20_sa_debug.dmg");
-        DmgExtractor dmgExtractor = new DmgExtractor();
-        dmgExtractor.extract(input);
-    }
-
-    public static String getStringFromZeroTerminatedByteArray(byte[] data) {
-        int i;
-        for (i = 0; i < data.length && data[i] != 0; i++) { }
-        return new String(data, 0, i);
-    }
-
-}
diff --git a/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/ApplePartitionMap.java b/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/ApplePartitionMap.java
deleted file mode 100644
index c7b145d..0000000
--- a/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/ApplePartitionMap.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package org.apache.flex.utilities.converter.retrievers.download.utils.utils;
-
-import org.apache.flex.utilities.converter.retrievers.download.utils.DmgExtractor;
-
-import java.io.DataInputStream;
-import java.io.IOException;
-
-/**
- * https://en.wikipedia.org/wiki/Apple_Partition_Map
- *
- * Created by christoferdutz on 25.02.16.
- */
-public class ApplePartitionMap {
-
-    public static final int STATUS_ENTRY_IS_VALID                             = 0x00000001;
-    public static final int STATUS_ENTRY_IS_ALLOCATED                         = 0x00000002;
-    public static final int STATUS_ENTRY_IN_USE                               = 0x00000004;
-    public static final int STATUS_ENTRY_CONTAINS_BOOT_INFORMATION            = 0x00000008;
-    public static final int STATUS_PARTITION_IS_READABLE                      = 0x00000010;
-    public static final int STATUS_PARTITION_IS_WRITABLE                      = 0x00000020;
-    public static final int STATUS_BOOT_CODE_IS_POSITION_INDEPENDENT          = 0x00000040;
-    public static final int STATUS_PARTITION_CONTAINS_CHAIN_COMPATIBLE_DRIVER = 0x00000100;
-    public static final int STATUS_PARTITION_CONTAINS_A_REAL_DRIVER           = 0x00000200;
-    public static final int STATUS_PARTITION_CONTAINS_A_CHAIN_DRIVER          = 0x00000400;
-    public static final int STATUS_AUTOMATICALLY_MOUNT_AT_STARTUP             = 0x40000000;
-    public static final int STATUS_THE_STARTUP_PARTITION                      = 0x80000000;
-
-    private int numPartitions;
-    private int startingSectorOfPartition;
-    private int sizeOfPartitionInSectors;
-    private String nameOfPartition;
-    private String typeOfPartition;
-    private int startingSectorOfDataAreaInPartition;
-    private int sizeOfDataAreaInPartitionInSectors;
-    private int statusOfPartition;
-    private int startingSectorOfBootCode;
-    private int sizeOfBootCodeInSectors;
-    private int addressOfBootloaderCode;
-    private int bootCodeEntryPoint;
-    private int bootCodeChecksum;
-    private String processorType;
-
-    public ApplePartitionMap(DataInputStream dis) {
-        // Initialize the fields by parsing the input bytes.
-        try {
-            if(dis.readShort() != 0x504D) {
-                throw new IllegalArgumentException("Invalid ApplePartitionMap data. Expected magic number 0x504D");
-            }
-            dis.skipBytes(2);
-            numPartitions = dis.readInt();
-            startingSectorOfPartition = dis.readInt();
-            sizeOfPartitionInSectors = dis.readInt();
-            byte[] buffer = new byte[32];
-            int readBytes = dis.read(buffer);
-            if(readBytes != 32) {
-                throw new IllegalArgumentException(
-                        "Invalid ApplePartitionMap data. Expected to read 32 bytes for 'nameOfPartition'");
-            }
-            nameOfPartition = DmgExtractor.getStringFromZeroTerminatedByteArray(buffer);
-            buffer = new byte[32];
-            readBytes = dis.read(buffer);
-            if(readBytes != 32) {
-                throw new IllegalArgumentException(
-                        "Invalid ApplePartitionMap data. Expected to read 32 bytes for 'typeOfPartition'");
-            }
-            typeOfPartition = DmgExtractor.getStringFromZeroTerminatedByteArray(buffer);
-            startingSectorOfDataAreaInPartition = dis.readInt();
-            sizeOfDataAreaInPartitionInSectors = dis.readInt();
-            statusOfPartition = dis.readInt();
-            startingSectorOfBootCode = dis.readInt();
-            sizeOfBootCodeInSectors = dis.readInt();
-            addressOfBootloaderCode = dis.readInt();
-            dis.skipBytes(4);
-            bootCodeEntryPoint = dis.readInt();
-            dis.skipBytes(4);
-            bootCodeChecksum = dis.readInt();
-            buffer = new byte[16];
-            readBytes = dis.read(buffer);
-            if(readBytes != 16) {
-                throw new IllegalArgumentException(
-                        "Invalid ApplePartitionMap data. Expected to read 16 bytes for 'processorType'");
-            }
-            processorType = DmgExtractor.getStringFromZeroTerminatedByteArray(buffer);
-            dis.skipBytes(376);
-        } catch (IOException e) {
-            throw new IllegalArgumentException("Invalid DmgPropertyListMishBlock data.");
-        }
-    }
-
-    public int getNumPartitions() {
-        return numPartitions;
-    }
-
-    public int getStartingSectorOfPartition() {
-        return startingSectorOfPartition;
-    }
-
-    public int getSizeOfPartitionInSectors() {
-        return sizeOfPartitionInSectors;
-    }
-
-    public String getNameOfPartition() {
-        return nameOfPartition;
-    }
-
-    public String getTypeOfPartition() {
-        return typeOfPartition;
-    }
-
-    public int getStartingSectorOfDataAreaInPartition() {
-        return startingSectorOfDataAreaInPartition;
-    }
-
-    public int getSizeOfDataAreaInPartitionInSectors() {
-        return sizeOfDataAreaInPartitionInSectors;
-    }
-
-    public int getStatusOfPartition() {
-        return statusOfPartition;
-    }
-
-    public String getStatusOfPartitionName() {
-        StringBuilder sb = new StringBuilder();
-        if((statusOfPartition & STATUS_ENTRY_IS_VALID) != 0) {
-            sb.append(", Entry is valid");
-        }
-        if((statusOfPartition & STATUS_ENTRY_IS_ALLOCATED) != 0) {
-            sb.append(", Entry is allocated");
-        }
-        if((statusOfPartition & STATUS_ENTRY_IN_USE) != 0) {
-            sb.append(", Entry in use");
-        }
-        if((statusOfPartition & STATUS_ENTRY_CONTAINS_BOOT_INFORMATION) != 0) {
-            sb.append(", Entry contains boot information");
-        }
-        if((statusOfPartition & STATUS_PARTITION_IS_READABLE) != 0) {
-            sb.append(", Partition is readable");
-        }
-        if((statusOfPartition & STATUS_PARTITION_IS_WRITABLE) != 0) {
-            sb.append(", Partition is writable");
-        }
-        if((statusOfPartition & STATUS_BOOT_CODE_IS_POSITION_INDEPENDENT) != 0) {
-            sb.append(", Boot code is position independent");
-        }
-        if((statusOfPartition & STATUS_PARTITION_CONTAINS_CHAIN_COMPATIBLE_DRIVER) != 0) {
-            sb.append(", Partition contains chain-compatible driver");
-        }
-        if((statusOfPartition & STATUS_PARTITION_CONTAINS_A_REAL_DRIVER) != 0) {
-            sb.append(", Partition contains a real driver");
-        }
-        if((statusOfPartition & STATUS_PARTITION_CONTAINS_A_CHAIN_DRIVER) != 0) {
-            sb.append(", Partition contains a chain driver");
-        }
-        if((statusOfPartition & STATUS_AUTOMATICALLY_MOUNT_AT_STARTUP) != 0) {
-            sb.append(", Automatically mount at startup");
-        }
-        if((statusOfPartition & STATUS_THE_STARTUP_PARTITION) != 0) {
-            sb.append(", The startup partition");
-        }
-        if(sb.length() > 0) {
-            return sb.toString().substring(2);
-        }
-        return "- none -";
-    }
-
-    public int getStartingSectorOfBootCode() {
-        return startingSectorOfBootCode;
-    }
-
-    public int getSizeOfBootCodeInSectors() {
-        return sizeOfBootCodeInSectors;
-    }
-
-    public int getAddressOfBootloaderCode() {
-        return addressOfBootloaderCode;
-    }
-
-    public int getBootCodeEntryPoint() {
-        return bootCodeEntryPoint;
-    }
-
-    public int getBootCodeChecksum() {
-        return bootCodeChecksum;
-    }
-
-    public String getProcessorType() {
-        return processorType;
-    }
-
-    @Override
-    public String toString() {
-        return "ApplePartitionMap{" +
-                "numPartitions=" + numPartitions +
-                ", startingSectorOfPartition=" + startingSectorOfPartition +
-                ", sizeOfPartitionInSectors=" + sizeOfPartitionInSectors +
-                ", nameOfPartition='" + nameOfPartition + '\'' +
-                ", typeOfPartition='" + typeOfPartition + '\'' +
-                ", startingSectorOfDataAreaInPartition=" + startingSectorOfDataAreaInPartition +
-                ", sizeOfDataAreaInPartitionInSectors=" + sizeOfDataAreaInPartitionInSectors +
-                ", statusOfPartition=" + statusOfPartition +
-                ", startingSectorOfBootCode=" + startingSectorOfBootCode +
-                ", sizeOfBootCodeInSectors=" + sizeOfBootCodeInSectors +
-                ", addressOfBootloaderCode=" + addressOfBootloaderCode +
-                ", bootCodeEntryPoint=" + bootCodeEntryPoint +
-                ", bootCodeChecksum=" + bootCodeChecksum +
-                ", processorType='" + processorType + '\'' +
-                '}';
-    }
-}
diff --git a/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/DmgBlkxBlock.java b/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/DmgBlkxBlock.java
deleted file mode 100644
index 5bb6bdf..0000000
--- a/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/DmgBlkxBlock.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.flex.utilities.converter.retrievers.download.utils.utils;
-
-import java.io.ByteArrayInputStream;
-import java.io.DataInputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by christoferdutz on 25.02.16.
- */
-public class DmgPropertyListMishBlock {
-
-    private String blockName;
-
-    private int version;             // Current version is 1
-    private long sectorNumber;       // Starting disk sector in this blkx descriptor
-    private long sectorCount;        // Number of disk sectors in this blkx descriptor
-
-    private long dataOffset;
-    private int buffersNeeded;
-    private int blockDescriptors;    // Number of descriptors
-
-    private DmgUdifChecksum checksum;
-
-    private List<DmgBlockChunkEntry> blockChunkEntries;
-
-    public DmgPropertyListMishBlock(String blockName, byte[] data) {
-        this.blockName = blockName;
-
-        // Initialize the fields by parsing the input bytes.
-        ByteArrayInputStream bis = new ByteArrayInputStream(data);
-        DataInputStream dis = new DataInputStream(bis);
-        try {
-            dis.readInt();
-            version = dis.readInt();
-            sectorNumber = dis.readLong();
-            sectorCount = dis.readLong();
-            dataOffset = dis.readLong();
-            buffersNeeded = dis.readInt();
-            blockDescriptors = dis.readInt();
-            dis.skipBytes(24);
-            byte[] checksumData = new byte[136];
-            int bytesRead = dis.read(checksumData, 0, 136);
-            if(bytesRead != 136) {
-                throw new IllegalArgumentException(
-                        "Invalid DmgPropertyListMishBlock data. Expected to read 136 bytes for 'checksum'");
-            }
-            checksum = new DmgUdifChecksum(checksumData);
-            int numberOfBlockChunks = dis.readInt();
-
-            blockChunkEntries = new ArrayList<DmgBlockChunkEntry>();
-            byte[] blockChunkData = new byte[40];
-            for(int i = 0; i < numberOfBlockChunks; i++) {
-                bytesRead = dis.read(blockChunkData);
-                if(bytesRead != 40) {
-                    throw new IllegalArgumentException(
-                            "Invalid DmgPropertyListMishBlock data. Expected to read 40 bytes for 'dmg block chunk data'");
-                }
-                DmgBlockChunkEntry entry = new DmgBlockChunkEntry(blockChunkData);
-                // The block with the type "0xFFFFFFFF" is the end-block and contains
-                // no data we could need, so we simply end here.
-                if(entry.getEntryType() == 0xFFFFFFFF) {
-                    break;
-                }
-                blockChunkEntries.add(entry);
-            }
-        } catch (IOException e) {
-            throw new IllegalArgumentException("Invalid DmgPropertyListMishBlock data.");
-        }
-    }
-
-    public String getBlockName() {
-        return blockName;
-    }
-
-    public int getVersion() {
-        return version;
-    }
-
-    public long getSectorNumber() {
-        return sectorNumber;
-    }
-
-    public long getSectorCount() {
-        return sectorCount;
-    }
-
-    public long getDataOffset() {
-        return dataOffset;
-    }
-
-    public int getBuffersNeeded() {
-        return buffersNeeded;
-    }
-
-    public int getBlockDescriptors() {
-        return blockDescriptors;
-    }
-
-    public DmgUdifChecksum getChecksum() {
-        return checksum;
-    }
-
-    public List<DmgBlockChunkEntry> getBlockChunkEntries() {
-        return blockChunkEntries;
-    }
-
-}
diff --git a/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/DmgBlockChunkEntry.java b/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/DmgBlockChunkEntry.java
deleted file mode 100644
index 1c13823..0000000
--- a/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/DmgBlockChunkEntry.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package org.apache.flex.utilities.converter.retrievers.download.utils.utils;
-
-import java.io.ByteArrayInputStream;
-import java.io.DataInputStream;
-import java.io.IOException;
-
-/**
- * Created by christoferdutz on 25.02.16.
- */
-public class DmgBlockChunkEntry {
-
-    private int entryType;          // Compression type used or entry type (see next table)
-    private int comment;            // "+beg" or "+end", if EntryType is comment (0x7FFFFFFE). Else reserved.
-    private long sectorNumber;      // Start sector of this chunk
-    private long sectorCount;       // Number of sectors in this chunk
-    private long compressedOffset;  // Start of chunk in data fork
-    private long compressedLength;  // Count of bytes of chunk, in data fork
-
-    public DmgBlockChunkEntry(byte[] data) {
-        // Initialize the fields by parsing the input bytes.
-        ByteArrayInputStream bis = new ByteArrayInputStream(data);
-        DataInputStream dis = new DataInputStream(bis);
-        try {
-            entryType = dis.readInt();
-            comment = dis.readInt();
-            sectorNumber = dis.readLong();
-            sectorCount = dis.readLong();
-            compressedOffset = dis.readLong();
-            compressedLength = dis.readLong();
-        } catch (IOException e) {
-            throw new IllegalArgumentException("Invalid DmgBlockChunkEntry data.");
-        }
-    }
-
-    public int getEntryType() {
-        return entryType;
-    }
-
-    public int getComment() {
-        return comment;
-    }
-
-    public long getSectorNumber() {
-        return sectorNumber;
-    }
-
-    public long getSectorCount() {
-        return sectorCount;
-    }
-
-    public long getCompressedOffset() {
-        return compressedOffset;
-    }
-
-    public long getCompressedLength() {
-        return compressedLength;
-    }
-
-    @Override
-    public String toString() {
-        String entryTypeName;
-        switch(entryType) {
-            case 0x00000000:
-                entryTypeName = "Zero-Fill";
-                break;
-            case 0x00000001:
-                entryTypeName = "UDRW/UDRO - RAW or NULL compression (uncompressed)";
-                break;
-            case 0x00000002:
-                entryTypeName = "Ignored/unknown";
-                break;
-            case 0x80000004:
-                entryTypeName = "UDCO - Apple Data Compression (ADC)";
-                break;
-            case 0x80000005:
-                entryTypeName = "UDZO - zLib data compression";
-                break;
-            case 0x80000006:
-                entryTypeName = "UDBZ - bz2lib data compression";
-                break;
-            case 0x7ffffffe:
-                entryTypeName = "No blocks - Comment: +beg and +end";
-            default:
-                entryTypeName = "Unknown entry type " + entryType;
-        }
-        return "DmgBlockChunkEntry{" +
-                "entryType=" + entryTypeName +
-                ", comment=" + comment +
-                ", sectorNumber=" + sectorNumber +
-                ", sectorCount=" + sectorCount +
-                ", compressedOffset=" + compressedOffset +
-                ", compressedLength=" + compressedLength +
-                '}';
-    }
-}
diff --git a/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/DmgTrailer.java b/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/DmgTrailer.java
deleted file mode 100644
index 9ea996a..0000000
--- a/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/DmgTrailer.java
+++ /dev/null
@@ -1,174 +0,0 @@
-package org.apache.flex.utilities.converter.retrievers.download.utils.utils;
-
-import java.io.ByteArrayInputStream;
-import java.io.DataInputStream;
-import java.io.IOException;
-
-/**
- * Created by christoferdutz on 24.02.16.
- */
-public class DmgTrailer {
-
-    private int version;                // Current version is 4
-    private int headerSize;             // sizeof(this), always 512
-    private int flags;                  // Flags
-    private long runningDataForkOffset; //
-    private long dataForkOffset;        // Data fork offset (usually 0, beginning of file)
-    private long dataForkLength;        // Size of data fork (usually up to the XMLOffset, below)
-    private long rsrcForkOffset;        // Resource fork offset, if any
-    private long rsrcForkLength;        // Resource fork length, if any
-    private int segmentNumber;          // Usually 1, may be 0
-    private int segmentCount;           // Usually 1, may be 0
-    private byte[] segmentID;           // 128-bit (16 byte) GUID identifier of segment (if SegmentNumber !=0)
-
-    private int dataChecksumType;       // Data fork
-    private int dataChecksumSize;       //  Checksum Information
-    private byte[] dataChecksum;        // Up to 128-bytes (32 x 4) of checksum
-
-    private long xmlOffset;             // Offset of property list in DMG, from beginning
-    private long xmlLength;             // Length of property list
-
-    private int checksumType;           // Master
-    private int checksumSize;           // Checksum information
-    private byte[] checksum;            // Up to 128-bytes (32 x 4) of checksum
-
-    private int imageVariant;           // Commonly 1
-    private long sectorCount;           // Size of DMG when expanded, in sectors
-
-    public DmgTrailer(byte[] data) {
-        // Initialize the fields by parsing the input bytes.
-        ByteArrayInputStream bis = new ByteArrayInputStream(data);
-        DataInputStream dis = new DataInputStream(bis);
-        try {
-            dis.readInt();
-            version = dis.readInt();
-            headerSize = dis.readInt();
-            flags = dis.readInt();
-            runningDataForkOffset = dis.readLong();
-            dataForkOffset = dis.readLong();
-            dataForkLength = dis.readLong();
-            rsrcForkOffset = dis.readLong();
-            rsrcForkLength = dis.readLong();
-            segmentNumber = dis.readInt();
-            segmentCount = dis.readInt();
-            segmentID = new byte[16];
-            int bytesRead = dis.read(segmentID, 0, 16);
-            if(bytesRead != 16) {
-                throw new IllegalArgumentException(
-                        "Invalid DmgTrailer data. Expected to read 16 bytes for 'segmentID'");
-            }
-            dataChecksumType = dis.readInt();
-            dataChecksumSize = dis.readInt();
-            dataChecksum = new byte[128];
-            bytesRead = dis.read(dataChecksum, 0, 128);
-            if(bytesRead != 128) {
-                throw new IllegalArgumentException(
-                        "Invalid DmgTrailer data. Expected to read 128 bytes for 'dataChecksum'");
-            }
-            xmlOffset = dis.readLong();
-            xmlLength = dis.readLong();
-            byte[] reserved = new byte[120];
-            bytesRead = dis.read(reserved, 0, 120);
-            if(bytesRead != 120) {
-                throw new IllegalArgumentException(
-                        "Invalid DmgTrailer data. Expected to read 120 bytes reserved for future use");
-            }
-            checksumType = dis.readInt();
-            checksumSize = dis.readInt();
-            checksum = new byte[120];
-            bytesRead = dis.read(checksum, 0, 120);
-            if(bytesRead != 120) {
-                throw new IllegalArgumentException(
-                        "Invalid DmgTrailer data. Expected to read 120 bytes for 'checksum'");
-            }
-            imageVariant = dis.readInt();
-            sectorCount = dis.readLong();
-        } catch (IOException e) {
-            throw new IllegalArgumentException("Invalid DmgTrailer data.");
-        }
-    }
-
-    public int getVersion() {
-        return version;
-    }
-
-    public int getHeaderSize() {
-        return headerSize;
-    }
-
-    public int getFlags() {
-        return flags;
-    }
-
-    public long getRunningDataForkOffset() {
-        return runningDataForkOffset;
-    }
-
-    public long getDataForkOffset() {
-        return dataForkOffset;
-    }
-
-    public long getDataForkLength() {
-        return dataForkLength;
-    }
-
-    public long getRsrcForkOffset() {
-        return rsrcForkOffset;
-    }
-
-    public long getRsrcForkLength() {
-        return rsrcForkLength;
-    }
-
-    public int getSegmentNumber() {
-        return segmentNumber;
-    }
-
-    public int getSegmentCount() {
-        return segmentCount;
-    }
-
-    public byte[] getSegmentID() {
-        return segmentID;
-    }
-
-    public int getDataChecksumType() {
-        return dataChecksumType;
-    }
-
-    public int getDataChecksumSize() {
-        return dataChecksumSize;
-    }
-
-    public byte[] getDataChecksum() {
-        return dataChecksum;
-    }
-
-    public long getXmlOffset() {
-        return xmlOffset;
-    }
-
-    public long getXmlLength() {
-        return xmlLength;
-    }
-
-    public int getChecksumType() {
-        return checksumType;
-    }
-
-    public int getChecksumSize() {
-        return checksumSize;
-    }
-
-    public byte[] getChecksum() {
-        return checksum;
-    }
-
-    public int getImageVariant() {
-        return imageVariant;
-    }
-
-    public long getSectorCount() {
-        return sectorCount;
-    }
-}
diff --git a/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/DmgUdifChecksum.java b/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/DmgUdifChecksum.java
deleted file mode 100644
index 52ec113..0000000
--- a/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/DmgUdifChecksum.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.apache.flex.utilities.converter.retrievers.download.utils.utils;
-
-import java.io.ByteArrayInputStream;
-import java.io.DataInputStream;
-import java.io.IOException;
-
-/**
- * Created by christoferdutz on 25.02.16.
- */
-public class DmgUdifChecksum {
-
-    private int type;
-    private int size;
-    private byte[] data;
-
-    public DmgUdifChecksum(byte[] data) {
-        // Initialize the fields by parsing the input bytes.
-        ByteArrayInputStream bis = new ByteArrayInputStream(data);
-        DataInputStream dis = new DataInputStream(bis);
-        try {
-            type = dis.readInt();
-            size = dis.readInt();
-            this.data = new byte[128];
-            dis.read(this.data, 0, 128);
-        } catch (IOException e) {
-            throw new IllegalArgumentException("Invalid DmgUdifChecksum data.");
-        }
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public int getSize() {
-        return size;
-    }
-
-    public byte[] getData() {
-        return data;
-    }
-
-}
diff --git a/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/DriverDescriptor.java b/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/DriverDescriptor.java
deleted file mode 100644
index 61beb26..0000000
--- a/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/DriverDescriptor.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.apache.flex.utilities.converter.retrievers.download.utils.utils;
-
-import java.io.DataInputStream;
-import java.io.IOException;
-
-/**
- * Created by christoferdutz on 26.02.16.
- */
-public class DriverDescriptor {
-
-    private int driverBlockStart;
-    private short driverBlockCount;
-    private short driverSystemType;
-
-    public DriverDescriptor(DataInputStream dis) {
-        // Initialize the fields by parsing the input bytes.
-        try {
-            driverBlockStart = dis.readInt();
-            driverBlockCount = dis.readShort();
-            driverSystemType = dis.readShort();
-        } catch (IOException e) {
-            throw new IllegalArgumentException("Invalid DriverDescriptor data.");
-        }
-    }
-
-    public int getDriverBlockStart() {
-        return driverBlockStart;
-    }
-
-    public short getDriverBlockCount() {
-        return driverBlockCount;
-    }
-
-    public short getDriverSystemType() {
-        return driverSystemType;
-    }
-
-}
diff --git a/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/DriverDescriptorMap.java b/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/DriverDescriptorMap.java
deleted file mode 100644
index da9117a..0000000
--- a/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/DriverDescriptorMap.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package org.apache.flex.utilities.converter.retrievers.download.utils.utils;
-
-import java.io.DataInputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by christoferdutz on 26.02.16.
- */
-public class DriverDescriptorMap {
-
-    private short blockSize;
-    private int blockCount;
-    private short deviceType;
-    private short deviceId;
-    private int driverData;
-    private short driverDescriptorCount;
-    private List<DriverDescriptor> driverDescroiptors;
-
-    public DriverDescriptorMap(DataInputStream dis) {
-        // Initialize the fields by parsing the input bytes.
-        try {
-            if (dis.readShort() != 0x4552) {
-                throw new IllegalArgumentException("Invalid DriverDescriptorMap data. Expected magic number 0x4552");
-            }
-            blockSize = dis.readShort();
-            blockCount = dis.readInt();
-            deviceType = dis.readShort();
-            deviceId = dis.readShort();
-            driverData = dis.readInt();
-            driverDescriptorCount = dis.readShort();
-            driverDescroiptors = new ArrayList<DriverDescriptor>();
-            for(int i = 0; i < 8; i++) {
-                DriverDescriptor dd = new DriverDescriptor(dis);
-                driverDescroiptors.add(dd);
-            }
-            dis.skipBytes(430);
-
-        } catch (IOException e) {
-            throw new IllegalArgumentException("Invalid DriverDescriptorMap data.");
-        }
-    }
-
-    public short getBlockSize() {
-        return blockSize;
-    }
-
-    public int getBlockCount() {
-        return blockCount;
-    }
-
-    public short getDeviceType() {
-        return deviceType;
-    }
-
-    public short getDeviceId() {
-        return deviceId;
-    }
-
-    public int getDriverData() {
-        return driverData;
-    }
-
-    public short getDriverDescriptorCount() {
-        return driverDescriptorCount;
-    }
-
-    public List<DriverDescriptor> getDriverDescroiptors() {
-        return driverDescroiptors;
-    }
-
-    @Override
-    public String toString() {
-        return "DriverDescriptorMap{" +
-                "blockSize=" + blockSize +
-                ", blockCount=" + blockCount +
-                ", deviceType=" + deviceType +
-                ", deviceId=" + deviceId +
-                ", driverData=" + driverData +
-                ", driverDescriptorCount=" + driverDescriptorCount +
-                ", driverDescroiptors=" + driverDescroiptors +
-                '}';
-    }
-}
diff --git a/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/HFSVolumeFactory.java b/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/HFSVolumeFactory.java
deleted file mode 100644
index 24536e3..0000000
--- a/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/HFSVolumeFactory.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.apache.flex.utilities.converter.retrievers.download.utils.utils;
-
-import java.io.DataInputStream;
-import java.io.IOException;
-
-/**
- * Created by christoferdutz on 27.02.16.
- */
-public class HFSVolumeFactory {
-
-    public static IHFSVolumeHeader readHfsVolumeHeader(DataInputStream dis) {
-        try {
-            short magicNumber = dis.readShort();
-            if(magicNumber == 0x482B) {
-                return new HFSPlusVolumeHeader(dis);
-            } else {
-                return new HFSVolumeHeader(dis);
-            }
-        } catch (IOException e) {
-            throw new IllegalArgumentException("Invalid IHFSPVolumeHeader data.");
-        }
-    }
-
-}
diff --git a/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/IHFSVolumeHeader.java b/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/IHFSVolumeHeader.java
deleted file mode 100644
index 470fad0..0000000
--- a/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/IHFSVolumeHeader.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.apache.flex.utilities.converter.retrievers.download.utils.utils;
-
-/**
- * http://www.dubeyko.com/development/FileSystems/HFSPLUS/hexdumps/hfsplus_volume_header.html
- *
- * Created by christoferdutz on 24.02.16.
- */
-public interface IHFSVolumeHeader {
-
-}
diff --git a/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/btree/BTreeDescriptor.java b/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/btree/BTreeDescriptor.java
deleted file mode 100644
index d749865..0000000
--- a/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/btree/BTreeDescriptor.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.flex.utilities.converter.retrievers.download.utils.utils.btree;
-
-import java.io.DataInputStream;
-import java.io.IOException;
-
-/**
- * Created by christoferdutz on 15.04.17.
- */
-public class HFSPlusBTreeDescriptor {
-
-    private int fLink;
-    private int bLink;
-    private BTreeNodeType kind;
-    private byte height;
-    private short numRecords;
-
-    public HFSPlusBTreeDescriptor(DataInputStream dis) {
-        try {
-            fLink = dis.readInt();
-            bLink = dis.readInt();
-            switch(dis.readByte()) {
-                case -1:
-                    kind = BTreeNodeType.LEAF_NODE;
-                    break;
-                case 0:
-                    kind = BTreeNodeType.INDEX_NODE;
-                    break;
-                case 1:
-                    kind = BTreeNodeType.HEADER_NODE;
-                    break;
-                case 2:
-                    kind = BTreeNodeType.MAP_NODE;
-                    break;
-                default:
-                    throw new IllegalArgumentException("Invalid HFSPlusBTreeDescriptor data. Unknown node type.");
-            }
-            height = dis.readByte();
-            numRecords = dis.readShort();
-            dis.readShort();
-        } catch (IOException e) {
-            throw new IllegalArgumentException("Invalid HFSPlusBTreeDescriptor data.");
-        }
-    }
-
-    public int getfLink() {
-        return fLink;
-    }
-
-    public int getbLink() {
-        return bLink;
-    }
-
-    public BTreeNodeType getKind() {
-        return kind;
-    }
-
-    public byte getHeight() {
-        return height;
-    }
-
-    public short getNumRecords() {
-        return numRecords;
-    }
-
-    @Override
-    public String toString() {
-        return "HFSPlusBTreeDescriptor{" +
-                "fLink=" + fLink +
-                ", bLink=" + bLink +
-                ", kind=" + kind +
-                ", height=" + height +
-                ", numRecords=" + numRecords +
-                '}';
-    }
-
-    public enum BTreeNodeType {
-        LEAF_NODE,
-        INDEX_NODE,
-        HEADER_NODE,
-        MAP_NODE
-    }
-
-}
diff --git a/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/btree/BTreeHeaderNode.java b/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/btree/BTreeHeaderNode.java
deleted file mode 100644
index 002a03b..0000000
--- a/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/btree/BTreeHeaderNode.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.flex.utilities.converter.retrievers.download.utils.utils.btree;
-
-import java.io.DataInputStream;
-
-/**
- * Created by christoferdutz on 15.04.17.
- */
-public class HFSPlusBTreeHeaderNode extends HFSPlusBTreeNode {
-
-    private HFSPlusBTreeHeaderRecord headerRecord;
-    private HFSPlusBTreeUserDataRecord userDataRecord;
-    private HFSPlusBTreeMapRecord mapRecord;
-
-    public HFSPlusBTreeHeaderNode(DataInputStream dis) {
-        super(dis);
-    }
-
-    public HFSPlusBTreeHeaderRecord getHeaderRecord() {
-        return headerRecord;
-    }
-
-    public HFSPlusBTreeUserDataRecord getUserDataRecord() {
-        return userDataRecord;
-    }
-
-    public HFSPlusBTreeMapRecord getMapRecord() {
-        return mapRecord;
-    }
-
-    @Override
-    public String toString() {
-        return "HFSPlusBTreeHeaderNode{" +
-                super.toString() +
-                "headerRecord=" + headerRecord +
-                ", userDataRecord=" + userDataRecord +
-                ", mapRecord=" + mapRecord +
-                '}';
-    }
-}
diff --git a/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/btree/BTreeHeaderRecord.java b/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/btree/BTreeHeaderRecord.java
deleted file mode 100644
index ca1b234..0000000
--- a/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/btree/BTreeHeaderRecord.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.flex.utilities.converter.retrievers.download.utils.utils.btree;
-
-import java.io.DataInputStream;
-import java.io.IOException;
-
-/**
- * Created by christoferdutz on 15.04.17.
- */
-public class HFSPlusBTreeHeaderRecord {
-
-    private short treeDepth;
-    private int rootNode;
-    private int leafRecords;
-    private int firstLeafNode;
-    private int lastLeafNode;
-    private short nodeSize;
-    private short maxKeyLength;
-    private int totalNodes;
-    private int freeNodes;
-    //private short reserved1;
-    private int clumpSize;
-    private byte btreeType;
-    private byte keyCompareType;
-    private int attributes;
-    //private int reserved3[16];
-
-    public HFSPlusBTreeHeaderRecord(DataInputStream dis) {
-        try {
-            treeDepth = dis.readShort();
-            rootNode = dis.readInt();
-            leafRecords = dis.readInt();
-            firstLeafNode = dis.readInt();
-            lastLeafNode = dis.readInt();
-            nodeSize = dis.readShort();
-            maxKeyLength = dis.readShort();
-            totalNodes = dis.readInt();
-            freeNodes = dis.readInt();
-            dis.readShort();
-            clumpSize = dis.readInt();
-            btreeType = dis.readByte();
-            keyCompareType = dis.readByte();
-            attributes = dis.readInt();
-            // read 16 bytes ...
-            if(dis.read(new byte[16]) != 16) {
-                throw new IllegalArgumentException("Invalid HFSPlusBTreeHeaderRecord data.");
-            }
-        } catch (IOException e) {
-            throw new IllegalArgumentException("Invalid HFSPlusBTreeHeaderRecord data.");
-        }
-    }
-
-    /**
-     * @return The current depth of the B-tree. Always equal to the height field of the root node.
-     */
-    public short getTreeDepth() {
-        return treeDepth;
-    }
-
-    /**
-     * @return The node number of the root node, the index node that acts as the root of the B-tree.
-     */
-    public int getRootNode() {
-        return rootNode;
-    }
-
-    /**
-     * @return The total number of records contained in all of the leaf nodes.
-     */
-    public int getLeafRecords() {
-        return leafRecords;
-    }
-
-    /**
-     * @return The node number of the first leaf node. This may be zero if there are no leaf nodes.
-     */
-    public int getFirstLeafNode() {
-        return firstLeafNode;
-    }
-
-    /**
-     * @return The node number of the last leaf node. This may be zero if there are no leaf nodes.
-     */
-    public int getLastLeafNode() {
-        return lastLeafNode;
-    }
-
-    /**
-     * @return The size, in bytes, of a node. This is a power of two, from 512 through 32,768, inclusive.
-     */
-    public short getNodeSize() {
-        return nodeSize;
-    }
-
-    /**
-     * @return The maximum length of a key in an index or leaf node.
-     */
-    public short getMaxKeyLength() {
-        return maxKeyLength;
-    }
-
-    /**
-     * @return The total number of nodes (be they free or used) in the B-tree.
-     */
-    public int getTotalNodes() {
-        return totalNodes;
-    }
-
-    /**
-     * @return The number of unused nodes in the B-tree.
-     */
-    public int getFreeNodes() {
-        return freeNodes;
-    }
-
-    /**
-     * @return clumpSize
-     */
-    public int getClumpSize() {
-        return clumpSize;
-    }
-
-    public byte getBtreeType() {
-        return btreeType;
-    }
-
-    public byte getKeyCompareType() {
-        return keyCompareType;
-    }
-
-    public int getAttributes() {
-        return attributes;
-    }
-
-    @Override
-    public String toString() {
-        return "HFSPlusBTreeHeaderRecord{" +
-                "treeDepth=" + treeDepth +
-                ", rootNode=" + rootNode +
-                ", leafRecords=" + leafRecords +
-                ", firstLeafNode=" + firstLeafNode +
-                ", lastLeafNode=" + lastLeafNode +
-                ", nodeSize=" + nodeSize +
-                ", maxKeyLength=" + maxKeyLength +
-                ", totalNodes=" + totalNodes +
-                ", freeNodes=" + freeNodes +
-                ", clumpSize=" + clumpSize +
-                ", btreeType=" + btreeType +
-                ", keyCompareType=" + keyCompareType +
-                ", attributes=" + attributes +
-                '}';
-    }
-}
diff --git a/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/btree/BTreeIndexNode.java b/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/btree/BTreeIndexNode.java
deleted file mode 100644
index ca25cc2..0000000
--- a/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/btree/BTreeIndexNode.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.flex.utilities.converter.retrievers.download.utils.utils.btree;
-
-import java.io.DataInputStream;
-
-/**
- * Created by christoferdutz on 15.04.17.
- */
-public class HFSPlusBTreeIndexNode extends HFSPlusBTreeNode {
-
-    public HFSPlusBTreeIndexNode(DataInputStream dis) {
-        super(dis);
-    }
-
-    @Override
-    public String toString() {
-        return "HFSPlusBTreeIndexNode{" +
-                super.toString() +
-                "}";
-    }
-}
diff --git a/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/btree/BTreeLeafNode.java b/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/btree/BTreeLeafNode.java
deleted file mode 100644
index b413ab4..0000000
--- a/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/btree/BTreeLeafNode.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.flex.utilities.converter.retrievers.download.utils.utils.btree;
-
-import java.io.DataInputStream;
-
-/**
- * Created by christoferdutz on 15.04.17.
- */
-public class HFSPlusBTreeLeafNode extends HFSPlusBTreeNode {
-
-    public HFSPlusBTreeLeafNode(DataInputStream dis) {
-        super(dis);
-    }
-
-    @Override
-    public String toString() {
-        return "HFSPlusBTreeLeafNode{" +
-                super.toString() +
-                "}";
-    }
-}
diff --git a/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/btree/BTreeMapNode.java b/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/btree/BTreeMapNode.java
deleted file mode 100644
index 55dad9d..0000000
--- a/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/btree/BTreeMapNode.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.flex.utilities.converter.retrievers.download.utils.utils.btree;
-
-import java.io.DataInputStream;
-
-/**
- * Created by christoferdutz on 15.04.17.
- */
-public class HFSPlusBTreeMapNode extends HFSPlusBTreeNode {
-
-    public HFSPlusBTreeMapNode(DataInputStream dis) {
-        super(dis);
-    }
-
-    @Override
-    public String toString() {
-        return "HFSPlusBTreeMapNode{" +
-                super.toString() +
-                "}";
-    }
-}
diff --git a/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/btree/BTreeMapRecord.java b/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/btree/BTreeMapRecord.java
deleted file mode 100644
index 8d6c90e..0000000
--- a/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/btree/BTreeMapRecord.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.flex.utilities.converter.retrievers.download.utils.utils.btree;
-
-/**
- * Created by christoferdutz on 15.04.17.
- */
-public class HFSPlusBTreeMapRecord {
-
-    @Override
-    public String toString() {
-        return "HFSPlusBTreeMapRecord{}";
-    }
-
-}
diff --git a/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/btree/BTreeNode.java b/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/btree/BTreeNode.java
deleted file mode 100644
index 4a0e52a..0000000
--- a/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/btree/BTreeNode.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.flex.utilities.converter.retrievers.download.utils.utils.btree;
-
-import java.io.DataInputStream;
-
-/**
- * Created by christoferdutz on 15.04.17.
- */
-public abstract class HFSPlusBTreeNode {
-
-    private HFSPlusBTreeDescriptor nodeDescriptor;
-
-    public HFSPlusBTreeNode(DataInputStream dis) {
-        this.nodeDescriptor = new HFSPlusBTreeDescriptor(dis);
-    }
-
-    public HFSPlusBTreeDescriptor getNodeDescriptor() {
-        return nodeDescriptor;
-    }
-
-    @Override
-    public String toString() {
-        return "HFSPlusBTreeNode{" +
-                "nodeDescriptor=" + nodeDescriptor +
-                '}';
-    }
-}
diff --git a/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/btree/BTreeUserDataRecord.java b/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/btree/BTreeUserDataRecord.java
deleted file mode 100644
index 0b7d69f..0000000
--- a/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/btree/BTreeUserDataRecord.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.flex.utilities.converter.retrievers.download.utils.utils.btree;
-
-/**
- * Created by christoferdutz on 15.04.17.
- */
-public class HFSPlusBTreeUserDataRecord {
-
-    @Override
-    public String toString() {
-        return "HFSPlusBTreeUserDataRecord{}";
-    }
-}
diff --git a/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/hfs/HFSVolumeHeader.java b/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/hfs/HFSVolumeHeader.java
deleted file mode 100644
index 0895fcd..0000000
--- a/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/hfs/HFSVolumeHeader.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.flex.utilities.converter.retrievers.download.utils.utils;
-
-import java.io.DataInputStream;
-
-/**
- * Created by christoferdutz on 27.02.16.
- */
-public class HFSVolumeHeader implements IHFSVolumeHeader {
-
-    public HFSVolumeHeader(DataInputStream dis) {
-    }
-
-}
diff --git a/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/hfsplus/HFSPlusExtent.java b/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/hfsplus/HFSPlusExtent.java
deleted file mode 100644
index d8136e1..0000000
--- a/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/hfsplus/HFSPlusExtent.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.flex.utilities.converter.retrievers.download.utils.utils;
-
-import java.io.DataInputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-
-/**
- * Created by christoferdutz on 27.02.16.
- */
-public class HFSPlusExtent {
-
-    private int startBlock;
-    private int blockCount;
-
-    public HFSPlusExtent(DataInputStream dis) {
-        try {
-            startBlock = dis.readInt();
-            blockCount = dis.readInt();
-        } catch (IOException e) {
-            throw new IllegalArgumentException("Invalid HFSPlusVolumeHeader data.");
-        }
-    }
-
-    public int getStartBlock() {
-        return startBlock;
-    }
-
-    public int getBlockCount() {
-        return blockCount;
-    }
-
-    @Override
-    public String toString() {
-        return "HFSPlusExtent{" +
-                "startBlock=" + startBlock +
-                ", blockCount=" + blockCount +
-                '}';
-    }
-
-}
diff --git a/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/hfsplus/HFSPlusFinderInfo.java b/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/hfsplus/HFSPlusFinderInfo.java
deleted file mode 100644
index 6a0a188..0000000
--- a/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/hfsplus/HFSPlusFinderInfo.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.flex.utilities.converter.retrievers.download.utils.utils;
-
-import java.io.DataInputStream;
-import java.io.IOException;
-
-/**
- * Created by christoferdutz on 15.04.17.
- */
-public class HFSPlusFinderInfo {
-
-    private int bootableSystemDirectoryId;
-    private int startupApplicationParentDirectoryId;
-    private int onMountOpenDirectoryId;
-    private int bootableMacOs8Or9SystemDirectoryId;
-    private int bootableMacOsXSystemDirectoryId;
-    private long uniqueVolumeIdentifyer;
-
-    public HFSPlusFinderInfo(DataInputStream dis) {
-        try {
-            bootableSystemDirectoryId = dis.readInt();
-            startupApplicationParentDirectoryId = dis.readInt();
-            onMountOpenDirectoryId = dis.readInt();
-            bootableMacOs8Or9SystemDirectoryId = dis.readInt();
-            dis.readInt();
-            bootableMacOsXSystemDirectoryId = dis.readInt();
-            uniqueVolumeIdentifyer = dis.readLong();
-        } catch (IOException e) {
-            throw new IllegalArgumentException("Invalid HFSPlusVolumeHeader data.");
-        }
-    }
-
-    public int getBootableSystemDirectoryId() {
-        return bootableSystemDirectoryId;
-    }
-
-    public int getStartupApplicationParentDirectoryId() {
-        return startupApplicationParentDirectoryId;
-    }
-
-    public int getOnMountOpenDirectoryId() {
-        return onMountOpenDirectoryId;
-    }
-
-    public int getBootableMacOs8Or9SystemDirectoryId() {
-        return bootableMacOs8Or9SystemDirectoryId;
-    }
-
-    public int getBootableMacOsXSystemDirectoryId() {
-        return bootableMacOsXSystemDirectoryId;
-    }
-
-    public long getUniqueVolumeIdentifyer() {
-        return uniqueVolumeIdentifyer;
-    }
-
-}
diff --git a/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/hfsplus/HFSPlusForkData.java b/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/hfsplus/HFSPlusForkData.java
deleted file mode 100644
index ae67f34..0000000
--- a/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/hfsplus/HFSPlusForkData.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.flex.utilities.converter.retrievers.download.utils.utils;
-
-import java.io.DataInputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by christoferdutz on 26.02.16.
- */
-public class HFSPlusForkData {
-
-    private long logicalSize;
-    private int clumpSize;
-    private int totalBlocks;
-    private List<HFSPlusExtent> extents;
-
-    public HFSPlusForkData(DataInputStream dis) {
-        try {
-            logicalSize = dis.readLong();
-            clumpSize = dis.readInt();
-            totalBlocks = dis.readInt();
-            extents = new ArrayList<HFSPlusExtent>(8);
-            for(int i = 0; i < 8; i++) {
-                HFSPlusExtent extent = new HFSPlusExtent(dis);
-                extents.add(extent);
-            }
-        } catch (IOException e) {
-            throw new IllegalArgumentException("Invalid HFSPlusVolumeHeader data.");
-        }
-    }
-
-    public long getLogicalSize() {
-        return logicalSize;
-    }
-
-    public int getClumpSize() {
-        return clumpSize;
-    }
-
-    public int getTotalBlocks() {
-        return totalBlocks;
-    }
-
-    public List<HFSPlusExtent> getExtents() {
-        return extents;
-    }
-
-    @Override
-    public String toString() {
-        return "HFSPlusForkData{" +
-                "logicalSize=" + logicalSize +
-                ", clumpSize=" + clumpSize +
-                ", totalBlocks=" + totalBlocks +
-                ", extents=" + extents +
-                '}';
-    }
-}
diff --git a/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/hfsplus/HFSPlusVolumeHeader.java b/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/hfsplus/HFSPlusVolumeHeader.java
deleted file mode 100644
index 6e23de0..0000000
--- a/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/hfsplus/HFSPlusVolumeHeader.java
+++ /dev/null
@@ -1,311 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.flex.utilities.converter.retrievers.download.utils.utils;
-
-import java.io.DataInputStream;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Date;
-
-/**
- * http://www.dubeyko.com/development/FileSystems/HFSPLUS/hexdumps/hfsplus_volume_header.html
- * http://dubeiko.com/development/FileSystems/HFSPLUS/tn1150.html
- * http://dubeyko.com/development/FileSystems/HFSPLUS/tn1150.html#CatalogFile
- *
- * Created by christoferdutz on 24.02.16.
- */
-public class HFSPlusVolumeHeader implements IHFSVolumeHeader {
-
-    private static final int VOLUME_UNMOUNTED = 0x0100;
-    private static final int VOLUME_SPARED_BLOCKS = 0x0200;
-    private static final int VOLUME_NOCACHE_REQUIRED = 0x0400;
-    private static final int BOOT_VOLUME_INCONSISTENT = 0x0800;
-    private static final int CATALOG_NODE_IDS_REUSED = 0x1000;
-    private static final int VOLUME_JOURNALED = 0x2000;
-    private static final int VOLUME_SOFTWARE_LOCK= 0x8000;
-
-    private static final long UNSIGNED_INT_BITS = 0xFFFFFFFFL;
-    private static final long CONVERT_MAC_TO_JAVA_TIME = 2082880800L;
-
-    private short version;
-    private int attributes;
-    private int lastMountedVersion;
-    private int journalInfoBlock;
-
-    private Date createDate;
-    private Date modifyDate;
-    private Date backupDate;
-    private Date checkedDate;
-
-    private int fileCount;
-    private int folderCount;
-
-    private int blockSize;
-    private int totalBlocks;
-    private int freeBlocks;
-
-    private int nextAllocation;
-    private int rsrcClumpSize;
-    private int nextCatalogID;
-    private int dataClumpSize;
-
-    private int writeCount;
-    private long encodingsBitmap;
-
-    private HFSPlusFinderInfo finderInfo;
-
-    private HFSPlusForkData allocationFile;
-    private HFSPlusForkData extentsFile;
-    private HFSPlusForkData catalogFile;
-    private HFSPlusForkData attributesFile;
-    private HFSPlusForkData startupFile;
-
-    public HFSPlusVolumeHeader(DataInputStream dis) {
-        try {
-            version = dis.readShort();
-            attributes = dis.readInt();
-            lastMountedVersion = dis.readInt();
-            journalInfoBlock = dis.readInt();
-
-            createDate = readMacDate(dis);
-            modifyDate = readMacDate(dis);
-            backupDate = readMacDate(dis);
-            checkedDate = readMacDate(dis);
-
-            fileCount = dis.readInt();
-            folderCount = dis.readInt();
-
-            blockSize = dis.readInt();
-            totalBlocks = dis.readInt();
-            freeBlocks = dis.readInt();
-
-            nextAllocation = dis.readInt();
-            rsrcClumpSize = dis.readInt();
-            dataClumpSize = dis.readInt();
-            nextCatalogID = dis.readInt();
-
-            writeCount = dis.readInt();
-            encodingsBitmap = dis.readLong();
-
-            finderInfo = new HFSPlusFinderInfo(dis);
-
-            allocationFile = new HFSPlusForkData(dis);
-            extentsFile = new HFSPlusForkData(dis);
-            catalogFile = new HFSPlusForkData(dis);
-            attributesFile = new HFSPlusForkData(dis);
-            startupFile = new HFSPlusForkData(dis);
-        } catch (IOException e) {
-            throw new IllegalArgumentException("Invalid HFSPlusVolumeHeader data.");
-        }
-    }
-
-    public short getVersion() {
-        return version;
-    }
-
-    public int getAttributes() {
-        return attributes;
-    }
-
-    /**
-     * @return true if the volume was correctly flushed before being unmounted or ejected.
-     */
-    public boolean isVolumeUnmounted() {
-        return (attributes & VOLUME_UNMOUNTED) != 0;
-    }
-
-    /**
-     * @return true if there are any records in the extents overflow file for bad blocks
-     * (belonging to file ID kHFSBadBlockFileID).
-     */
-    public boolean isSparedBlocks() {
-        return (attributes & VOLUME_SPARED_BLOCKS) != 0;
-    }
-
-    /**
-     * @return true if the blocks from this volume should not be cached.
-     */
-    public boolean isNoCacheRequired() {
-        return (attributes & VOLUME_NOCACHE_REQUIRED) != 0;
-    }
-
-    /**
-     * @return true if the volume was NOT correctly flushed before being unmounted or ejected.
-     */
-    public boolean isBootVolumeInconsistent() {
-        return (attributes & BOOT_VOLUME_INCONSISTENT) != 0;
-    }
-
-    /**
-     * @return true when the nextCatalogID field overflows 32 bits, forcing smaller catalog node
-     * IDs to be reused. When this bit is set, it is common (and not an error) for catalog records
-     * to exist with IDs greater than or equal to nextCatalogID.
-     */
-    public boolean isCatalogIdsReused() {
-        return (attributes & CATALOG_NODE_IDS_REUSED) != 0;
-    }
-
-    /**
-     * @return true if the volume has a journal.*2
-     *
-     */
-    public boolean isVolumeJournaled() {
-        return (attributes & VOLUME_JOURNALED) != 0;
-    }
-
-    /**
-     * @return true if the volume is write-protected due to a software setting. Any implementations
-     * must refuse to write to a volume with this bit set.
-     */
-    public boolean isVolumeSoftwareLocked() {
-        return (attributes & VOLUME_SOFTWARE_LOCK) != 0;
-    }
-
-    public int getLastMountedVersion() {
-        return lastMountedVersion;
-    }
-
-    public int getJournalInfoBlock() {
-        return journalInfoBlock;
-    }
-
-    public Date getCreateDate() {
-        return createDate;
-    }
-
-    public Date getModifyDate() {
-        return modifyDate;
-    }
-
-    public Date getBackupDate() {
-        return backupDate;
-    }
-
-    public Date getCheckedDate() {
-        return checkedDate;
-    }
-
-    public int getFileCount() {
-        return fileCount;
-    }
-
-    public int getFolderCount() {
-        return folderCount;
-    }
-
-    public int getBlockSize() {
-        return blockSize;
-    }
-
-    public int getTotalBlocks() {
-        return totalBlocks;
-    }
-
-    public int getFreeBlocks() {
-        return freeBlocks;
-    }
-
-    public int getNextAllocation() {
-        return nextAllocation;
-    }
-
-    public int getRsrcClumpSize() {
-        return rsrcClumpSize;
-    }
-
-    public int getDataClumpSize() {
-        return dataClumpSize;
-    }
-
-    public int getWriteCount() {
-        return writeCount;
-    }
-
-    public long getEncodingsBitmap() {
-        return encodingsBitmap;
-    }
-
-    public int getNextCatalogID() {
-        return nextCatalogID;
-    }
-
-    public HFSPlusFinderInfo getFinderInfo() {
-        return finderInfo;
-    }
-
-    public HFSPlusForkData getAllocationFile() {
-        return allocationFile;
-    }
-
-    public HFSPlusForkData getExtentsFile() {
-        return extentsFile;
-    }
-
-    public HFSPlusForkData getCatalogFile() {
-        return catalogFile;
-    }
-
-    public HFSPlusForkData getAttributesFile() {
-        return attributesFile;
-    }
-
-    public HFSPlusForkData getStartupFile() {
-        return startupFile;
-    }
-
-    /**
-     * Convert the dates saved as HFS+ date (32 bit integer representing the number
-     * of seconds since 01.01.1994) to java dates.
-     * @param dis input stream to read from.
-     * @return Date in Java representation (number of milliseconds since 01.01.1970)
-     * @throws IOException something went wrong.
-     */
-    private Date readMacDate(DataInputStream dis) throws IOException {
-        return new Date(((UNSIGNED_INT_BITS & dis.readInt()) - CONVERT_MAC_TO_JAVA_TIME) * 1000);
-    }
-
-    @Override
-    public String toString() {
-        return "HFSPlusVolumeHeader{" +
-                "version=" + version +
-                ", attributes=" + attributes +
-                ", lastMountedVersion=" + lastMountedVersion +
-                ", journalInfoBlock=" + journalInfoBlock +
-                ", createDate=" + createDate +
-                ", modifyDate=" + modifyDate +
-                ", backupDate=" + backupDate +
-                ", checkedDate=" + checkedDate +
-                ", fileCount=" + fileCount +
-                ", folderCount=" + folderCount +
-                ", blockSize=" + blockSize +
-                ", totalBlocks=" + totalBlocks +
-                ", freeBlocks=" + freeBlocks +
-                ", nextAllocation=" + nextAllocation +
-                ", rsrcClumpSize=" + rsrcClumpSize +
-                ", nextCatalogID=" + nextCatalogID +
-                ", dataClumpSize=" + dataClumpSize +
-                ", writeCount=" + writeCount +
-                ", encodingsBitmap=" + encodingsBitmap +
-                ", finderInfo=" + finderInfo +
-                ", allocationFile=" + allocationFile +
-                ", extentsFile=" + extentsFile +
-                ", catalogFile=" + catalogFile +
-                ", attributesFile=" + attributesFile +
-                ", startupFile=" + startupFile +
-                '}';
-    }
-}
diff --git a/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/hfsx/HFSXVolumeHeader.java b/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/hfsx/HFSXVolumeHeader.java
deleted file mode 100644
index e395c7a..0000000
--- a/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/utils/utils/hfsx/HFSXVolumeHeader.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.flex.utilities.converter.retrievers.download.utils.utils;
-
-import java.io.DataInputStream;
-
-/**
- * Created by christoferdutz on 27.02.16.
- */
-public class HFSXVolumeHeader implements IHFSVolumeHeader {
-
-    public HFSXVolumeHeader(DataInputStream dis) {
-    }
-
-}
diff --git a/flex-maven-tools/flex-sdk-converter/retrievers/download/src/test/java/org/apache/flex/utilities/converter/retrievers/download/ProxyTest.java b/flex-maven-tools/flex-sdk-converter/retrievers/download/src/test/java/org/apache/flex/utilities/converter/retrievers/download/ProxyTest.java
index a423b66..5ca5c51 100644
--- a/flex-maven-tools/flex-sdk-converter/retrievers/download/src/test/java/org/apache/flex/utilities/converter/retrievers/download/ProxyTest.java
+++ b/flex-maven-tools/flex-sdk-converter/retrievers/download/src/test/java/org/apache/flex/utilities/converter/retrievers/download/ProxyTest.java
@@ -19,6 +19,7 @@ package org.apache.flex.utilities.converter.retrievers.download;
 import org.apache.flex.utilities.converter.api.ProxySettings;
 import org.apache.flex.utilities.converter.retrievers.types.PlatformType;
 import org.apache.flex.utilities.converter.retrievers.types.SdkType;
+import org.junit.Ignore;
 import org.mockserver.integration.ClientAndProxy;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
@@ -48,7 +49,8 @@ public class ProxyTest {
     /**
      * Does a download using the URLConnection class
      */
-    @Test
+    // TODO: Re-Include this.
+    @Test(enabled = false)
     public void simpleFastHttpNoAuthProxy() throws Exception {
         ProxySettings proxySettings = new ProxySettings("HTTP", "localhost", 3456, null, null, null);
         ProxySettings.setProxySettings(proxySettings);
diff --git a/flex-maven-tools/flex-sdk-converter/retrievers/pom.xml b/flex-maven-tools/flex-sdk-converter/retrievers/pom.xml
index a95bf41..e7f7900 100644
--- a/flex-maven-tools/flex-sdk-converter/retrievers/pom.xml
+++ b/flex-maven-tools/flex-sdk-converter/retrievers/pom.xml
@@ -23,11 +23,10 @@
     <parent>
         <groupId>org.apache.flex.utilities.converter</groupId>
         <artifactId>apache-flex-sdk-converter</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>retrievers</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <modules>


Mime
View raw message