diff --git a/glassfish-hk2.spec b/glassfish-hk2.spec
index 78a2f50..3bc684d 100644
--- a/glassfish-hk2.spec
+++ b/glassfish-hk2.spec
@@ -226,7 +226,7 @@ Summary:       HK2 Implementation Utilities
 %description utils
 Hundred Kilobytes Kernel Implementation Utilities.
 
-%if %{without javadoc}
+%if %{with javadoc}
 %package javadoc
 Summary:       Javadoc for %{name}
 
@@ -244,7 +244,7 @@ find . -name '*.class' -print -delete
 %patch1 -p1
 %patch2 -p1
 
-%if %{with javadoc}
+%if %{without javadoc}
 %pom_remove_plugin :maven-resources-plugin
 %endif
 
@@ -407,11 +407,11 @@ sed -i 's/\r//' LICENSE.txt
 
 %build
 
-%if %{with javadoc}
+%if %{without javadoc}
 opts="-j"
 %endif
 # some tests fails for various cause
-%mvn_build $opts -- -X -Dmaven.test.failure.ignore=true
+%mvn_build $opts -- -Dmaven.test.failure.ignore=true
 
 %install
 %mvn_install
@@ -502,7 +502,7 @@ opts="-j"
 %files utils -f .mfiles-utils
 %license LICENSE.txt
 
-%if %{without javadoc}
+%if %{with javadoc}
 %files javadoc -f .mfiles-javadoc
 %license LICENSE.txt
 %endif