diff --git a/3.0.7-RELEASE.tar.gz b/3.0.7-RELEASE.tar.gz
new file mode 100644
index 0000000..26cb9c2
Binary files /dev/null and b/3.0.7-RELEASE.tar.gz differ
diff --git a/istack-commons-2.21.tar.gz b/istack-commons-2.21.tar.gz
deleted file mode 100644
index 9407af0..0000000
Binary files a/istack-commons-2.21.tar.gz and /dev/null differ
diff --git a/istack-commons.spec b/istack-commons.spec
index 3b1c5ca..4bf9144 100644
--- a/istack-commons.spec
+++ b/istack-commons.spec
@@ -1,10 +1,10 @@
 Name:           istack-commons
-Version:        2.21
+Version:        3.0.7
 Release:        1
 Summary:        Common code can be share between Glassfish projects
 License:        CDDL-1.1 and GPLv2 with exceptions
 URL:            http://istack-commons.java.net
-Source0:        https://github.com/javaee/jaxb-istack-commons/archive/istack-commons-%{version}.tar.gz
+Source0:        https://github.com/javaee/jaxb-istack-commons/archive/refs/tags/%{version}-RELEASE.tar.gz
 BuildArch:      noarch
 BuildRequires:  maven-local mvn(args4j:args4j) mvn(com.sun.codemodel:codemodel) mvn(com.sun:tools)
 BuildRequires:  mvn(dom4j:dom4j) mvn(junit:junit) mvn(net.java:jvnet-parent:pom:) mvn(org.apache.ant:ant)
@@ -82,7 +82,9 @@ Summary:        Javadoc for istack-commons
 The help  contains the API documentation for istack-commons.
 
 %prep
-%autosetup -n jaxb-istack-commons-istack-commons-%{version} -p1
+%autosetup -n jaxb-istack-commons-%{version}-RELEASE -p1
+cp -rf ./istack-commons/* ./
+rm -rf istack-commons
 find -name '*.class' -delete
 find -name '*.jar' -delete
 rm -rf jaxb-istack-commons-istack-commons-2.21/test/lib/*.zip 
@@ -98,9 +100,9 @@ rm -rf jaxb-istack-commons-istack-commons-2.21/runtime/lib/*.zip
 %mvn_file com.sun.istack:istack-commons-test istack-commons-test istack-commons/istack-commons-test
 %mvn_file com.sun.istack:istack-commons-tools istack-commons-tools istack-commons/istack-commons-tools
 
-%pom_remove_dep org.sonatype.sisu:sisu-inject-plexus import-properties-plugin
-%pom_remove_dep com.sun:tools tools
 %pom_add_dep com.sun:tools tools
+rm -rf runtime/src/main/java/module-info.java
+rm -rf tools/src/main/java/module-info.java
 
 %build
 %mvn_build -s -- -Dproject.build.sourceEncoding=UTF-8
@@ -137,5 +139,8 @@ rm -rf jaxb-istack-commons-istack-commons-2.21/runtime/lib/*.zip
 %doc Licence.txt
 
 %changelog
+* Tue Aug 22 2023 Ge Wang <wang__ge@126.com> - 3.0.7-1
+- Update to version 3.0.7
+
 * Wed Apr 15 2020 yaokai <yaokai13@huawei.com> - 2.21-1
 - Package init