From 1637fc35856cb6a88eb4f4e0627da827155014b3db91388679eaa625eefe3b8c Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Fri, 22 Oct 2021 08:29:11 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/plexus-cipher?expand=0&rev=6

---
 plexus-cipher-1.7.tar.gz |  3 ---
 plexus-cipher-2.0.tar.gz |  3 +++
 plexus-cipher-build.xml  | 13 ++++---------
 plexus-cipher.spec       | 32 +++++++++++---------------------
 4 files changed, 18 insertions(+), 33 deletions(-)
 delete mode 100644 plexus-cipher-1.7.tar.gz
 create mode 100644 plexus-cipher-2.0.tar.gz

diff --git a/plexus-cipher-1.7.tar.gz b/plexus-cipher-1.7.tar.gz
deleted file mode 100644
index fbdec70..0000000
--- a/plexus-cipher-1.7.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5286d465265e2e37e1ff6c729be5bfbe2497dcc7c26084bdd533fff651e58fc9
-size 14930
diff --git a/plexus-cipher-2.0.tar.gz b/plexus-cipher-2.0.tar.gz
new file mode 100644
index 0000000..ee04482
--- /dev/null
+++ b/plexus-cipher-2.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:99b45a9f1b434529cc397116cf6f52ab7a29659f1dc05a0937c73e25596a67fd
+size 16928
diff --git a/plexus-cipher-build.xml b/plexus-cipher-build.xml
index 8dddb62..fafe45b 100644
--- a/plexus-cipher-build.xml
+++ b/plexus-cipher-build.xml
@@ -9,20 +9,19 @@
   <property file="maven-build.properties"/>
 
   <property name="project.artifactId" value="plexus-cipher"/>
-  <property name="project.groupId" value="org.sonatype.plexus"/>
-  <property name="project.version" value="1.7"/>
+  <property name="project.groupId" value="org.codehaus.plexus"/>
+  <property name="project.version" value="2.0"/>
   <property name="project.name" value="Plexus Cipher: encryption/decryption Component"/>
-  <property name="project.url" value="http://spice.sonatype.org/plexus-cipher"/>
+  <property name="project.url" value="https://github.com/codehaus-plexus/plexus-cipher"/>
   <property name="project.organization.name" value="Sonatype, Inc."/>
 
-  <property name="compiler.source" value="1.6"/>
+  <property name="compiler.source" value="1.7"/>
   <property name="compiler.target" value="${compiler.source}"/>
 
   <property name="build.finalName" value="${project.artifactId}-${project.version}"/>
   <property name="build.dir" value="target"/>
   <property name="build.outputDir" value="${build.dir}/classes"/>
   <property name="build.srcDir" value="src/main/java"/>
-  <property name="build.resourceDir" value="src/main/resources"/>
   <property name="reporting.outputDirectory" value="${build.dir}/site"/>
 
   <!-- ====================================================================== -->
@@ -31,7 +30,6 @@
 
   <path id="build.classpath">
     <fileset dir="lib">
-      <!-- cdi-api-1.0 jboss-interceptor-api-1.1 javax.inject-1 -->
       <include name="**/*.jar"/>
     </fileset>
   </path>
@@ -64,9 +62,6 @@
       </src>
       <classpath refid="build.classpath"/>
     </javac>
-    <copy todir="${build.outputDir}">
-      <fileset dir="${build.resourceDir}"/>
-    </copy>
   </target>
 
   <!-- ====================================================================== -->
diff --git a/plexus-cipher.spec b/plexus-cipher.spec
index 81b00c9..f066cd2 100644
--- a/plexus-cipher.spec
+++ b/plexus-cipher.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package plexus-cipher
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,22 +17,18 @@
 
 
 Name:           plexus-cipher
-Version:        1.7
+Version:        2.0
 Release:        0
 Summary:        Plexus Cipher: encryption/decryption Component
 License:        Apache-2.0
 Group:          Development/Libraries/Java
-URL:            https://github.com/codehaus-plexus/plexus-cipher
-# git clone https://github.com/sonatype/plexus-cipher.git
-# cd plexus-cipher/
-# note this is version 1.7 + our patches which were incorporated by upstream maintainer
-# git archive --format tar --prefix=plexus-cipher-1.7/ 0cff29e6b2e | gzip -9 > plexus-cipher-1.7.tar.gz
-Source0:        %{name}-%{version}.tar.gz
+URL:            https://github.com/codehaus-plexus/%{name}
+Source0:        https://github.com/codehaus-plexus/%{name}/archive/refs/tags/%{name}-%{version}.tar.gz
 Source1:        %{name}-build.xml
 BuildRequires:  ant
 BuildRequires:  atinject
-BuildRequires:  cdi-api
 BuildRequires:  fdupes
+BuildRequires:  java-devel >= 1.7
 BuildRequires:  javapackages-local
 BuildRequires:  sisu-inject
 BuildRequires:  xmvn-install
@@ -50,33 +46,27 @@ Group:          Development/Libraries/Java
 API documentation for %{name}.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{name}-%{version}
 cp %{SOURCE1} build.xml
 
 # replace %{version}-SNAPSHOT with %{version}
-%pom_xpath_replace pom:project/pom:version "<version>%{version}</version>"
-
-# 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
-%pom_remove_dep junit:junit
-%pom_add_dep junit:junit:3.8.2:test
+%pom_xpath_set pom:project/pom:version %{version}
 
 %pom_remove_parent .
+%pom_xpath_inject pom:project "<groupId>org.codehaus.plexus</groupId>"
+%pom_change_dep -r -f ::::: :::::
 
 %mvn_file : plexus/%{name}
 
 %build
 mkdir -p lib
-build-jar-repository -s lib cdi-api atinject org.eclipse.sisu.inject
+build-jar-repository -s lib atinject org.eclipse.sisu.inject
 
 %ant compile
 %ant jar javadoc
 
 %mvn_artifact pom.xml target/%{name}-%{version}.jar
+%mvn_alias :{*} org.sonatype.plexus:@1
 
 %install
 %mvn_install