diff --git a/.gitignore b/.gitignore
index f5ab4c0..e46b600 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ plexus-cipher-1.5.tar.gz
/LICENSE-2.0.txt
/plexus-cipher-1.7.tar.gz
/plexus-cipher-1.8.tar.gz
+/plexus-cipher-2.0.tar.gz
diff --git a/plexus-cipher.spec b/plexus-cipher.spec
index 0be3f07..fa6ebb7 100644
--- a/plexus-cipher.spec
+++ b/plexus-cipher.spec
@@ -1,8 +1,8 @@
%bcond_with bootstrap
Name: plexus-cipher
-Version: 1.8
-Release: 3%{?dist}
+Version: 2.0
+Release: 1%{?dist}
Summary: Plexus Cipher: encryption/decryption Component
License: ASL 2.0
# project moved to GitHub and it looks like there is no official website anymore
@@ -15,10 +15,11 @@ BuildRequires: maven-local-openjdk8
%if %{with bootstrap}
BuildRequires: javapackages-bootstrap
%else
-BuildRequires: mvn(javax.enterprise:cdi-api)
BuildRequires: mvn(javax.inject:javax.inject)
BuildRequires: mvn(junit:junit)
-BuildRequires: mvn(org.sonatype.plugins:sisu-maven-plugin)
+BuildRequires: mvn(org.codehaus.plexus:plexus:pom:)
+BuildRequires: mvn(org.eclipse.sisu:org.eclipse.sisu.inject)
+BuildRequires: mvn(org.eclipse.sisu:sisu-maven-plugin)
%endif
%description
@@ -28,26 +29,11 @@ Plexus Cipher: encryption/decryption Component
%prep
%setup -q -n %{name}-%{name}-%{version}
-
-%pom_remove_parent .
-
-%pom_xpath_inject 'pom:project' 'org.codehaus.plexus' .
-
-# fedora moved from sonatype sisu to eclipse sisu. sisu-inject-bean artifact
-# doesn't exist in eclipse sisu. this artifact contains nothing but
-# bundled classes from atinject, cdi-api, aopalliance and maybe others.
-%pom_remove_dep org.sonatype.sisu:sisu-inject-bean
-
-%pom_add_dep javax.inject:javax.inject:1:provided
-
-%pom_add_dep javax.enterprise:cdi-api:1.0:provided
-
%mvn_file : plexus/%{name}
-
%mvn_alias org.codehaus.plexus: org.sonatype.plexus:
%build
-%mvn_build -f
+%mvn_build
%install
%mvn_install
@@ -56,6 +42,9 @@ Plexus Cipher: encryption/decryption Component
%license LICENSE.txt NOTICE.txt
%changelog
+* Sun Apr 24 2022 Mikolaj Izdebski - 2.0-1
+- Update to upstream version 2.0
+
* Sat Feb 05 2022 Jiri Vanek - 1.8-3
- Rebuilt for java-17-openjdk as system jdk
diff --git a/sources b/sources
index 8c416b6..e82736e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (plexus-cipher-1.8.tar.gz) = 1c0ec0a4d2d8c2e43c3afc7e17e6a7fa21cfd9db609050f47082fa9858fe44e71c85cb0f2a2b8aae667651e6fffb10590be1eaa2e92b4baa5e0179191e7b4360
+SHA512 (plexus-cipher-2.0.tar.gz) = 1d57b5d0667f349d45bacae4c305d7cbf95f66599fb030abe8f4328193a8186ae87e46b9b08ea9d00c2f9ce65557f0ab89ae2b7ac89e11fe8d3e2e95e27a1841