diff --git a/.gitignore b/.gitignore
index f390030..2753249 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ jflex-1.4.3.tar.gz
/jflex-1.5.1-clean.tar.gz
/jflex-1.6.0-clean.tar.gz
/jflex-1.6.1-clean.tar.gz
+/jflex-1.7.0-clean.tar.gz
diff --git a/create-tarball.sh b/create-tarball.sh
index 849de41..90501c5 100755
--- a/create-tarball.sh
+++ b/create-tarball.sh
@@ -8,7 +8,7 @@ fi
VERSION=${1}
NAME="jflex"
-wget http://jflex.de/${NAME}-${VERSION}.tar.gz
+wget http://jflex.de/release/${NAME}-${VERSION}.tar.gz
tar xvf ${NAME}-${VERSION}.tar.gz
(
diff --git a/jflex.spec b/jflex.spec
index 26d4d5c..c95817a 100644
--- a/jflex.spec
+++ b/jflex.spec
@@ -1,8 +1,7 @@
-
Summary: Fast Scanner Generator
Name: jflex
-Version: 1.6.1
-Release: 13%{?dist}
+Version: 1.7.0
+Release: 1%{?dist}
License: BSD
URL: http://jflex.de/
BuildArch: noarch
@@ -47,13 +46,25 @@ This package provides %{summary}.
%mvn_file : %{name}
%pom_add_dep java_cup:java_cup
-%pom_remove_plugin :maven-antrun-plugin
%pom_remove_plugin :jflex-maven-plugin
+%pom_remove_plugin :cup-maven-plugin
+%pom_remove_plugin :maven-shade-plugin
+%pom_remove_dep :cup_runtime
# Tests fail with 320k stacks (default on i686), so lets increase
# stack to 16M to avoid stack overflows. See rhbz#1119308
%pom_xpath_inject "pom:plugin[pom:artifactId='maven-surefire-plugin']/pom:configuration" "-Xss16384k"
+%pom_xpath_remove "pom:plugin[pom:artifactId='maven-site-plugin']" parent.xml
+%pom_xpath_remove "pom:plugin[pom:artifactId='fmt-maven-plugin']" parent.xml
+%pom_xpath_remove "pom:plugin[pom:artifactId='cup-maven-plugin']" parent.xml
+%pom_xpath_remove "pom:plugin[pom:artifactId='maven-shade-plugin']" parent.xml
+
+%pom_xpath_remove "pom:dependency[pom:artifactId='plexus-compiler-javac-errorprone']" parent.xml
+%pom_xpath_remove "pom:dependency[pom:artifactId='error_prone_core']" parent.xml
+%pom_xpath_remove "pom:compilerId" parent.xml
+%pom_xpath_remove "pom:compilerArgs" parent.xml
+
%build
java -jar $(find-jar java_cup) -parser LexParse -interface -destdir src/main/java src/main/cup/LexParse.cup
jflex -d src/main/java/jflex --skel src/main/jflex/skeleton.nested src/main/jflex/LexScan.flex
@@ -86,6 +97,9 @@ install -p -m 644 %{SOURCE4} %{buildroot}%{_mandir}/man1
%changelog
+* Thu Jun 06 2019 Marian Koncek - 1.7.0-1
+- Update to upstream version 1.7.0
+
* Fri May 24 2019 Mikolaj Izdebski - 1.6.1-13
- Mass rebuild for javapackages-tools 201901
diff --git a/sources b/sources
index 9029c72..609f822 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (jflex-1.6.1-clean.tar.gz) = 65668407d0a06a59360baeebe5c97274927e3601f7ebc4dc4a6c806af7cfa3c6f746fb05d3fae7f415a79db8e892cb412b8d76abbba2cfc75cc63b158a39a9f8
+SHA512 (jflex-1.7.0-clean.tar.gz) = 4040808a543133beb1ef9243eadc1d7eb137660e6bcc3ab462fbb0799eca6c655da6ecc4e17998380b7c4abc167a361f05f45c3fb8de112f6311e232602efd09