Another overhaul

smack-integration-test/build.gradle

@@ -12,6 +12,8 @@ dependencies {
 	compile project(':smack-extensions')
 	compile project(':smack-experimental')
 	compile project(':smack-omemo')
+	compile project(':smack-openpgp')
+	compile project(':smack-openpgp-bouncycastle')
 	compile project(':smack-debug')
 	compile project(path: ":smack-omemo", configuration: "testRuntime")
 	compile 'org.reflections:reflections:0.9.9-RC1'

smack-integration-test/src/main/java/org/jivesoftware/smackx/openpgp/OpenPgpIntegrationTest.java

@@ -1,4 +0,0 @@
-package org.jivesoftware.smackx.openpgp;
-
-public class OpenPgpIntegrationTest {
-}

smack-integration-test/src/main/java/org/jivesoftware/smackx/openpgp/package-info.java

@@ -1,21 +0,0 @@
-/**
- *
- * Copyright 2015 Florian Schmaus
- *
- * 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.
- */
-
-/**
- * Smacks implementation of XEP-0199: XMPP Ping.
- */
-package org.jivesoftware.smackx.ping;