diff --git a/packages/http-client-java/generator/http-client-generator-clientcore-test/package.json b/packages/http-client-java/generator/http-client-generator-clientcore-test/package.json
index f92da45b1af..649091a54ae 100644
--- a/packages/http-client-java/generator/http-client-generator-clientcore-test/package.json
+++ b/packages/http-client-java/generator/http-client-generator-clientcore-test/package.json
@@ -16,7 +16,7 @@
     "@typespec/spec-api": "0.1.0-alpha.10",
     "@typespec/http-specs": "0.1.0-alpha.28",
     "@typespec/json-schema": "1.6.0",
-    "@typespec/http-client-java": "file:../../typespec-http-client-java-0.5.1.tgz",
+    "@typespec/http-client-java": "file:../../typespec-http-client-java-0.6.0.tgz",
     "@typespec/http-client-java-tests": "file:"
   },
   "overrides": {
diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/postprocessor/implementation/CodeFormatterUtil.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/postprocessor/implementation/CodeFormatterUtil.java
index af61be66011..4e0422a2573 100644
--- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/postprocessor/implementation/CodeFormatterUtil.java
+++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/postprocessor/implementation/CodeFormatterUtil.java
@@ -191,7 +191,15 @@ private static String importToString(ImportDeclaration importDeclaration) {
     private static String formatCode(String file, String fileName, CodeFormatter codeFormatter) throws Exception {
         IDocument doc = new Document(file);
 
-        boolean isModuleInfo = IModule.MODULE_INFO_JAVA.equals(fileName);
+        boolean isModuleInfo = fileName.endsWith(IModule.MODULE_INFO_JAVA);
+        if (isModuleInfo) {
+            // candidate module-info.java, confirm by check file content about module declaration
+            CompilationUnit compilationUnit = StaticJavaParser.parse(file);
+            if (compilationUnit.getModule().isEmpty()) {
+                // not module-info.java
+                isModuleInfo = false;
+            }
+        }
         int kind = isModuleInfo ? CodeFormatter.K_MODULE_INFO : CodeFormatter.K_COMPILATION_UNIT;
         kind |= CodeFormatter.F_INCLUDE_COMMENTS;
         TextEdit edit = codeFormatter.format(kind, file, 0, file.length(), 0, Constants.NEW_LINE);
diff --git a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/resources/spotless-pom.xml b/packages/http-client-java/generator/http-client-generator-mgmt/src/main/resources/spotless-pom.xml
deleted file mode 100644
index e4179288d7f..00000000000
--- a/packages/http-client-java/generator/http-client-generator-mgmt/src/main/resources/spotless-pom.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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">
-
-  <parent>
-    <artifactId>azure-autorest-parent</artifactId>
-    <groupId>com.azure.tools</groupId>
-    <version>1.0.0-beta.5</version>
-  </parent>
-
-  <groupId>com.azure.tools</groupId>
-  <artifactId>fluentgen-code-formatter</artifactId>
-  <version>1.0.0-beta.1</version>
-  <modelVersion>4.0.0</modelVersion>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>com.diffplug.spotless</groupId>
-        <artifactId>spotless-maven-plugin</artifactId>
-        <version>2.40.0</version>
-        <configuration>
-          <java>
-            <includes>
-              <include>src/main/java/**/*.java</include>
-              <include>src/samples/java/**/*.java</include>
-              <include>src/test/java/**/*.java</include>
-            </includes>
-
-            <importOrder/>
-            <eclipse>
-              <version>4.21</version>
-              <file>eclipse-format-azure-sdk-for-java.xml</file>
-            </eclipse>
-          </java>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/packages/http-client-java/generator/http-client-generator-test/package.json b/packages/http-client-java/generator/http-client-generator-test/package.json
index d1ab99ad9cf..9b649a5d783 100644
--- a/packages/http-client-java/generator/http-client-generator-test/package.json
+++ b/packages/http-client-java/generator/http-client-generator-test/package.json
@@ -16,7 +16,7 @@
     "@typespec/spec-api": "0.1.0-alpha.10",
     "@typespec/http-specs": "0.1.0-alpha.28",
     "@azure-tools/azure-http-specs": "0.1.0-alpha.32",
-    "@typespec/http-client-java": "file:../../typespec-http-client-java-0.5.1.tgz",
+    "@typespec/http-client-java": "file:../../typespec-http-client-java-0.6.0.tgz",
     "@typespec/http-client-java-tests": "file:"
   },
   "overrides": {
diff --git a/packages/http-client-java/generator/http-client-generator/src/main/resources/readme/pom.xml b/packages/http-client-java/generator/http-client-generator/src/main/resources/readme/pom.xml
index 0209c9c2356..58fc6b54d73 100644
--- a/packages/http-client-java/generator/http-client-generator/src/main/resources/readme/pom.xml
+++ b/packages/http-client-java/generator/http-client-generator/src/main/resources/readme/pom.xml
@@ -21,42 +21,4 @@
       <version>1.0.0-beta.1</version>
     </dependency>
   </dependencies>
-
-  <profiles>
-    <profile>
-      <id>spotless</id>
-      <activation>
-        <property>
-          <name>spotless</name>
-        </property>
-      </activation>
-
-      <build>
-        <plugins>
-          <!-- All configuration, except the plugin version, in this plugin must be aligned with the Spotless -->
-          <!-- configurations used in azure-sdk-for-java -->
-          <plugin>
-            <groupId>com.diffplug.spotless</groupId>
-            <artifactId>spotless-maven-plugin</artifactId>
-            <version>2.40.0</version>
-            <configuration>
-              <java>
-                <includes>
-                  <include>src/main/java/**/*.java</include>
-                  <include>src/samples/java/**/*.java</include>
-                  <include>src/test/java/**/*.java</include>
-                </includes>
-
-                <importOrder/>
-                <eclipse>
-                  <version>4.21</version>
-                  <file>../eclipse-format-azure-sdk-for-java.xml</file>
-                </eclipse>
-              </java>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
 </project>
diff --git a/packages/http-client-java/package-lock.json b/packages/http-client-java/package-lock.json
index d1bd9c4da7a..a4bbdc667de 100644
--- a/packages/http-client-java/package-lock.json
+++ b/packages/http-client-java/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@typespec/http-client-java",
-  "version": "0.5.1",
+  "version": "0.6.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@typespec/http-client-java",
-      "version": "0.5.1",
+      "version": "0.6.0",
       "license": "MIT",
       "dependencies": {
         "@autorest/codemodel": "~4.20.1",
diff --git a/packages/http-client-java/package.json b/packages/http-client-java/package.json
index 4fec5b1fdcd..63f510b4c5a 100644
--- a/packages/http-client-java/package.json
+++ b/packages/http-client-java/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@typespec/http-client-java",
-  "version": "0.5.1",
+  "version": "0.6.0",
   "description": "TypeSpec library for emitting Java client from the TypeSpec REST protocol binding",
   "keywords": [
     "TypeSpec"