Remove jdisc_messagebus_service and messagebus-disc modules.

- They have been merged into container-messagebus

4 files changed, 0 insertions, 122 deletions

diff --git a/messagebus-disc/.gitignore b/messagebus-disc/.gitignore
deleted file mode 100644
index 3cc25b51fc4..00000000000
--- a/messagebus-disc/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/pom.xml.build
-/target
diff --git a/messagebus-disc/OWNERS b/messagebus-disc/OWNERS
deleted file mode 100644
index 12b533ec610..00000000000
--- a/messagebus-disc/OWNERS
+++ /dev/null
@@ -1 +0,0 @@
-havardpe
diff --git a/messagebus-disc/README b/messagebus-disc/README
deleted file mode 100644
index 256990ecfb1..00000000000
--- a/messagebus-disc/README
+++ /dev/null
@@ -1,2 +0,0 @@
-This module provides jDISC ClientProvider and ServerProvider implementations for
-Vespa Message Bus.
diff --git a/messagebus-disc/pom.xml b/messagebus-disc/pom.xml
deleted file mode 100644
index 5df6cc0a03f..00000000000
--- a/messagebus-disc/pom.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0"?>
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<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/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>com.yahoo.vespa</groupId>
-        <artifactId>parent</artifactId>
-        <version>7-SNAPSHOT</version>
-        <relativePath>../parent/pom.xml</relativePath>
-    </parent>
-    <artifactId>messagebus-disc</artifactId>
-    <version>7-SNAPSHOT</version>
-    <packaging>container-plugin</packaging>
-    <name>${project.artifactId}</name>
-    <dependencies>
-        <dependency>
-            <groupId>com.yahoo.vespa</groupId>
-            <artifactId>jdisc_messagebus_service</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>com.yahoo.vespa</groupId>
-                <artifactId>bundle-plugin</artifactId>
-                <extensions>true</extensions>
-            </plugin>
-            <plugin>
-                <!-- Only added to make IntelliJ use correct language level -->
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-javadocs</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                        <configuration>
-                            <finalName>${project.artifactId}</finalName>
-                            <excludePackageNames>com.yahoo.jdisc.core</excludePackageNames>
-                            <doclint>${doclint},-missing</doclint>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-source-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-sources</id>
-                        <goals>
-                            <goal>jar-no-fork</goal>
-                        </goals>
-                        <configuration>
-                            <finalName>${project.artifactId}</finalName>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <configuration>
-                    <finalName>${project.artifactId}-jar-with-dependencies</finalName>
-                    <filters>
-                        <filter>
-                            <!-- Don't include signature files from bouncycastle in uber jar.  -->
-                            <artifact>*:*</artifact>
-                            <excludes>
-                                <exclude>META-INF/*.SF</exclude>
-                                <exclude>META-INF/*.DSA</exclude>
-                                <exclude>META-INF/*.RSA</exclude>
-                            </excludes>
-                        </filter>
-                    </filters>
-                    <transformers>
-                        <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                            <manifestEntries>
-                                <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
-                                <Export-Package>com.yahoo.messagebus,com.yahoo.messagebus.jdisc,com.yahoo.messagebus.network,
-                                    com.yahoo.messagebus.network.rpc,com.yahoo.messagebus.routing,com.yahoo.messagebus.shared,com.yahoo.messagebus.test</Export-Package>
-                                <Import-Package>
-                                    com.google.inject;version="1.3",
-                                    com.yahoo.jdisc,
-                                    com.yahoo.jdisc.application,
-                                    com.yahoo.jdisc.handler,
-                                    com.yahoo.jdisc.service,
-                                    javax.xml.parsers,
-                                    org.w3c.dom,
-                                    org.xml.sax,
-                                    org.xml.sax.ext,
-                                    org.xml.sax.helpers
-                                </Import-Package>
-                            </manifestEntries>
-                        </transformer>
-                    </transformers>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>