From 11fb3c80bc1914422b23fc179b7c7fd1a8b685b5 Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Wed, 29 Jul 2020 15:13:45 +0200
Subject: [PATCH] Update to upstream version 1.0.5

---
 .gitignore            |  1 +
 generate-tarball.sh   |  2 +-
 plexus-languages.spec | 15 +++++++++++----
 sources               |  2 +-
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index f39dfd5..e7a2a82 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /plexus-languages-0.9.3.tar.gz
 /LICENSE-2.0.txt
 /plexus-languages-0.9.10.tar.gz
+/plexus-languages-1.0.5.tar.gz
diff --git a/generate-tarball.sh b/generate-tarball.sh
index e2ecd09..95953ce 100755
--- a/generate-tarball.sh
+++ b/generate-tarball.sh
@@ -10,7 +10,7 @@ wget "https://github.com/codehaus-plexus/plexus-languages/archive/plexus-languag
 rm -rf tarball-tmp
 mkdir tarball-tmp
 pushd tarball-tmp
-tar xf "../${name}-${version}.orig.tar.gz"
+tar -xf "../${name}-${version}.orig.tar.gz"
 
 # CLEAN TARBALL
 find -name '*.jar' -delete
diff --git a/plexus-languages.spec b/plexus-languages.spec
index fc8f044..d5fddcf 100644
--- a/plexus-languages.spec
+++ b/plexus-languages.spec
@@ -1,6 +1,6 @@
 Name:           plexus-languages
-Version:        0.9.10
-Release:        5%{?dist}
+Version:        1.0.5
+Release:        1%{?dist}
 Summary:        Plexus Languages
 License:        ASL 2.0
 URL:            https://github.com/codehaus-plexus/plexus-languages
@@ -16,9 +16,8 @@ BuildRequires:  maven-local
 BuildRequires:  mvn(com.thoughtworks.qdox:qdox)
 BuildRequires:  mvn(javax.inject:javax.inject)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-failsafe-plugin)
-BuildRequires:  mvn(org.codehaus.plexus:plexus-component-annotations)
-BuildRequires:  mvn(org.codehaus.plexus:plexus-component-metadata)
 BuildRequires:  mvn(org.codehaus.plexus:plexus:pom:)
+BuildRequires:  mvn(org.eclipse.sisu:sisu-maven-plugin)
 BuildRequires:  mvn(org.ow2.asm:asm)
 
 %description
@@ -32,6 +31,11 @@ language features.
 
 cp %{SOURCE1} .
 
+%pom_remove_plugin :maven-enforcer-plugin
+
+# Remove module build specific to Java 9
+%pom_xpath_remove 'pom:profiles' plexus-java
+
 %build
 # we don't have mockito 2 yet + many tests rely on bundled test jars/classes
 %mvn_build -f
@@ -43,6 +47,9 @@ cp %{SOURCE1} .
 %license LICENSE-2.0.txt
 
 %changelog
+* Wed Jul 29 2020 Marian Koncek <mkoncek@redhat.com> - 1.0.5-1
+- Update to upstream version 1.0.5
+
 * Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.9.10-5
 - Mass rebuild for javapackages-tools 201902
 
diff --git a/sources b/sources
index ec0934c..8524813 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (plexus-languages-0.9.10.tar.gz) = fe071e50d2881ec524a9b08b6ac0c533d6a7d28b01f26044f8081fe80fe094db5ef17e9c7465f6d3dac843ecfc7cbe4832bbdc0f537f7567d27bb20890e20432
+SHA512 (plexus-languages-1.0.5.tar.gz) = f1d72ac6004a51faa0f21159f55ecfaf0edf6d64eb499a1c155dbac59e512be5893e57d2b89fa3c85d0e3e55fc6accd9daee7d564e1ad6000e69387b1d65bb1d
 SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8