diff --git a/common/m2/Android.bp b/common/m2/Android.bp
new file mode 100644
index 0000000..0e9ddb2
--- /dev/null
+++ b/common/m2/Android.bp
@@ -0,0 +1,23 @@
+// Copyright (C) 2018 The Android Open Source Project
+//
+// Licensed 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.
+
+java_import_host {
+    name: "metalava-tools-common-m2-deps",
+    jars: [
+        "repository/org/ow2/asm/asm/6.1.1/asm-6.1.1.jar",
+        "repository/org/ow2/asm/asm-tree/6.1.1/asm-tree-6.1.1.jar",
+        "repository/com/google/guava/guava/23.0/guava-23.0.jar",
+        "repository/org/jetbrains/trove4j/trove4j/20160824/trove4j-20160824.jar",
+    ],
+}
diff --git a/common/m2/repository/org/ow2/asm/asm-analysis/6.1.1/asm-analysis-6.1.1-sources.jar b/common/m2/repository/org/ow2/asm/asm-analysis/6.1.1/asm-analysis-6.1.1-sources.jar
new file mode 100644
index 0000000..571eb34
--- /dev/null
+++ b/common/m2/repository/org/ow2/asm/asm-analysis/6.1.1/asm-analysis-6.1.1-sources.jar
Binary files differ
diff --git a/common/m2/repository/org/ow2/asm/asm-analysis/6.1.1/asm-analysis-6.1.1-sources.jar.md5 b/common/m2/repository/org/ow2/asm/asm-analysis/6.1.1/asm-analysis-6.1.1-sources.jar.md5
new file mode 100644
index 0000000..8abeb14
--- /dev/null
+++ b/common/m2/repository/org/ow2/asm/asm-analysis/6.1.1/asm-analysis-6.1.1-sources.jar.md5
@@ -0,0 +1 @@
+08c0b13ac6f1205a8be5b1f7ca45d121
\ No newline at end of file
diff --git a/common/m2/repository/org/ow2/asm/asm-analysis/6.1.1/asm-analysis-6.1.1-sources.jar.sha1 b/common/m2/repository/org/ow2/asm/asm-analysis/6.1.1/asm-analysis-6.1.1-sources.jar.sha1
new file mode 100644
index 0000000..ef324b6
--- /dev/null
+++ b/common/m2/repository/org/ow2/asm/asm-analysis/6.1.1/asm-analysis-6.1.1-sources.jar.sha1
@@ -0,0 +1 @@
+bb3f4881f41013a0d090f5f6bf0e7ff67ed93562
\ No newline at end of file
diff --git a/common/m2/repository/org/ow2/asm/asm-analysis/6.1.1/asm-analysis-6.1.1.jar b/common/m2/repository/org/ow2/asm/asm-analysis/6.1.1/asm-analysis-6.1.1.jar
new file mode 100644
index 0000000..187774f
--- /dev/null
+++ b/common/m2/repository/org/ow2/asm/asm-analysis/6.1.1/asm-analysis-6.1.1.jar
Binary files differ
diff --git a/common/m2/repository/org/ow2/asm/asm-analysis/6.1.1/asm-analysis-6.1.1.jar.md5 b/common/m2/repository/org/ow2/asm/asm-analysis/6.1.1/asm-analysis-6.1.1.jar.md5
new file mode 100644
index 0000000..0802f94
--- /dev/null
+++ b/common/m2/repository/org/ow2/asm/asm-analysis/6.1.1/asm-analysis-6.1.1.jar.md5
@@ -0,0 +1 @@
+b58c31c1ca0496e6773cc0311f97ceda
\ No newline at end of file
diff --git a/common/m2/repository/org/ow2/asm/asm-analysis/6.1.1/asm-analysis-6.1.1.jar.sha1 b/common/m2/repository/org/ow2/asm/asm-analysis/6.1.1/asm-analysis-6.1.1.jar.sha1
new file mode 100644
index 0000000..f6bf64e
--- /dev/null
+++ b/common/m2/repository/org/ow2/asm/asm-analysis/6.1.1/asm-analysis-6.1.1.jar.sha1
@@ -0,0 +1 @@
+376d85732456ec4d2c4bc020ee152061c61f00b5
\ No newline at end of file
diff --git a/common/m2/repository/org/ow2/asm/asm-analysis/6.1.1/asm-analysis-6.1.1.pom b/common/m2/repository/org/ow2/asm/asm-analysis/6.1.1/asm-analysis-6.1.1.pom
new file mode 100644
index 0000000..6229024
--- /dev/null
+++ b/common/m2/repository/org/ow2/asm/asm-analysis/6.1.1/asm-analysis-6.1.1.pom
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.ow2</groupId>
+    <artifactId>ow2</artifactId>
+    <version>1.5</version>
+  </parent>
+  <groupId>org.ow2.asm</groupId>
+  <artifactId>asm-analysis</artifactId>
+  <version>6.1.1</version>
+  <name>asm-analysis</name>
+  <description>Static code analysis API of ASM, a very small and fast Java bytecode manipulation framework</description>
+  <url>http://asm.ow2.org/</url>
+  <inceptionYear>2000</inceptionYear>
+  <organization>
+    <name>OW2</name>
+    <url>http://www.ow2.org/</url>
+  </organization>
+  <licenses>
+    <license>
+      <name>BSD</name>
+      <url>http://asm.ow2.org/license.html</url>
+    </license>
+  </licenses>
+  <developers>
+    <developer>
+      <id>ebruneton</id>
+      <name>Eric Bruneton</name>
+      <email>ebruneton@free.fr</email>
+      <roles>
+        <role>Creator</role>
+        <role>Java Developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>eu</id>
+      <name>Eugene Kuleshov</name>
+      <email>eu@javatx.org</email>
+      <roles>
+        <role>Java Developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>forax</id>
+      <name>Remi Forax</name>
+      <email>forax@univ-mlv.fr</email>
+      <roles>
+        <role>Java Developer</role>
+      </roles>
+    </developer>
+  </developers>
+  <mailingLists>
+    <mailingList>
+      <name>ASM Users List</name>
+      <subscribe>https://mail.ow2.org/wws/subscribe/asm</subscribe>
+      <post>asm@objectweb.org</post>
+      <archive>https://mail.ow2.org/wws/arc/asm/</archive>
+    </mailingList>
+    <mailingList>
+      <name>ASM Team List</name>
+      <subscribe>https://mail.ow2.org/wws/subscribe/asm-team</subscribe>
+      <post>asm-team@objectweb.org</post>
+      <archive>https://mail.ow2.org/wws/arc/asm-team/</archive>
+    </mailingList>
+  </mailingLists>
+  <scm>
+    <connection>scm:git:https://gitlab.ow2.org/asm/asm/</connection>
+    <developerConnection>scm:git:https://gitlab.ow2.org/asm/asm/</developerConnection>
+    <url>https://gitlab.ow2.org/asm/asm/</url>
+  </scm>
+  <issueManagement>
+    <url>https://gitlab.ow2.org/asm/asm/issues</url>
+  </issueManagement>
+  <dependencies>
+    <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm-tree</artifactId>
+      <version>6.1.1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm-test</artifactId>
+      <version>6.1.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <version>5.1.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-params</artifactId>
+      <version>5.1.0</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/common/m2/repository/org/ow2/asm/asm-analysis/6.1.1/asm-analysis-6.1.1.pom.md5 b/common/m2/repository/org/ow2/asm/asm-analysis/6.1.1/asm-analysis-6.1.1.pom.md5
new file mode 100644
index 0000000..9a414f4
--- /dev/null
+++ b/common/m2/repository/org/ow2/asm/asm-analysis/6.1.1/asm-analysis-6.1.1.pom.md5
@@ -0,0 +1 @@
+76a08d067ade47426529d756a8b92cfd
\ No newline at end of file
diff --git a/common/m2/repository/org/ow2/asm/asm-analysis/6.1.1/asm-analysis-6.1.1.pom.sha1 b/common/m2/repository/org/ow2/asm/asm-analysis/6.1.1/asm-analysis-6.1.1.pom.sha1
new file mode 100644
index 0000000..b9b1d3a
--- /dev/null
+++ b/common/m2/repository/org/ow2/asm/asm-analysis/6.1.1/asm-analysis-6.1.1.pom.sha1
@@ -0,0 +1 @@
+159599bd76996a44306ad121de5ef12a83c1cdc9
\ No newline at end of file
diff --git a/common/m2/repository/org/ow2/asm/asm-analysis/maven-metadata.xml b/common/m2/repository/org/ow2/asm/asm-analysis/maven-metadata.xml
new file mode 100644
index 0000000..4282c3d
--- /dev/null
+++ b/common/m2/repository/org/ow2/asm/asm-analysis/maven-metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>org.ow2.asm</groupId>
+  <artifactId>asm-analysis</artifactId>
+  <versioning>
+    <release>6.1.1</release>
+    <versions>
+      <version>6.1.1</version>
+    </versions>
+    <lastUpdated>20180502210540</lastUpdated>
+  </versioning>
+</metadata>
diff --git a/common/m2/repository/org/ow2/asm/asm-commons/6.1.1/asm-commons-6.1.1-sources.jar b/common/m2/repository/org/ow2/asm/asm-commons/6.1.1/asm-commons-6.1.1-sources.jar
new file mode 100644
index 0000000..2829e0a
--- /dev/null
+++ b/common/m2/repository/org/ow2/asm/asm-commons/6.1.1/asm-commons-6.1.1-sources.jar
Binary files differ
diff --git a/common/m2/repository/org/ow2/asm/asm-commons/6.1.1/asm-commons-6.1.1-sources.jar.md5 b/common/m2/repository/org/ow2/asm/asm-commons/6.1.1/asm-commons-6.1.1-sources.jar.md5
new file mode 100644
index 0000000..f37ca53
--- /dev/null
+++ b/common/m2/repository/org/ow2/asm/asm-commons/6.1.1/asm-commons-6.1.1-sources.jar.md5
@@ -0,0 +1 @@
+0c4e915a15abe3ab49eb382b1d736061
\ No newline at end of file
diff --git a/common/m2/repository/org/ow2/asm/asm-commons/6.1.1/asm-commons-6.1.1-sources.jar.sha1 b/common/m2/repository/org/ow2/asm/asm-commons/6.1.1/asm-commons-6.1.1-sources.jar.sha1
new file mode 100644
index 0000000..701ee26
--- /dev/null
+++ b/common/m2/repository/org/ow2/asm/asm-commons/6.1.1/asm-commons-6.1.1-sources.jar.sha1
@@ -0,0 +1 @@
+dfd6d0b2b43e0c6fdb9714645d57f09c53e081ee
\ No newline at end of file
diff --git a/common/m2/repository/org/ow2/asm/asm-commons/6.1.1/asm-commons-6.1.1.jar b/common/m2/repository/org/ow2/asm/asm-commons/6.1.1/asm-commons-6.1.1.jar
new file mode 100644
index 0000000..0cd2d69
--- /dev/null
+++ b/common/m2/repository/org/ow2/asm/asm-commons/6.1.1/asm-commons-6.1.1.jar
Binary files differ
diff --git a/common/m2/repository/org/ow2/asm/asm-commons/6.1.1/asm-commons-6.1.1.jar.md5 b/common/m2/repository/org/ow2/asm/asm-commons/6.1.1/asm-commons-6.1.1.jar.md5
new file mode 100644
index 0000000..fec034c
--- /dev/null
+++ b/common/m2/repository/org/ow2/asm/asm-commons/6.1.1/asm-commons-6.1.1.jar.md5
@@ -0,0 +1 @@
+ca6299118bc7b85201671502526bd68b
\ No newline at end of file
diff --git a/common/m2/repository/org/ow2/asm/asm-commons/6.1.1/asm-commons-6.1.1.jar.sha1 b/common/m2/repository/org/ow2/asm/asm-commons/6.1.1/asm-commons-6.1.1.jar.sha1
new file mode 100644
index 0000000..db79e6a
--- /dev/null
+++ b/common/m2/repository/org/ow2/asm/asm-commons/6.1.1/asm-commons-6.1.1.jar.sha1
@@ -0,0 +1 @@
+70a7deee986e66c015cea1c9978f9654cc667020
\ No newline at end of file
diff --git a/common/m2/repository/org/ow2/asm/asm-commons/6.1.1/asm-commons-6.1.1.pom b/common/m2/repository/org/ow2/asm/asm-commons/6.1.1/asm-commons-6.1.1.pom
new file mode 100644
index 0000000..c88a6f2
--- /dev/null
+++ b/common/m2/repository/org/ow2/asm/asm-commons/6.1.1/asm-commons-6.1.1.pom
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.ow2</groupId>
+    <artifactId>ow2</artifactId>
+    <version>1.5</version>
+  </parent>
+  <groupId>org.ow2.asm</groupId>
+  <artifactId>asm-commons</artifactId>
+  <version>6.1.1</version>
+  <name>asm-commons</name>
+  <description>Usefull class adapters based on ASM, a very small and fast Java bytecode manipulation framework</description>
+  <url>http://asm.ow2.org/</url>
+  <inceptionYear>2000</inceptionYear>
+  <organization>
+    <name>OW2</name>
+    <url>http://www.ow2.org/</url>
+  </organization>
+  <licenses>
+    <license>
+      <name>BSD</name>
+      <url>http://asm.ow2.org/license.html</url>
+    </license>
+  </licenses>
+  <developers>
+    <developer>
+      <id>ebruneton</id>
+      <name>Eric Bruneton</name>
+      <email>ebruneton@free.fr</email>
+      <roles>
+        <role>Creator</role>
+        <role>Java Developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>eu</id>
+      <name>Eugene Kuleshov</name>
+      <email>eu@javatx.org</email>
+      <roles>
+        <role>Java Developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>forax</id>
+      <name>Remi Forax</name>
+      <email>forax@univ-mlv.fr</email>
+      <roles>
+        <role>Java Developer</role>
+      </roles>
+    </developer>
+  </developers>
+  <mailingLists>
+    <mailingList>
+      <name>ASM Users List</name>
+      <subscribe>https://mail.ow2.org/wws/subscribe/asm</subscribe>
+      <post>asm@objectweb.org</post>
+      <archive>https://mail.ow2.org/wws/arc/asm/</archive>
+    </mailingList>
+    <mailingList>
+      <name>ASM Team List</name>
+      <subscribe>https://mail.ow2.org/wws/subscribe/asm-team</subscribe>
+      <post>asm-team@objectweb.org</post>
+      <archive>https://mail.ow2.org/wws/arc/asm-team/</archive>
+    </mailingList>
+  </mailingLists>
+  <scm>
+    <connection>scm:git:https://gitlab.ow2.org/asm/asm/</connection>
+    <developerConnection>scm:git:https://gitlab.ow2.org/asm/asm/</developerConnection>
+    <url>https://gitlab.ow2.org/asm/asm/</url>
+  </scm>
+  <issueManagement>
+    <url>https://gitlab.ow2.org/asm/asm/issues</url>
+  </issueManagement>
+  <dependencies>
+    <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm</artifactId>
+      <version>6.1.1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm-tree</artifactId>
+      <version>6.1.1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm-analysis</artifactId>
+      <version>6.1.1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm-util</artifactId>
+      <version>6.1.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm-test</artifactId>
+      <version>6.1.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <version>5.1.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-params</artifactId>
+      <version>5.1.0</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/common/m2/repository/org/ow2/asm/asm-commons/6.1.1/asm-commons-6.1.1.pom.md5 b/common/m2/repository/org/ow2/asm/asm-commons/6.1.1/asm-commons-6.1.1.pom.md5
new file mode 100644
index 0000000..a0caef0
--- /dev/null
+++ b/common/m2/repository/org/ow2/asm/asm-commons/6.1.1/asm-commons-6.1.1.pom.md5
@@ -0,0 +1 @@
+53e7211d7be0c9c44430211485bac7bb
\ No newline at end of file
diff --git a/common/m2/repository/org/ow2/asm/asm-commons/6.1.1/asm-commons-6.1.1.pom.sha1 b/common/m2/repository/org/ow2/asm/asm-commons/6.1.1/asm-commons-6.1.1.pom.sha1
new file mode 100644
index 0000000..327e270
--- /dev/null
+++ b/common/m2/repository/org/ow2/asm/asm-commons/6.1.1/asm-commons-6.1.1.pom.sha1
@@ -0,0 +1 @@
+2699655334274c911a9f3b04057e06926ae711a3
\ No newline at end of file
diff --git a/common/m2/repository/org/ow2/asm/asm-commons/maven-metadata.xml b/common/m2/repository/org/ow2/asm/asm-commons/maven-metadata.xml
new file mode 100644
index 0000000..a65960f
--- /dev/null
+++ b/common/m2/repository/org/ow2/asm/asm-commons/maven-metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>org.ow2.asm</groupId>
+  <artifactId>asm-commons</artifactId>
+  <versioning>
+    <release>6.1.1</release>
+    <versions>
+      <version>6.1.1</version>
+    </versions>
+    <lastUpdated>20180502210540</lastUpdated>
+  </versioning>
+</metadata>
diff --git a/common/m2/repository/org/ow2/asm/asm-tree/6.1.1/asm-tree-6.1.1-sources.jar b/common/m2/repository/org/ow2/asm/asm-tree/6.1.1/asm-tree-6.1.1-sources.jar
new file mode 100644
index 0000000..073519c
--- /dev/null
+++ b/common/m2/repository/org/ow2/asm/asm-tree/6.1.1/asm-tree-6.1.1-sources.jar
Binary files differ
diff --git a/common/m2/repository/org/ow2/asm/asm-tree/6.1.1/asm-tree-6.1.1-sources.jar.md5 b/common/m2/repository/org/ow2/asm/asm-tree/6.1.1/asm-tree-6.1.1-sources.jar.md5
new file mode 100644
index 0000000..0f94627
--- /dev/null
+++ b/common/m2/repository/org/ow2/asm/asm-tree/6.1.1/asm-tree-6.1.1-sources.jar.md5
@@ -0,0 +1 @@
+c7300d1ac9532738abf28e8f8858c774
\ No newline at end of file
diff --git a/common/m2/repository/org/ow2/asm/asm-tree/6.1.1/asm-tree-6.1.1-sources.jar.sha1 b/common/m2/repository/org/ow2/asm/asm-tree/6.1.1/asm-tree-6.1.1-sources.jar.sha1
new file mode 100644
index 0000000..9058384
--- /dev/null
+++ b/common/m2/repository/org/ow2/asm/asm-tree/6.1.1/asm-tree-6.1.1-sources.jar.sha1
@@ -0,0 +1 @@
+f858620f9f3ce6fcc1e75b90f900a9aa25942a3e
\ No newline at end of file
diff --git a/common/m2/repository/org/ow2/asm/asm-tree/6.1.1/asm-tree-6.1.1.jar b/common/m2/repository/org/ow2/asm/asm-tree/6.1.1/asm-tree-6.1.1.jar
new file mode 100644
index 0000000..890c14d
--- /dev/null
+++ b/common/m2/repository/org/ow2/asm/asm-tree/6.1.1/asm-tree-6.1.1.jar
Binary files differ
diff --git a/common/m2/repository/org/ow2/asm/asm-tree/6.1.1/asm-tree-6.1.1.jar.md5 b/common/m2/repository/org/ow2/asm/asm-tree/6.1.1/asm-tree-6.1.1.jar.md5
new file mode 100644
index 0000000..2526362
--- /dev/null
+++ b/common/m2/repository/org/ow2/asm/asm-tree/6.1.1/asm-tree-6.1.1.jar.md5
@@ -0,0 +1 @@
+d640f7d0efc57192870f73a87f576469
\ No newline at end of file
diff --git a/common/m2/repository/org/ow2/asm/asm-tree/6.1.1/asm-tree-6.1.1.jar.sha1 b/common/m2/repository/org/ow2/asm/asm-tree/6.1.1/asm-tree-6.1.1.jar.sha1
new file mode 100644
index 0000000..d38db9d
--- /dev/null
+++ b/common/m2/repository/org/ow2/asm/asm-tree/6.1.1/asm-tree-6.1.1.jar.sha1
@@ -0,0 +1 @@
+19fdc358e7bd3986b9867de508ce6cefa693dda6
\ No newline at end of file
diff --git a/common/m2/repository/org/ow2/asm/asm-tree/6.1.1/asm-tree-6.1.1.pom b/common/m2/repository/org/ow2/asm/asm-tree/6.1.1/asm-tree-6.1.1.pom
new file mode 100644
index 0000000..636cf92
--- /dev/null
+++ b/common/m2/repository/org/ow2/asm/asm-tree/6.1.1/asm-tree-6.1.1.pom
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.ow2</groupId>
+    <artifactId>ow2</artifactId>
+    <version>1.5</version>
+  </parent>
+  <groupId>org.ow2.asm</groupId>
+  <artifactId>asm-tree</artifactId>
+  <version>6.1.1</version>
+  <name>asm-tree</name>
+  <description>Tree API of ASM, a very small and fast Java bytecode manipulation framework</description>
+  <url>http://asm.ow2.org/</url>
+  <inceptionYear>2000</inceptionYear>
+  <organization>
+    <name>OW2</name>
+    <url>http://www.ow2.org/</url>
+  </organization>
+  <licenses>
+    <license>
+      <name>BSD</name>
+      <url>http://asm.ow2.org/license.html</url>
+    </license>
+  </licenses>
+  <developers>
+    <developer>
+      <id>ebruneton</id>
+      <name>Eric Bruneton</name>
+      <email>ebruneton@free.fr</email>
+      <roles>
+        <role>Creator</role>
+        <role>Java Developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>eu</id>
+      <name>Eugene Kuleshov</name>
+      <email>eu@javatx.org</email>
+      <roles>
+        <role>Java Developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>forax</id>
+      <name>Remi Forax</name>
+      <email>forax@univ-mlv.fr</email>
+      <roles>
+        <role>Java Developer</role>
+      </roles>
+    </developer>
+  </developers>
+  <mailingLists>
+    <mailingList>
+      <name>ASM Users List</name>
+      <subscribe>https://mail.ow2.org/wws/subscribe/asm</subscribe>
+      <post>asm@objectweb.org</post>
+      <archive>https://mail.ow2.org/wws/arc/asm/</archive>
+    </mailingList>
+    <mailingList>
+      <name>ASM Team List</name>
+      <subscribe>https://mail.ow2.org/wws/subscribe/asm-team</subscribe>
+      <post>asm-team@objectweb.org</post>
+      <archive>https://mail.ow2.org/wws/arc/asm-team/</archive>
+    </mailingList>
+  </mailingLists>
+  <scm>
+    <connection>scm:git:https://gitlab.ow2.org/asm/asm/</connection>
+    <developerConnection>scm:git:https://gitlab.ow2.org/asm/asm/</developerConnection>
+    <url>https://gitlab.ow2.org/asm/asm/</url>
+  </scm>
+  <issueManagement>
+    <url>https://gitlab.ow2.org/asm/asm/issues</url>
+  </issueManagement>
+  <dependencies>
+    <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm</artifactId>
+      <version>6.1.1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm-test</artifactId>
+      <version>6.1.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <version>5.1.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-params</artifactId>
+      <version>5.1.0</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/common/m2/repository/org/ow2/asm/asm-tree/6.1.1/asm-tree-6.1.1.pom.md5 b/common/m2/repository/org/ow2/asm/asm-tree/6.1.1/asm-tree-6.1.1.pom.md5
new file mode 100644
index 0000000..29f892c
--- /dev/null
+++ b/common/m2/repository/org/ow2/asm/asm-tree/6.1.1/asm-tree-6.1.1.pom.md5
@@ -0,0 +1 @@
+016b6e1cf0704e9929760c3830b89df1
\ No newline at end of file
diff --git a/common/m2/repository/org/ow2/asm/asm-tree/6.1.1/asm-tree-6.1.1.pom.sha1 b/common/m2/repository/org/ow2/asm/asm-tree/6.1.1/asm-tree-6.1.1.pom.sha1
new file mode 100644
index 0000000..1528131
--- /dev/null
+++ b/common/m2/repository/org/ow2/asm/asm-tree/6.1.1/asm-tree-6.1.1.pom.sha1
@@ -0,0 +1 @@
+78f25762127d2092781b9e05a58d7200850ce4c2
\ No newline at end of file
diff --git a/common/m2/repository/org/ow2/asm/asm-tree/maven-metadata.xml b/common/m2/repository/org/ow2/asm/asm-tree/maven-metadata.xml
new file mode 100644
index 0000000..ced3b11
--- /dev/null
+++ b/common/m2/repository/org/ow2/asm/asm-tree/maven-metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>org.ow2.asm</groupId>
+  <artifactId>asm-tree</artifactId>
+  <versioning>
+    <release>6.1.1</release>
+    <versions>
+      <version>6.1.1</version>
+    </versions>
+    <lastUpdated>20180502210540</lastUpdated>
+  </versioning>
+</metadata>
diff --git a/common/m2/repository/org/ow2/asm/asm/6.1.1/asm-6.1.1-sources.jar b/common/m2/repository/org/ow2/asm/asm/6.1.1/asm-6.1.1-sources.jar
new file mode 100644
index 0000000..26d3afb
--- /dev/null
+++ b/common/m2/repository/org/ow2/asm/asm/6.1.1/asm-6.1.1-sources.jar
Binary files differ
diff --git a/common/m2/repository/org/ow2/asm/asm/6.1.1/asm-6.1.1-sources.jar.md5 b/common/m2/repository/org/ow2/asm/asm/6.1.1/asm-6.1.1-sources.jar.md5
new file mode 100644
index 0000000..397a2ea
--- /dev/null
+++ b/common/m2/repository/org/ow2/asm/asm/6.1.1/asm-6.1.1-sources.jar.md5
@@ -0,0 +1 @@
+f9f19a55738c247999bcf5515503edc1
\ No newline at end of file
diff --git a/common/m2/repository/org/ow2/asm/asm/6.1.1/asm-6.1.1-sources.jar.sha1 b/common/m2/repository/org/ow2/asm/asm/6.1.1/asm-6.1.1-sources.jar.sha1
new file mode 100644
index 0000000..53116fe
--- /dev/null
+++ b/common/m2/repository/org/ow2/asm/asm/6.1.1/asm-6.1.1-sources.jar.sha1
@@ -0,0 +1 @@
+138383e385c7afa9f332ae9d4c4374aacc61db72
\ No newline at end of file
diff --git a/common/m2/repository/org/ow2/asm/asm/6.1.1/asm-6.1.1.jar b/common/m2/repository/org/ow2/asm/asm/6.1.1/asm-6.1.1.jar
new file mode 100644
index 0000000..35b934d
--- /dev/null
+++ b/common/m2/repository/org/ow2/asm/asm/6.1.1/asm-6.1.1.jar
Binary files differ
diff --git a/common/m2/repository/org/ow2/asm/asm/6.1.1/asm-6.1.1.jar.md5 b/common/m2/repository/org/ow2/asm/asm/6.1.1/asm-6.1.1.jar.md5
new file mode 100644
index 0000000..0856e90
--- /dev/null
+++ b/common/m2/repository/org/ow2/asm/asm/6.1.1/asm-6.1.1.jar.md5
@@ -0,0 +1 @@
+04b72e489b64c54d5776ab59f330bd23
\ No newline at end of file
diff --git a/common/m2/repository/org/ow2/asm/asm/6.1.1/asm-6.1.1.jar.sha1 b/common/m2/repository/org/ow2/asm/asm/6.1.1/asm-6.1.1.jar.sha1
new file mode 100644
index 0000000..fb10f8e
--- /dev/null
+++ b/common/m2/repository/org/ow2/asm/asm/6.1.1/asm-6.1.1.jar.sha1
@@ -0,0 +1 @@
+264754515362d92acd39e8d40395f6b8dee7bc08
\ No newline at end of file
diff --git a/common/m2/repository/org/ow2/asm/asm/6.1.1/asm-6.1.1.pom b/common/m2/repository/org/ow2/asm/asm/6.1.1/asm-6.1.1.pom
new file mode 100644
index 0000000..e5a7b2e
--- /dev/null
+++ b/common/m2/repository/org/ow2/asm/asm/6.1.1/asm-6.1.1.pom
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.ow2</groupId>
+    <artifactId>ow2</artifactId>
+    <version>1.5</version>
+  </parent>
+  <groupId>org.ow2.asm</groupId>
+  <artifactId>asm</artifactId>
+  <version>6.1.1</version>
+  <name>asm</name>
+  <description>ASM, a very small and fast Java bytecode manipulation framework</description>
+  <url>http://asm.ow2.org/</url>
+  <inceptionYear>2000</inceptionYear>
+  <organization>
+    <name>OW2</name>
+    <url>http://www.ow2.org/</url>
+  </organization>
+  <licenses>
+    <license>
+      <name>BSD</name>
+      <url>http://asm.ow2.org/license.html</url>
+    </license>
+  </licenses>
+  <developers>
+    <developer>
+      <id>ebruneton</id>
+      <name>Eric Bruneton</name>
+      <email>ebruneton@free.fr</email>
+      <roles>
+        <role>Creator</role>
+        <role>Java Developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>eu</id>
+      <name>Eugene Kuleshov</name>
+      <email>eu@javatx.org</email>
+      <roles>
+        <role>Java Developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>forax</id>
+      <name>Remi Forax</name>
+      <email>forax@univ-mlv.fr</email>
+      <roles>
+        <role>Java Developer</role>
+      </roles>
+    </developer>
+  </developers>
+  <mailingLists>
+    <mailingList>
+      <name>ASM Users List</name>
+      <subscribe>https://mail.ow2.org/wws/subscribe/asm</subscribe>
+      <post>asm@objectweb.org</post>
+      <archive>https://mail.ow2.org/wws/arc/asm/</archive>
+    </mailingList>
+    <mailingList>
+      <name>ASM Team List</name>
+      <subscribe>https://mail.ow2.org/wws/subscribe/asm-team</subscribe>
+      <post>asm-team@objectweb.org</post>
+      <archive>https://mail.ow2.org/wws/arc/asm-team/</archive>
+    </mailingList>
+  </mailingLists>
+  <scm>
+    <connection>scm:git:https://gitlab.ow2.org/asm/asm/</connection>
+    <developerConnection>scm:git:https://gitlab.ow2.org/asm/asm/</developerConnection>
+    <url>https://gitlab.ow2.org/asm/asm/</url>
+  </scm>
+  <issueManagement>
+    <url>https://gitlab.ow2.org/asm/asm/issues</url>
+  </issueManagement>
+  <dependencies>
+    <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm-test</artifactId>
+      <version>6.1.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <version>5.1.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-params</artifactId>
+      <version>5.1.0</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/common/m2/repository/org/ow2/asm/asm/6.1.1/asm-6.1.1.pom.md5 b/common/m2/repository/org/ow2/asm/asm/6.1.1/asm-6.1.1.pom.md5
new file mode 100644
index 0000000..7bda88d
--- /dev/null
+++ b/common/m2/repository/org/ow2/asm/asm/6.1.1/asm-6.1.1.pom.md5
@@ -0,0 +1 @@
+f22e16486df7a513b1104113fd256edd
\ No newline at end of file
diff --git a/common/m2/repository/org/ow2/asm/asm/6.1.1/asm-6.1.1.pom.sha1 b/common/m2/repository/org/ow2/asm/asm/6.1.1/asm-6.1.1.pom.sha1
new file mode 100644
index 0000000..0bf3a0e
--- /dev/null
+++ b/common/m2/repository/org/ow2/asm/asm/6.1.1/asm-6.1.1.pom.sha1
@@ -0,0 +1 @@
+a17fe0ad27c271c744e47b42e1c1a68b8c133a01
\ No newline at end of file
diff --git a/common/m2/repository/org/ow2/asm/asm/maven-metadata.xml b/common/m2/repository/org/ow2/asm/asm/maven-metadata.xml
new file mode 100644
index 0000000..a1259b7
--- /dev/null
+++ b/common/m2/repository/org/ow2/asm/asm/maven-metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>org.ow2.asm</groupId>
+  <artifactId>asm</artifactId>
+  <versioning>
+    <release>6.1.1</release>
+    <versions>
+      <version>6.1.1</version>
+    </versions>
+    <lastUpdated>20180502210540</lastUpdated>
+  </versioning>
+</metadata>
diff --git a/common/m2/repository/org/ow2/ow2/1.5/ow2-1.5.pom b/common/m2/repository/org/ow2/ow2/1.5/ow2-1.5.pom
new file mode 100644
index 0000000..d6d62a4
--- /dev/null
+++ b/common/m2/repository/org/ow2/ow2/1.5/ow2-1.5.pom
@@ -0,0 +1,309 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2011-2012 Bull S.A.S.
+ Licensed 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.ow2</groupId>
+  <artifactId>ow2</artifactId>
+  <version>1.5</version>
+  <packaging>pom</packaging>
+
+  <name>OW2 Consortium</name>
+  <description>
+    The OW2 Consortium is an open source community committed to making available to everyone
+    the best and most reliable middleware technology, including generic enterprise applications
+    and cloud computing technologies. The mission of the OW2 Consortium is to
+      i) develop open source code for middleware, generic enterprise applications and cloud computing and
+      ii) to foster a vibrant community and business ecosystem.
+  </description>
+
+  <!-- License of this POM -->
+  <licenses>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+
+  <!-- Consortium description -->
+  <organization>
+    <name>OW2 Consortium</name>
+    <url>http://www.ow2.org</url>
+  </organization>
+
+  <!-- TODO Needs to be changed in the future
+       with a reference to a page explaining how to do releases -->
+  <url>http://www.ow2.org</url>
+
+  <!-- Who worked on this project ? -->
+  <developers>
+    <developer>
+      <id>sauthieg</id>
+      <name>Guillaume Sauthier</name>
+      <email>guillaume.sauthier@ow2.org</email>
+    </developer>
+  </developers>
+
+  <properties>
+    <!-- OW2 Logo can be referred using the '${organization.logo}' property -->
+    <organization.logo>
+      http://www.ow2.org/xwiki/bin/download/NewsEvents/MarketingResources/ow2_logo_small_transp.png
+    </organization.logo>
+    <!-- Avoid the annoying warning -->
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
+    <!-- Use properties so they could be overridden if needed -->
+    <ow2DistMgmtSnapshotsUrl>http://repository.ow2.org/nexus/content/repositories/snapshots</ow2DistMgmtSnapshotsUrl>
+    <ow2DistMgmtReleasesUrl>http://repository.ow2.org/nexus/service/local/staging/deploy/maven2</ow2DistMgmtReleasesUrl>
+    <ow2SourceAssemblyDescriptorRef>source-release</ow2SourceAssemblyDescriptorRef>
+    <ow2ReleaseProfiles>ow2-release</ow2ReleaseProfiles>
+    <maven-source-assemblies.version>1.0.1</maven-source-assemblies.version>
+
+    <!-- Used plugins default versions (make them overridable) -->
+    <maven-assembly-plugin.version>2.3</maven-assembly-plugin.version>
+    <maven-gpg-plugin.version>1.4</maven-gpg-plugin.version>
+    <maven-javadoc-plugin.version>2.8.1</maven-javadoc-plugin.version>
+    <maven-source-plugin.version>2.1.2</maven-source-plugin.version>
+    <maven-release-plugin.version>2.3.2</maven-release-plugin.version>
+  </properties>
+
+  <!-- Source Code Management -->
+  <scm>
+    <connection>scm:git:git@gitorious.ow2.org:ow2/pom.git</connection>
+    <developerConnection>scm:git:git@gitorious.ow2.org:ow2/pom.git</developerConnection>
+    <url>http://gitorious.ow2.org/ow2/pom</url>
+    <tag>ow2-1.5</tag>
+  </scm>
+
+  <!-- Distribution -->
+  <distributionManagement>
+
+    <!-- Site omitted - each project must provide their own -->
+
+    <!-- Release Repository (with staging):
+         Refer to this server in your settings.xml using the 'ow2.release' ID -->
+    <repository>
+      <id>ow2.release</id>
+      <name>OW2 Maven Releases Repository</name>
+      <url>${ow2DistMgmtReleasesUrl}</url>
+    </repository>
+
+    <!-- Snapshots Repository:
+         Refer to this server in your settings.xml using the 'ow2.snapshot' ID -->
+    <snapshotRepository>
+      <id>ow2.snapshot</id>
+      <name>OW2 Maven Snapshots Repository</name>
+      <url>${ow2DistMgmtSnapshotsUrl}</url>
+    </snapshotRepository>
+  </distributionManagement>
+
+  <!-- ============================================================================================
+     - TODO Remove the snapshots repositories from the super pom
+     - Explanation:
+     -  http://www.sonatype.com/people/2010/03/why-external-repos-are-being-phased-out-of-central/
+     ============================================================================================ -->
+
+  <!-- Plugin Repositories -->
+  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+    - Used to search plugins, plugins dependencies and build extensions
+    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+  <pluginRepositories>
+
+    <!-- Only list the snapshot repository here since the
+         main repository is synchronized to central -->
+    <pluginRepository>
+      <id>ow2-plugin-snapshot</id>
+      <name>OW2 Snapshot Plugin Repository</name>
+      <url>http://repository.ow2.org/nexus/content/repositories/snapshots</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+    </pluginRepository>
+
+  </pluginRepositories>
+
+  <!-- Repositories -->
+  <repositories>
+
+    <!-- Only list the snapshot repository here since the
+         main repository is synchronized to central -->
+    <repository>
+      <id>ow2-snapshot</id>
+      <name>OW2 Snapshot Repository</name>
+      <url>http://repository.ow2.org/nexus/content/repositories/snapshots</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+    </repository>
+  </repositories>
+
+  <build>
+    <plugins>
+
+      <!-- Enforce Maven version usage: excludes some that are known with defects -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <version>1.0-beta-1</version>
+        <executions>
+          <execution>
+            <id>enforce-maven</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <configuration>
+              <rules>
+                <requireMavenVersion>
+                  <version>(,2.1.0),(2.1.0,2.2.0),(2.2.0,)</version>
+                  <message>Maven 2.1.0 and 2.2.0 produce incorrect GPG signatures and checksums respectively.</message>
+                </requireMavenVersion>
+              </rules>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+
+    <pluginManagement>
+      <plugins>
+        <!-- Default configuration of the maven-release-plugin:
+             * 'release' profile not used
+             * use 'ow2-release' profile
+           -->
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-release-plugin</artifactId>
+          <version>${maven-release-plugin.version}</version>
+          <configuration>
+            <mavenExecutorId>forked-path</mavenExecutorId>
+
+            <!-- Do not use the default release profile, use our own instead -->
+            <useReleaseProfile>false</useReleaseProfile>
+            <!-- Our own release profile -->
+            <releaseProfiles>${ow2ReleaseProfiles}</releaseProfiles>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+
+  </build>
+
+  <profiles>
+    <profile>
+
+      <id>ow2-release</id>
+      <build>
+        <plugins>
+          <!-- - - - - - - - - - - - - - - - - - - - - -->
+          <!--  Attach the sources to the project      -->
+          <!-- - - - - - - - - - - - - - - - - - - - - -->
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-source-plugin</artifactId>
+            <version>${maven-source-plugin.version}</version>
+
+            <executions>
+              <execution>
+                <id>attach-sources</id>
+                <goals>
+                  <goal>jar-no-fork</goal>
+                </goals>
+              </execution>
+            </executions>
+
+          </plugin>
+
+          <!-- - - - - - - - - - - - - - - - - - - - - -->
+          <!--  Attach the javadoc to the project      -->
+          <!-- - - - - - - - - - - - - - - - - - - - - -->
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <version>${maven-javadoc-plugin.version}</version>
+            <executions>
+              <execution>
+
+                <id>attach-javadocs</id>
+                <goals>
+                  <goal>jar</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+
+          <!-- - - - - - - - - - - - - - - - - - - - - -->
+          <!--  Sign all the artifacts                 -->
+          <!-- - - - - - - - - - - - - - - - - - - - - -->
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-gpg-plugin</artifactId>
+            <version>${maven-gpg-plugin.version}</version>
+            <executions>
+              <execution>
+                <id>sign-artifacts</id>
+                <phase>verify</phase>
+
+                <goals>
+                  <goal>sign</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+
+          <!-- - - - - - - - - - - - - - - - - - - - - -->
+          <!--  Generates a source assembly            -->
+          <!-- - - - - - - - - - - - - - - - - - - - - -->
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-assembly-plugin</artifactId>
+            <version>${maven-assembly-plugin.version}</version>
+            <executions>
+              <execution>
+                <id>source-release-assembly</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>single</goal>
+                </goals>
+                <configuration>
+                  <!-- Do not execute that plugin for all modules -->
+                  <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
+                  <descriptorRefs>
+                    <descriptorRef>${ow2SourceAssemblyDescriptorRef}</descriptorRef>
+                  </descriptorRefs>
+                  <!-- Use GNU Tar -->
+                  <tarLongFileMode>gnu</tarLongFileMode>
+                </configuration>
+              </execution>
+            </executions>
+            <dependencies>
+              <dependency>
+                <groupId>org.ow2</groupId>
+                <artifactId>maven-source-assemblies</artifactId>
+                <version>${maven-source-assemblies.version}</version>
+              </dependency>
+            </dependencies>
+          </plugin>
+
+        </plugins>
+      </build>
+
+    </profile>
+  </profiles>
+
+
+</project>
+
diff --git a/common/m2/repository/org/ow2/ow2/1.5/ow2-1.5.pom.md5 b/common/m2/repository/org/ow2/ow2/1.5/ow2-1.5.pom.md5
new file mode 100644
index 0000000..0c741c5
--- /dev/null
+++ b/common/m2/repository/org/ow2/ow2/1.5/ow2-1.5.pom.md5
@@ -0,0 +1 @@
+953e28ee26ab63e906546ca3a957f7ed
\ No newline at end of file
diff --git a/common/m2/repository/org/ow2/ow2/1.5/ow2-1.5.pom.sha1 b/common/m2/repository/org/ow2/ow2/1.5/ow2-1.5.pom.sha1
new file mode 100644
index 0000000..f9682a2
--- /dev/null
+++ b/common/m2/repository/org/ow2/ow2/1.5/ow2-1.5.pom.sha1
@@ -0,0 +1 @@
+d8edc69335f4d9f95f511716fb689c86fb0ebaae
\ No newline at end of file
diff --git a/common/m2/repository/org/ow2/ow2/maven-metadata.xml b/common/m2/repository/org/ow2/ow2/maven-metadata.xml
new file mode 100644
index 0000000..e2b784b
--- /dev/null
+++ b/common/m2/repository/org/ow2/ow2/maven-metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>org.ow2</groupId>
+  <artifactId>ow2</artifactId>
+  <versioning>
+    <release>1.5</release>
+    <versions>
+      <version>1.5</version>
+    </versions>
+    <lastUpdated>20180502210534</lastUpdated>
+  </versioning>
+</metadata>
diff --git a/common/metalava/Android.bp b/common/metalava/Android.bp
deleted file mode 100644
index 92ec383..0000000
--- a/common/metalava/Android.bp
+++ /dev/null
@@ -1,5 +0,0 @@
-java_import_host {
-    name: "metalava",
-    jars: ["metalava.jar"],
-    installable: true,
-}
diff --git a/common/metalava/PREBUILT b/common/metalava/PREBUILT
deleted file mode 100644
index f0dd5fd..0000000
--- a/common/metalava/PREBUILT
+++ /dev/null
@@ -1,2 +0,0 @@
-From https://android-build.googleplex.com/builds/submitted/4823858/sdk_arm64-sdk/latest/metalava.jar
-platform/tools/metalava 706dfa136ab05f7ceddf0eee82184deb14f9793f
diff --git a/common/metalava/metalava.jar b/common/metalava/metalava.jar
deleted file mode 100644
index cde4155..0000000
--- a/common/metalava/metalava.jar
+++ /dev/null
Binary files differ