From 2a0f245e821b5fa63032b0159c7a259c59e98bba Mon Sep 17 00:00:00 2001
From: Jayashree Huttanagoudar <jhuttana@redhat.com>
Date: Apr 07 2020 04:58:18 +0000
Subject: Upgraded to latest upstream version 4.0.11


---

diff --git a/byteman.spec b/byteman.spec
index 3aa12ce..c270436 100644
--- a/byteman.spec
+++ b/byteman.spec
@@ -14,12 +14,12 @@
 %global bindir %{homedir}/bin
 
 Name:             byteman
-Version:          4.0.5
-Release:          5%{?dist}
+Version:          4.0.11
+Release:          1%{?dist}
 Summary:          Java agent-based bytecode injection tool
 License:          LGPLv2+
 URL:              http://www.jboss.org/byteman
-# wget -O 4.0.5.tar.gz https://github.com/bytemanproject/byteman/archive/4.0.5.tar.gz
+# wget -O 4.0.11.tar.gz https://github.com/bytemanproject/byteman/archive/4.0.11.tar.gz
 Source0:          https://github.com/bytemanproject/byteman/archive/%{version}.tar.gz
 
 BuildArch:        noarch
@@ -37,11 +37,13 @@ BuildRequires:    maven-jar-plugin
 BuildRequires:    maven-surefire-plugin
 BuildRequires:    maven-surefire-provider-testng
 BuildRequires:    maven-surefire-provider-junit
+BuildRequires:    maven-surefire-provider-junit5
 BuildRequires:    maven-verifier-plugin
 BuildRequires:    maven-dependency-plugin
 BuildRequires:    java_cup
 BuildRequires:    objectweb-asm
 BuildRequires:    junit
+BuildRequires:    junit5
 BuildRequires:    testng
 # JBoss modules byteman plugin requires it
 BuildRequires:    mvn(org.jboss.modules:jboss-modules)
@@ -54,6 +56,7 @@ Requires:         java-headless >= 1:1.8
 
 # Related pieces removed via pom_xpath_remove macros
 Patch1:           remove_submit_integration_test_verification.patch
+Patch2:           tests_pom_xml.patch
 
 %description
 Byteman is a tool which simplifies tracing and testing of Java programs.
@@ -106,6 +109,7 @@ sed -i "s|java-cup|java_cup|" tests/pom.xml
 %pom_xpath_remove "pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-failsafe-plugin']/pom:executions/pom:execution[pom:id='submit.TestSubmit']" agent
 %pom_xpath_remove "pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-failsafe-plugin']/pom:executions/pom:execution[pom:id='submit.TestSubmit.compiled']" agent
 %patch1 -p2
+%patch2 -p2
 
 # Remove Submit integration test invocations (tests)
 %pom_xpath_remove "pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-failsafe-plugin']/pom:executions/pom:execution[pom:id='submit.TestSubmit']" tests
@@ -209,6 +213,11 @@ ln -s %{_javadir}/byteman/byteman.jar $RPM_BUILD_ROOT%{homedir}/lib/byteman.jar
 %{homedir}/lib/byteman-dtest.jar
 
 %changelog
+* Tue Mar 03 2020 Jayashree Huttanagoudar <jhuttana@redhat.com> - 4.0.11-1
+- Upgrated to latest upstream version 4.0.11
+- Added a patch to fix rpm build issue caused due to misconfiguration in upstream
+- Added required additional plugins required for build
+
 * Tue Jan 28 2020 Severin Gehwolf <sgehwolf@redhat.com> - 4.0.5-5
 - Drop not needed BR jarjar. Fixes FTBFS.
 
diff --git a/sources b/sources
index a32d102..3e309e2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (4.0.5.tar.gz) = 2a9bd3d19ccfe2208c791422fc7bb89c2c322779c5ce4b917b50a9ec131ed23ca78f374e6e3c457774a06934446019a92ad4aea6402757ab6a82e8d6dd3afae7
+SHA512 (4.0.11.tar.gz) = 05e82df5e6747934c3b80932534118c25571482c4dd0f0be0468a683e6185ca4ae039f7bdabc0151067c2c61cf450b19636c50840ae6749df461dc0a1f305f69
diff --git a/tests_pom_xml.patch b/tests_pom_xml.patch
new file mode 100644
index 0000000..4b76997
--- /dev/null
+++ b/tests_pom_xml.patch
@@ -0,0 +1,22 @@
+diff --git a/byteman-4.0.11/tests/pom.xml b/byteman-4.0.11/tests/pom.xml
+index 60e4e1a..1a2abed 100644
+--- a/byteman-4.0.11/tests/pom.xml
++++ b/byteman-4.0.11/tests/pom.xml
+@@ -1166,7 +1166,7 @@
+                          <includes>
+                            <include>org/jboss/byteman/tests/bugfixes/TestTraceOpenAndWrite.class</include>
+                          </includes>
+-                         <argLine>-javaagent:${project.build.directory}/byteman-${project.version}.jar=script:${project.build.testOutputDirectory}/scripts/bugfixes/TestTraceOpenAndWrite.btm</argLine>
++                         <argLine>-javaagent:${project.build.directory}/../../byteman/target/byteman-${project.version}.jar=script:${project.build.directory}/../../agent/src/test/resources/scripts/bugfixes/TestTraceOpenAndWrite.btm</argLine>
+                       </configuration>
+                     </execution>
+                     <!-- dynamic rule submission
+@@ -2184,7 +2184,7 @@
+                          <includes>
+                            <include>org/jboss/byteman/tests/bugfixes/TestTraceOpenAndWrite.class</include>
+                          </includes>
+-                         <argLine>-Dorg.jboss.byteman.compile.to.bytecode -javaagent:${project.build.directory}/byteman-${project.version}.jar=script:${project.build.testOutputDirectory}/scripts/bugfixes/TestTraceOpenAndWrite.btm</argLine>
++                         <argLine>-Dorg.jboss.byteman.compile.to.bytecode -javaagent:${project.build.directory}/../../byteman/target/byteman-${project.version}.jar=script:${project.build.directory}/../../agent/src/test/resources/scripts/bugfixes/TestTraceOpenAndWrite.btm</argLine>
+                       </configuration>
+                     </execution>
+                     <execution>