From 07d9d694da484821637eb63182e95f4bff2d7450 Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Wed, 25 Sep 2024 15:28:55 +0200 Subject: [PATCH] Rename smack-java8(-full) to smack-java11(-full) To denote that Smack now requires at least Java 11 to run. Fixes SMACK-953. --- .github/workflows/ci.yml | 4 ++-- Makefile | 4 ++-- settings.gradle | 4 ++-- .../src/main/java/org/jivesoftware/smackx/package-info.java | 2 +- .../src/main/java/org/jivesoftware/smackx/package-info.java | 2 +- .../src/main/java/org/jivesoftware/smackx/package-info.java | 2 +- .../src/main/java/org/jivesoftware/smackx/package-info.java | 2 +- smack-integration-test/build.gradle | 2 +- .../src/main/java/org/jivesoftware/smackx/package-info.java | 2 +- {smack-java8-full => smack-java11-full}/build.gradle | 2 +- .../javadoc/org/jivesoftware/smack/full/doc-files/.gitignore | 0 .../smack/full/ModularXmppClientToServerConnectionTool.java | 0 .../main/java/org/jivesoftware/smack/full/package-info.java | 0 .../main/java/org/jivesoftware/smackx/SmackExtensions.java | 0 .../src/main/java/org/jivesoftware/smackx/package-info.java | 0 .../smack/full/ExtensionElementQNameDeclaredTest.java | 0 .../ModularXmppClientToServerConnectionStateGraphTest.java | 0 .../src/test/resources/state-graph.dot | 0 {smack-java8 => smack-java11}/build.gradle | 0 .../org/jivesoftware/smack/java7/Java7SmackInitializer.java | 0 .../org/jivesoftware/smack/java7/XmppHostnameVerifier.java | 0 .../main/java/org/jivesoftware/smack/java7/package-info.java | 0 .../smack/util/stringencoder/java7/Java7Base64Encoder.java | 0 .../util/stringencoder/java7/Java7Base64UrlSafeEncoder.java | 0 .../smack/util/stringencoder/java7/package-info.java | 0 .../jivesoftware/smack/util/stringencoder/package-info.java | 0 .../src/main/java/org/jivesoftware/smackx/package-info.java | 2 +- .../src/main/java/org/jivesoftware/smackx/package-info.java | 2 +- 28 files changed, 15 insertions(+), 15 deletions(-) rename {smack-java8-full => smack-java11-full}/build.gradle (98%) rename {smack-java8-full => smack-java11-full}/src/javadoc/org/jivesoftware/smack/full/doc-files/.gitignore (100%) rename {smack-java8-full => smack-java11-full}/src/main/java/org/jivesoftware/smack/full/ModularXmppClientToServerConnectionTool.java (100%) rename {smack-java8-full => smack-java11-full}/src/main/java/org/jivesoftware/smack/full/package-info.java (100%) rename {smack-java8-full => smack-java11-full}/src/main/java/org/jivesoftware/smackx/SmackExtensions.java (100%) rename {smack-java8-full => smack-java11-full}/src/main/java/org/jivesoftware/smackx/package-info.java (100%) rename {smack-java8-full => smack-java11-full}/src/test/java/org/jivesoftware/smack/full/ExtensionElementQNameDeclaredTest.java (100%) rename {smack-java8-full => smack-java11-full}/src/test/java/org/jivesoftware/smack/full/ModularXmppClientToServerConnectionStateGraphTest.java (100%) rename {smack-java8-full => smack-java11-full}/src/test/resources/state-graph.dot (100%) rename {smack-java8 => smack-java11}/build.gradle (100%) rename {smack-java8 => smack-java11}/src/main/java/org/jivesoftware/smack/java7/Java7SmackInitializer.java (100%) rename {smack-java8 => smack-java11}/src/main/java/org/jivesoftware/smack/java7/XmppHostnameVerifier.java (100%) rename {smack-java8 => smack-java11}/src/main/java/org/jivesoftware/smack/java7/package-info.java (100%) rename {smack-java8 => smack-java11}/src/main/java/org/jivesoftware/smack/util/stringencoder/java7/Java7Base64Encoder.java (100%) rename {smack-java8 => smack-java11}/src/main/java/org/jivesoftware/smack/util/stringencoder/java7/Java7Base64UrlSafeEncoder.java (100%) rename {smack-java8 => smack-java11}/src/main/java/org/jivesoftware/smack/util/stringencoder/java7/package-info.java (100%) rename {smack-java8 => smack-java11}/src/main/java/org/jivesoftware/smack/util/stringencoder/package-info.java (100%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b1019ea4b..c9e8795af 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -95,8 +95,8 @@ jobs: else echo COVERALLS_REPO_TOKEN is not empty fi - ./gradlew smack-java8-full:testCodeCoverageReport - ./gradlew smack-java8-full:coveralls + ./gradlew smack-java11-full:testCodeCoverageReport + ./gradlew smack-java11-full:coveralls # Upload build artifacts - name: Upload build artifacts diff --git a/Makefile b/Makefile index 0621bf85f..4689ef8af 100644 --- a/Makefile +++ b/Makefile @@ -5,8 +5,8 @@ all: check jacocoRootReport javadocAll sinttest .PHONY: codecov codecov: - $(GRADLE) smack-java8-full:testCodeCoverageReport - echo "Report available at smack-java8-full/build/reports/jacoco/testCodeCoverageReport/html/index.html" + $(GRADLE) smack-java11-full:testCodeCoverageReport + echo "Report available at smack-java11-full/build/reports/jacoco/testCodeCoverageReport/html/index.html" .PHONY: check check: diff --git a/settings.gradle b/settings.gradle index 2ed68cff5..d433b95d3 100644 --- a/settings.gradle +++ b/settings.gradle @@ -27,8 +27,8 @@ include 'smack-core', 'smack-bosh', 'smack-android', 'smack-android-extensions', - 'smack-java8', - 'smack-java8-full', + 'smack-java11', + 'smack-java11-full', 'smack-integration-test', 'smack-omemo', 'smack-omemo-signal', diff --git a/smack-android-extensions/src/main/java/org/jivesoftware/smackx/package-info.java b/smack-android-extensions/src/main/java/org/jivesoftware/smackx/package-info.java index 7ebe86244..bce3b6064 120000 --- a/smack-android-extensions/src/main/java/org/jivesoftware/smackx/package-info.java +++ b/smack-android-extensions/src/main/java/org/jivesoftware/smackx/package-info.java @@ -1 +1 @@ -../../../../../../../smack-java8-full/src/main/java/org/jivesoftware/smackx/package-info.java \ No newline at end of file +../../../../../../../smack-java11-full/src/main/java/org/jivesoftware/smackx/package-info.java \ No newline at end of file diff --git a/smack-android/src/main/java/org/jivesoftware/smackx/package-info.java b/smack-android/src/main/java/org/jivesoftware/smackx/package-info.java index 7ebe86244..bce3b6064 120000 --- a/smack-android/src/main/java/org/jivesoftware/smackx/package-info.java +++ b/smack-android/src/main/java/org/jivesoftware/smackx/package-info.java @@ -1 +1 @@ -../../../../../../../smack-java8-full/src/main/java/org/jivesoftware/smackx/package-info.java \ No newline at end of file +../../../../../../../smack-java11-full/src/main/java/org/jivesoftware/smackx/package-info.java \ No newline at end of file diff --git a/smack-debug-slf4j/src/main/java/org/jivesoftware/smackx/package-info.java b/smack-debug-slf4j/src/main/java/org/jivesoftware/smackx/package-info.java index 7ebe86244..bce3b6064 120000 --- a/smack-debug-slf4j/src/main/java/org/jivesoftware/smackx/package-info.java +++ b/smack-debug-slf4j/src/main/java/org/jivesoftware/smackx/package-info.java @@ -1 +1 @@ -../../../../../../../smack-java8-full/src/main/java/org/jivesoftware/smackx/package-info.java \ No newline at end of file +../../../../../../../smack-java11-full/src/main/java/org/jivesoftware/smackx/package-info.java \ No newline at end of file diff --git a/smack-debug/src/main/java/org/jivesoftware/smackx/package-info.java b/smack-debug/src/main/java/org/jivesoftware/smackx/package-info.java index 7ebe86244..bce3b6064 120000 --- a/smack-debug/src/main/java/org/jivesoftware/smackx/package-info.java +++ b/smack-debug/src/main/java/org/jivesoftware/smackx/package-info.java @@ -1 +1 @@ -../../../../../../../smack-java8-full/src/main/java/org/jivesoftware/smackx/package-info.java \ No newline at end of file +../../../../../../../smack-java11-full/src/main/java/org/jivesoftware/smackx/package-info.java \ No newline at end of file diff --git a/smack-integration-test/build.gradle b/smack-integration-test/build.gradle index 479ee0036..ede353266 100644 --- a/smack-integration-test/build.gradle +++ b/smack-integration-test/build.gradle @@ -12,7 +12,7 @@ application { } dependencies { - api project(':smack-java8-full') + api project(':smack-java11-full') api project(':smack-resolver-dnsjava') implementation project(':smack-websocket-java11') implementation "com.google.guava:guava:${guavaVersion}" diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/package-info.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/package-info.java index 7ebe86244..bce3b6064 120000 --- a/smack-integration-test/src/main/java/org/jivesoftware/smackx/package-info.java +++ b/smack-integration-test/src/main/java/org/jivesoftware/smackx/package-info.java @@ -1 +1 @@ -../../../../../../../smack-java8-full/src/main/java/org/jivesoftware/smackx/package-info.java \ No newline at end of file +../../../../../../../smack-java11-full/src/main/java/org/jivesoftware/smackx/package-info.java \ No newline at end of file diff --git a/smack-java8-full/build.gradle b/smack-java11-full/build.gradle similarity index 98% rename from smack-java8-full/build.gradle rename to smack-java11-full/build.gradle index 61a4e00e0..4f4bf0652 100644 --- a/smack-java8-full/build.gradle +++ b/smack-java11-full/build.gradle @@ -10,7 +10,7 @@ dependencies { api project(':smack-debug') api project(':smack-experimental') api project(':smack-extensions') - api project(':smack-java8') + api project(':smack-java11') api project(':smack-legacy') api project(':smack-omemo') api project(':smack-openpgp') diff --git a/smack-java8-full/src/javadoc/org/jivesoftware/smack/full/doc-files/.gitignore b/smack-java11-full/src/javadoc/org/jivesoftware/smack/full/doc-files/.gitignore similarity index 100% rename from smack-java8-full/src/javadoc/org/jivesoftware/smack/full/doc-files/.gitignore rename to smack-java11-full/src/javadoc/org/jivesoftware/smack/full/doc-files/.gitignore diff --git a/smack-java8-full/src/main/java/org/jivesoftware/smack/full/ModularXmppClientToServerConnectionTool.java b/smack-java11-full/src/main/java/org/jivesoftware/smack/full/ModularXmppClientToServerConnectionTool.java similarity index 100% rename from smack-java8-full/src/main/java/org/jivesoftware/smack/full/ModularXmppClientToServerConnectionTool.java rename to smack-java11-full/src/main/java/org/jivesoftware/smack/full/ModularXmppClientToServerConnectionTool.java diff --git a/smack-java8-full/src/main/java/org/jivesoftware/smack/full/package-info.java b/smack-java11-full/src/main/java/org/jivesoftware/smack/full/package-info.java similarity index 100% rename from smack-java8-full/src/main/java/org/jivesoftware/smack/full/package-info.java rename to smack-java11-full/src/main/java/org/jivesoftware/smack/full/package-info.java diff --git a/smack-java8-full/src/main/java/org/jivesoftware/smackx/SmackExtensions.java b/smack-java11-full/src/main/java/org/jivesoftware/smackx/SmackExtensions.java similarity index 100% rename from smack-java8-full/src/main/java/org/jivesoftware/smackx/SmackExtensions.java rename to smack-java11-full/src/main/java/org/jivesoftware/smackx/SmackExtensions.java diff --git a/smack-java8-full/src/main/java/org/jivesoftware/smackx/package-info.java b/smack-java11-full/src/main/java/org/jivesoftware/smackx/package-info.java similarity index 100% rename from smack-java8-full/src/main/java/org/jivesoftware/smackx/package-info.java rename to smack-java11-full/src/main/java/org/jivesoftware/smackx/package-info.java diff --git a/smack-java8-full/src/test/java/org/jivesoftware/smack/full/ExtensionElementQNameDeclaredTest.java b/smack-java11-full/src/test/java/org/jivesoftware/smack/full/ExtensionElementQNameDeclaredTest.java similarity index 100% rename from smack-java8-full/src/test/java/org/jivesoftware/smack/full/ExtensionElementQNameDeclaredTest.java rename to smack-java11-full/src/test/java/org/jivesoftware/smack/full/ExtensionElementQNameDeclaredTest.java diff --git a/smack-java8-full/src/test/java/org/jivesoftware/smack/full/ModularXmppClientToServerConnectionStateGraphTest.java b/smack-java11-full/src/test/java/org/jivesoftware/smack/full/ModularXmppClientToServerConnectionStateGraphTest.java similarity index 100% rename from smack-java8-full/src/test/java/org/jivesoftware/smack/full/ModularXmppClientToServerConnectionStateGraphTest.java rename to smack-java11-full/src/test/java/org/jivesoftware/smack/full/ModularXmppClientToServerConnectionStateGraphTest.java diff --git a/smack-java8-full/src/test/resources/state-graph.dot b/smack-java11-full/src/test/resources/state-graph.dot similarity index 100% rename from smack-java8-full/src/test/resources/state-graph.dot rename to smack-java11-full/src/test/resources/state-graph.dot diff --git a/smack-java8/build.gradle b/smack-java11/build.gradle similarity index 100% rename from smack-java8/build.gradle rename to smack-java11/build.gradle diff --git a/smack-java8/src/main/java/org/jivesoftware/smack/java7/Java7SmackInitializer.java b/smack-java11/src/main/java/org/jivesoftware/smack/java7/Java7SmackInitializer.java similarity index 100% rename from smack-java8/src/main/java/org/jivesoftware/smack/java7/Java7SmackInitializer.java rename to smack-java11/src/main/java/org/jivesoftware/smack/java7/Java7SmackInitializer.java diff --git a/smack-java8/src/main/java/org/jivesoftware/smack/java7/XmppHostnameVerifier.java b/smack-java11/src/main/java/org/jivesoftware/smack/java7/XmppHostnameVerifier.java similarity index 100% rename from smack-java8/src/main/java/org/jivesoftware/smack/java7/XmppHostnameVerifier.java rename to smack-java11/src/main/java/org/jivesoftware/smack/java7/XmppHostnameVerifier.java diff --git a/smack-java8/src/main/java/org/jivesoftware/smack/java7/package-info.java b/smack-java11/src/main/java/org/jivesoftware/smack/java7/package-info.java similarity index 100% rename from smack-java8/src/main/java/org/jivesoftware/smack/java7/package-info.java rename to smack-java11/src/main/java/org/jivesoftware/smack/java7/package-info.java diff --git a/smack-java8/src/main/java/org/jivesoftware/smack/util/stringencoder/java7/Java7Base64Encoder.java b/smack-java11/src/main/java/org/jivesoftware/smack/util/stringencoder/java7/Java7Base64Encoder.java similarity index 100% rename from smack-java8/src/main/java/org/jivesoftware/smack/util/stringencoder/java7/Java7Base64Encoder.java rename to smack-java11/src/main/java/org/jivesoftware/smack/util/stringencoder/java7/Java7Base64Encoder.java diff --git a/smack-java8/src/main/java/org/jivesoftware/smack/util/stringencoder/java7/Java7Base64UrlSafeEncoder.java b/smack-java11/src/main/java/org/jivesoftware/smack/util/stringencoder/java7/Java7Base64UrlSafeEncoder.java similarity index 100% rename from smack-java8/src/main/java/org/jivesoftware/smack/util/stringencoder/java7/Java7Base64UrlSafeEncoder.java rename to smack-java11/src/main/java/org/jivesoftware/smack/util/stringencoder/java7/Java7Base64UrlSafeEncoder.java diff --git a/smack-java8/src/main/java/org/jivesoftware/smack/util/stringencoder/java7/package-info.java b/smack-java11/src/main/java/org/jivesoftware/smack/util/stringencoder/java7/package-info.java similarity index 100% rename from smack-java8/src/main/java/org/jivesoftware/smack/util/stringencoder/java7/package-info.java rename to smack-java11/src/main/java/org/jivesoftware/smack/util/stringencoder/java7/package-info.java diff --git a/smack-java8/src/main/java/org/jivesoftware/smack/util/stringencoder/package-info.java b/smack-java11/src/main/java/org/jivesoftware/smack/util/stringencoder/package-info.java similarity index 100% rename from smack-java8/src/main/java/org/jivesoftware/smack/util/stringencoder/package-info.java rename to smack-java11/src/main/java/org/jivesoftware/smack/util/stringencoder/package-info.java diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/package-info.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/package-info.java index 7ebe86244..bce3b6064 120000 --- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/package-info.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/package-info.java @@ -1 +1 @@ -../../../../../../../smack-java8-full/src/main/java/org/jivesoftware/smackx/package-info.java \ No newline at end of file +../../../../../../../smack-java11-full/src/main/java/org/jivesoftware/smackx/package-info.java \ No newline at end of file diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/package-info.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/package-info.java index 7ebe86244..bce3b6064 120000 --- a/smack-legacy/src/main/java/org/jivesoftware/smackx/package-info.java +++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/package-info.java @@ -1 +1 @@ -../../../../../../../smack-java8-full/src/main/java/org/jivesoftware/smackx/package-info.java \ No newline at end of file +../../../../../../../smack-java11-full/src/main/java/org/jivesoftware/smackx/package-info.java \ No newline at end of file