diff --git a/.gitignore b/.gitignore
index 35e5adc..26bb72b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /cxf-xjc-utils-2.6.0.tar.xz
 /cxf-xjc-utils-2.6.2.tar.xz
+/xjc-utils-3.0.5.tar.gz
diff --git a/cxf-xjc-utils.spec b/cxf-xjc-utils.spec
index 646ed71..04f3fdb 100644
--- a/cxf-xjc-utils.spec
+++ b/cxf-xjc-utils.spec
@@ -1,60 +1,75 @@
-Name:             cxf-xjc-utils
-Version:          2.6.2
-Release:          4%{?dist}
-Summary:          Apache CXF XJC-Utils
-License:          ASL 2.0
-URL:              http://cxf.apache.org/xjc-utils.html
-
-# svn export http://svn.apache.org/repos/asf/cxf/xjc-utils/tags/xjc-utils-2.6.2/ cxf-xjc-utils-2.6.2
-# tar cafJ cxf-xjc-utils-2.6.2.tar.xz cxf-xjc-utils-2.6.2
-
-Source0:          cxf-xjc-utils-%{version}.tar.xz
-
-BuildArch:        noarch
-
-BuildRequires:    cxf-build-utils
-BuildRequires:    maven-local
-BuildRequires:    maven-compiler-plugin
-BuildRequires:    maven-install-plugin
-BuildRequires:    maven-jar-plugin
-BuildRequires:    maven-javadoc-plugin
-BuildRequires:    maven-shade-plugin
-BuildRequires:    maven-checkstyle-plugin
-BuildRequires:    apache-commons-lang
-BuildRequires:    glassfish-jaxb
-BuildRequires:    glassfish-jaxb-api
-BuildRequires:    junit
-BuildRequires:    jvnet-parent
-BuildRequires:    maven-project
-BuildRequires:    maven-shared-downloader
-BuildRequires:    maven-surefire-provider-junit
-BuildRequires:    ws-jaxme
-BuildRequires:    wsdl4j
+Name:          cxf-xjc-utils
+Version:       3.0.5
+Release:       1%{?dist}
+Summary:       Apache CXF XJC-Utils
+License:       ASL 2.0
+URL:           http://cxf.apache.org/xjc-utils.html
+Source0:       https://github.com/apache/cxf-xjc-utils/archive/xjc-utils-%{version}.tar.gz
+
+BuildRequires: maven-local
+BuildRequires: mvn(commons-codec:commons-codec)
+BuildRequires: mvn(commons-lang:commons-lang)
+BuildRequires: mvn(javax.xml.bind:jaxb-api)
+BuildRequires: mvn(junit:junit)
+BuildRequires: mvn(org.apache:apache:pom:)
+BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
+BuildRequires: mvn(org.apache.maven:maven-compat)
+BuildRequires: mvn(org.apache.maven:maven-core)
+BuildRequires: mvn(org.apache.maven:maven-plugin-api)
+BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin)
+BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
+BuildRequires: mvn(org.apache.maven.shared:maven-artifact-resolver)
+BuildRequires: mvn(org.apache.ws.jaxme:jaxme2)
+BuildRequires: mvn(org.codehaus.plexus:plexus-archiver)
+BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
+BuildRequires: mvn(org.glassfish.jaxb:jaxb-core)
+BuildRequires: mvn(org.glassfish.jaxb:jaxb-runtime)
+BuildRequires: mvn(org.glassfish.jaxb:jaxb-xjc)
+BuildRequires: mvn(org.javassist:javassist)
+BuildRequires: mvn(org.sonatype.plexus:plexus-build-api)
+BuildRequires: mvn(wsdl4j:wsdl4j)
+BuildRequires: mvn(xml-resolver:xml-resolver)
+
+BuildArch:     noarch
 
 %description
 The Apache CXF XJC-Utils provides a bunch of utilities for working
 with JAXB to generate better or more usable code.
 
 %package javadoc
-Summary:          Javadoc for %{name}
+Summary:       Javadoc for %{name}
 
 %description javadoc
 This package contains the API documentation for %{name}.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}-xjc-utils-%{version}
 
 %pom_remove_plugin org.apache.maven.plugins:maven-pmd-plugin
 %pom_disable_module bug671
 
-# maven-checkstyle-plugin:2.12:checkstyle (validate) on project cxf-xjc-plugin:
-# An error has occurred in Checkstyle report generation.
-# Failed during checkstyle configuration: cannot initialize module TreeWalker
-# - Unable to instantiate JUnitTestCase: Unable to instantiate JUnitTestCaseCheck -> [Help 1]
+%pom_change_dep -r :jaxb-core org.glassfish.jaxb::2.2.11
+%pom_change_dep -r :jaxb-impl org.glassfish.jaxb:jaxb-runtime:2.2.11
+%pom_change_dep -r :jaxb-xjc org.glassfish.jaxb::2.2.11
+%pom_change_dep -r :jaxme2 org.apache.ws.jaxme:
+
 %pom_remove_plugin -r :maven-checkstyle-plugin
 
+# ClassNotFoundException: org.apache.commons.codec.binary.Base64
+%pom_add_dep commons-codec:commons-codec:1.10:test dv-test
+
+# Not available test deps
+# org.eclipse.equinox:app:jar:1.3.100-v20130327-1442
+%pom_remove_dep org.eclipse.equinox:app javadoc
+# com.cedarsoft.commons:io:jar:6.0.1:
+%pom_remove_dep com.cedarsoft.commons:io javadoc
+rm -r javadoc/src/test/java/*
+# org.eclipse.jdt:core:3.3.0-v_771
+%pom_remove_dep org.eclipse.jdt:core javadoc
+
 %build
-%mvn_build -f
+
+%mvn_build
 
 %install
 %mvn_install
@@ -63,6 +78,9 @@ This package contains the API documentation for %{name}.
 %files javadoc -f .mfiles-javadoc
 
 %changelog
+* Thu Jun 16 2016 gil cattaneo <puntogil@libero.it> 3.0.5-1
+- Update to 3.0.5
+
 * Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 
diff --git a/sources b/sources
index 2243dc0..6fd6881 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c7c460415fa315165561b4cd03f97159  cxf-xjc-utils-2.6.2.tar.xz
+4268f1b096c3479e2b2b70df24d2dfd6  xjc-utils-3.0.5.tar.gz