diff --git a/.gitignore b/.gitignore
index cea2a7d..bd8b66d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1 @@
-/xmlstreambuffer-1.5.1-src-svn.tar.gz
-/xmlstreambuffer-1.5.4.tar.xz
-/metro-xmlstreambuffer-1.5.9.tar.gz
+/metro-xmlstreambuffer-1.5.10.tar.gz
diff --git a/sources b/sources
index 1efd18c..dbc07bd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (metro-xmlstreambuffer-1.5.9.tar.gz) = 60149727cc4ba2d03b9a870735e65c06a7a900cfec492eac107767d53cfd42cceb5bd48885e944d77b81e93cd265073360ebda05fc5e2865b0a91895e499b3ac
+SHA512 (metro-xmlstreambuffer-1.5.10.tar.gz) = 9015afb48bb874a53b60202a99ead291d9c3ac0cdfbb08a0c3c932574a768a84b5135be51d5e48cdd37a1a61c02859e2d4fffe7ae2629cb4ca4bccc4129887dd
diff --git a/xmlstreambuffer.spec b/xmlstreambuffer.spec
index 041cea9..0e92562 100644
--- a/xmlstreambuffer.spec
+++ b/xmlstreambuffer.spec
@@ -1,31 +1,32 @@
 %global srcname metro-xmlstreambuffer
 
 Name:           xmlstreambuffer
-Version:        1.5.9
-Release:        5%{?dist}
+Version:        1.5.10
+Release:        1%{?dist}
 Summary:        Stream Based Representation for XML Infoset
 License:        BSD
-
 URL:            https://github.com/eclipse-ee4j/metro-xmlstreambuffer
-Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
-
 BuildArch:      noarch
 
-BuildRequires:  maven-local
-BuildRequires:  mvn(jakarta.activation:jakarta.activation-api)
-BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
-BuildRequires:  mvn(org.codehaus.mojo:build-helper-maven-plugin)
-BuildRequires:  mvn(org.jvnet.staxex:stax-ex)
+Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 
-# javadoc subpackage is currently not built
-Obsoletes:      xmlstreambuffer-javadoc < 1.5.9-1
+BuildRequires:  maven-local
+BuildRequires:  mvn(com.sun.activation:jakarta.activation)
+BuildRequires:  mvn(org.codehaus.mojo:build-helper-maven-plugin)
+BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
+BuildRequires:  mvn(org.jvnet.staxex:stax-ex)
+BuildRequires:  mvn(junit:junit)
 
 %description
 Stream based representation for XML infoset.
 
+%package javadoc
+Summary:        API documentation for xmlstreambuffer
+%description javadoc
+API documentation for xmlstreambuffer.
 
 %prep
-%setup -q -n %{srcname}-%{version}
+%autosetup -n %{srcname}-%{version}
 
 pushd streambuffer
 # remove unnecessary dependency on parent POM
@@ -36,30 +37,53 @@ pushd streambuffer
 %pom_remove_plugin :glassfish-copyright-maven-plugin
 %pom_remove_plugin :maven-enforcer-plugin
 
-%pom_remove_dep "com.fasterxml.woodstox:woodstox-core"
-%pom_remove_dep "junit:junit"
-popd
+%pom_remove_dep :woodstox-core
 
+%pom_xpath_remove 'pom:plugin[pom:artifactId = "maven-compiler-plugin"]/pom:configuration/pom:source'
+%pom_xpath_remove 'pom:plugin[pom:artifactId = "maven-compiler-plugin"]/pom:configuration/pom:target'
+
+%pom_xpath_set 'pom:plugin[pom:artifactId = "maven-compiler-plugin"]/pom:executions/pom:execution[pom:id = "base-compile"]/pom:id' default-compile
+
+%pom_xpath_inject 'pom:plugin[pom:artifactId = "maven-compiler-plugin"]/pom:executions' '
+  <execution>
+    <id>module-compile</id>
+    <goals>
+      <goal>compile</goal>
+    </goals>
+    <configuration>
+      <source>9</source>
+      <target>9</target>
+      <includes>
+        <include>module-info.java</include>
+      </includes>
+    </configuration>
+  </execution>'
+popd
 
 %build
 pushd streambuffer
-# skip javadoc build due to https://github.com/fedora-java/xmvn/issues/58
-%mvn_build -f -j -- -DbuildNumber=unknown
+%mvn_build -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 -DbuildNumber=unknown
 popd
 
-
 %install
 pushd streambuffer
 %mvn_install
 popd
 
-
 %files -f streambuffer/.mfiles
 %license LICENSE.md NOTICE.md
-%doc README.md
+%doc CONTRIBUTING.md README.md
 
+%files -f streambuffer/.mfiles-javadoc
+%license LICENSE.md NOTICE.md
 
 %changelog
+* Sat Oct 23 2021 Didik Supriadi <didiksupriadi41@fedoraproject.org> - 1.5.10-1
+- Update to version 1.5.10
+- Add javadoc package
+- Enable test
+- Simplified module-info.class build
+
 * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.9-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild