[Git][java-team/byteman][master] 3 commits: New upstream version 4.0.12
Andrius Merkys
gitlab at salsa.debian.org
Thu Jul 23 11:35:06 BST 2020
Andrius Merkys pushed to branch master at Debian Java Maintainers / byteman
Commits:
70097641 by Andrius Merkys at 2020-07-23T06:05:11-04:00
New upstream version 4.0.12
- - - - -
834ff333 by Andrius Merkys at 2020-07-23T06:05:13-04:00
Update upstream source from tag 'upstream/4.0.12'
Update to upstream version '4.0.12'
with Debian dir ca3cd1b16b526dd25e5dee5d01b937321da84209
- - - - -
c5b3788e by Andrius Merkys at 2020-07-23T06:06:38-04:00
Update changelog for 4.0.12-1 release
- - - - -
24 changed files:
- agent/pom.xml
- agent/src/main/java/org/jboss/byteman/agent/adapter/NewTriggerAdapter.java
- + agent/src/test/java/org/jboss/byteman/tests/bugfixes/TestAtNewWithCountAll.java
- + agent/src/test/resources/scripts/bugfixes/TestAtNewWithCountAll.btm
- byteman/pom.xml
- contrib/bmunit/pom.xml
- contrib/bmunit5/pom.xml
- contrib/dtest/pom.xml
- contrib/jboss-modules-system/plugin/pom.xml
- contrib/jboss-modules-system/pom.xml
- contrib/jboss-modules-system/tests/pom.xml
- contrib/rulecheck-maven-plugin/example/pom.xml
- contrib/rulecheck-maven-plugin/pom.xml
- debian/changelog
- docs/asciidoc/pom.xml
- docs/pom.xml
- download/pom.xml
- install/pom.xml
- jigsaw/pom.xml
- layer/pom.xml
- pom.xml
- sample/pom.xml
- submit/pom.xml
- tests/pom.xml
Changes:
=====================================
agent/pom.xml
=====================================
@@ -34,7 +34,7 @@
<parent>
<groupId>org.jboss.byteman</groupId>
<artifactId>byteman-root</artifactId>
- <version>4.0.11</version>
+ <version>4.0.12</version>
</parent>
<properties>
@@ -709,6 +709,22 @@
</configuration>
</execution>
<!-- bugfixes -->
+ <execution>
+ <id>bugfixes.TestAtNewWithCountAll</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ <configuration>
+ <forkCount>1</forkCount>
+ <reuseForks>true</reuseForks>
+ <includes>
+ <include>org/jboss/byteman/tests/bugfixes/TestAtNewWithCountAll.class</include>
+ </includes>
+ <argLine>-javaagent:${project.build.directory}/byteman-agent-${project.version}.jar=script:${project.build.testOutputDirectory}/scripts/bugfixes/TestAtNewWithCountAll.btm</argLine>
+ </configuration>
+ </execution>
<execution>
<id>bugfixes.TestEmptySignature</id>
<phase>integration-test</phase>
@@ -1798,6 +1814,22 @@
</configuration>
</execution>
<!-- bugfixes compiled -->
+ <execution>
+ <id>bugfixes.TestAtNewWithCountAll.compiled</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ <configuration>
+ <forkCount>1</forkCount>
+ <reuseForks>true</reuseForks>
+ <includes>
+ <include>org/jboss/byteman/tests/bugfixes/TestAtNewWithCountAll.class</include>
+ </includes>
+ <argLine>-Dorg.jboss.byteman.compile.to.bytecode -javaagent:${project.build.directory}/byteman-agent-${project.version}.jar=script:${project.build.testOutputDirectory}/scripts/bugfixes/TestAtNewWithCountAll.btm</argLine>
+ </configuration>
+ </execution>
<execution>
<id>bugfixes.TestEmptySignature.compiled</id>
<phase>integration-test</phase>
=====================================
agent/src/main/java/org/jboss/byteman/agent/adapter/NewTriggerAdapter.java
=====================================
@@ -109,10 +109,10 @@ public class NewTriggerAdapter extends RuleTriggerAdapter
@Override
public void visitTypeInsn(int opcode, String type)
{
- if (opcode == Opcodes.NEW && (visitedCount == 0 || visitedCount < count) && matchType(type)) {
+ if (opcode == Opcodes.NEW && (count == 0 || visitedCount < count) && matchType(type)) {
// a relevant invocation occurs in the called method
visitedCount++;
- if(visitedCount == 0 || visitedCount == count) {
+ if(count == 0 || visitedCount == count) {
if(whenComplete) {
// set ready for triggering at the next invokespecial
triggerReady = true;
=====================================
agent/src/test/java/org/jboss/byteman/tests/bugfixes/TestAtNewWithCountAll.java
=====================================
@@ -0,0 +1,78 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2019, Red Hat and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ *
+ * @authors Andrew Dinn
+ */
+
+package org.jboss.byteman.tests.bugfixes;
+
+import java.math.BigInteger;
+import java.util.Random;
+
+import org.jboss.byteman.tests.Test;
+
+public class TestAtNewWithCountAll extends Test {
+ public TestAtNewWithCountAll() {
+ super(TestAtNewWithCountAll.class.getCanonicalName());
+ }
+
+ static Test theTest = null;
+
+ static BigInteger newBigInteger(boolean shouldInflate, Random random) {
+ final BigInteger b;
+ if (shouldInflate) {
+ final byte[] val = new byte[random.nextInt(1024) + 1];
+ b = new BigInteger(val);
+ }
+ else {
+ b = new BigInteger(0, new byte[0]);
+ }
+
+ return b;
+ }
+
+ public void test() {
+ theTest = this;
+
+ Random random = new Random();
+
+ log("calling newBigInteger(true, random)");
+ newBigInteger(true, random);
+ log("called newBigInteger(true, random)");
+ log("calling newBigInteger(false, random)");
+ newBigInteger(false, random);
+ log("called newBigInteger(false, random)");
+
+ checkOutput(true);
+ }
+
+ @Override
+ public String getExpected() {
+ logExpected("calling newBigInteger(true, random)");
+ logExpected("triggered AFTER NEW byte[]");
+ logExpected("triggered AFTER NEW BigInteger");
+ logExpected("called newBigInteger(true, random)");
+ logExpected("calling newBigInteger(false, random)");
+ logExpected("triggered AFTER NEW BigInteger");
+ logExpected("called newBigInteger(false, random)");
+ return super.getExpected();
+ }
+}
=====================================
agent/src/test/resources/scripts/bugfixes/TestAtNewWithCountAll.btm
=====================================
@@ -0,0 +1,44 @@
+##############################################################################
+# JBoss, Home of Professional Open Source
+# Copyright 2020, Red Hat and individual contributors
+# by the @authors tag. See the copyright.txt in the distribution for a
+# full listing of individual contributors.
+#
+# This is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of
+# the License, or (at your option) any later version.
+#
+# This software is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this software; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+#
+# @authors Andrew Dinn
+#
+# Test for BYTEMAN-399. This rule checks that a new constructor with
+# and ALL count is injected at all matching locations
+
+
+RULE test at byte[]
+CLASS TestAtNewWithCountAll
+METHOD newBigInteger
+AFTER NEW byte []
+BIND test : Test = TestAtNewWithCountAll.theTest;
+IF true
+DO test.log("triggered AFTER NEW byte[]");
+ENDRULE
+
+RULE test at new ALL
+CLASS TestAtNewWithCountAll
+METHOD newBigInteger
+AFTER NEW BigInteger ALL
+BIND test : Test = TestAtNewWithCountAll.theTest;
+IF true
+DO test.log("triggered AFTER NEW BigInteger");
+ENDRULE
\ No newline at end of file
=====================================
byteman/pom.xml
=====================================
@@ -7,7 +7,7 @@
<parent>
<groupId>org.jboss.byteman</groupId>
<artifactId>byteman-root</artifactId>
- <version>4.0.11</version>
+ <version>4.0.12</version>
</parent>
<description>
=====================================
contrib/bmunit/pom.xml
=====================================
@@ -32,7 +32,7 @@
<parent>
<groupId>org.jboss.byteman</groupId>
<artifactId>byteman-root</artifactId>
- <version>4.0.11</version>
+ <version>4.0.12</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<build>
=====================================
contrib/bmunit5/pom.xml
=====================================
@@ -32,7 +32,7 @@
<parent>
<groupId>org.jboss.byteman</groupId>
<artifactId>byteman-root</artifactId>
- <version>4.0.11</version>
+ <version>4.0.12</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<build>
=====================================
contrib/dtest/pom.xml
=====================================
@@ -33,7 +33,7 @@
<parent>
<groupId>org.jboss.byteman</groupId>
<artifactId>byteman-root</artifactId>
- <version>4.0.11</version>
+ <version>4.0.12</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
=====================================
contrib/jboss-modules-system/plugin/pom.xml
=====================================
@@ -28,7 +28,7 @@
<parent>
<groupId>org.jboss.byteman</groupId>
<artifactId>byteman-jboss-modules</artifactId>
- <version>4.0.11</version>
+ <version>4.0.12</version>
<relativePath>../pom.xml</relativePath>
</parent>
=====================================
contrib/jboss-modules-system/pom.xml
=====================================
@@ -28,7 +28,7 @@
<parent>
<groupId>org.jboss.byteman</groupId>
<artifactId>byteman-root</artifactId>
- <version>4.0.11</version>
+ <version>4.0.12</version>
<relativePath>../../pom.xml</relativePath>
</parent>
=====================================
contrib/jboss-modules-system/tests/pom.xml
=====================================
@@ -19,7 +19,7 @@
<parent>
<groupId>org.jboss.byteman</groupId>
<artifactId>byteman-jboss-modules</artifactId>
- <version>4.0.11</version>
+ <version>4.0.12</version>
<relativePath>../pom.xml</relativePath>
</parent>
=====================================
contrib/rulecheck-maven-plugin/example/pom.xml
=====================================
@@ -18,7 +18,7 @@
<plugin>
<groupId>org.jboss.byteman</groupId>
<artifactId>byteman-rulecheck-maven-plugin</artifactId>
- <version>4.0.11</version>
+ <version>4.0.12</version>
<executions>
<execution>
<id>rulecheck-test</id>
=====================================
contrib/rulecheck-maven-plugin/pom.xml
=====================================
@@ -32,7 +32,7 @@
<parent>
<groupId>org.jboss.byteman</groupId>
<artifactId>byteman-root</artifactId>
- <version>4.0.11</version>
+ <version>4.0.12</version>
<relativePath>../../pom.xml</relativePath>
</parent>
=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+byteman (4.0.12-1) unstable; urgency=medium
+
+ * New upstream version 4.0.12
+
+ -- Andrius Merkys <merkys at debian.org> Thu, 23 Jul 2020 06:06:35 -0400
+
byteman (4.0.11-1) unstable; urgency=medium
* New upstream version 4.0.11
=====================================
docs/asciidoc/pom.xml
=====================================
@@ -6,7 +6,7 @@
<parent>
<groupId>org.jboss.byteman</groupId>
<artifactId>byteman-docs</artifactId>
- <version>4.0.11</version>
+ <version>4.0.12</version>
</parent>
<artifactId>byteman-asciidoc</artifactId>
=====================================
docs/pom.xml
=====================================
@@ -6,7 +6,7 @@
<parent>
<groupId>org.jboss.byteman</groupId>
<artifactId>byteman-root</artifactId>
- <version>4.0.11</version>
+ <version>4.0.12</version>
</parent>
<artifactId>byteman-docs</artifactId>
=====================================
download/pom.xml
=====================================
@@ -28,7 +28,7 @@
<parent>
<groupId>org.jboss.byteman</groupId>
<artifactId>byteman-root</artifactId>
- <version>4.0.11</version>
+ <version>4.0.12</version>
</parent>
<description>
The Byteman download includes the byteman agent, submit and install jars. the contributed
=====================================
install/pom.xml
=====================================
@@ -33,7 +33,7 @@
<parent>
<groupId>org.jboss.byteman</groupId>
<artifactId>byteman-root</artifactId>
- <version>4.0.11</version>
+ <version>4.0.12</version>
</parent>
<profiles>
=====================================
jigsaw/pom.xml
=====================================
@@ -41,7 +41,7 @@
<parent>
<groupId>org.jboss.byteman</groupId>
<artifactId>byteman-root</artifactId>
- <version>4.0.11</version>
+ <version>4.0.12</version>
</parent>
<properties>
<!-- don't install or deploy this jar, instead use it to
=====================================
layer/pom.xml
=====================================
@@ -36,7 +36,7 @@
<parent>
<groupId>org.jboss.byteman</groupId>
<artifactId>byteman-root</artifactId>
- <version>4.0.11</version>
+ <version>4.0.12</version>
</parent>
<build>
<plugins>
=====================================
pom.xml
=====================================
@@ -33,7 +33,7 @@
into Java application and JVM runtime methods. Its primary purpose is to support execution tracing and fault
injection testing.
</description>
- <version>4.0.11</version>
+ <version>4.0.12</version>
<name>byteman-root</name>
<url>http://www.jboss.org/byteman</url>
=====================================
sample/pom.xml
=====================================
@@ -28,7 +28,7 @@
<parent>
<groupId>org.jboss.byteman</groupId>
<artifactId>byteman-root</artifactId>
- <version>4.0.11</version>
+ <version>4.0.12</version>
</parent>
<description>
The Byteman sample jar contains some example helper classes and auxiliary classes used by the]
=====================================
submit/pom.xml
=====================================
@@ -33,7 +33,7 @@
<parent>
<groupId>org.jboss.byteman</groupId>
<artifactId>byteman-root</artifactId>
- <version>4.0.11</version>
+ <version>4.0.12</version>
</parent>
<build>
<plugins>
=====================================
tests/pom.xml
=====================================
@@ -7,7 +7,7 @@
<parent>
<groupId>org.jboss.byteman</groupId>
<artifactId>byteman-root</artifactId>
- <version>4.0.11</version>
+ <version>4.0.12</version>
</parent>
<description>
@@ -669,6 +669,22 @@
</configuration>
</execution>
<!-- bugfixes -->
+ <execution>
+ <id>bugfixes.TestAtNewWithCountAll</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ <configuration>
+ <forkCount>1</forkCount>
+ <reuseForks>true</reuseForks>
+ <includes>
+ <include>org/jboss/byteman/tests/bugfixes/TestAtNewWithCountAll.class</include>
+ </includes>
+ <argLine>-javaagent:${project.build.directory}/../../byteman/target/byteman-${project.version}.jar=script:${project.build.directory}/../../agent/src/test/resources/scripts/bugfixes/TestAtNewWithCountAll.btm</argLine>
+ </configuration>
+ </execution>
<execution>
<id>bugfixes.TestEmptySignature</id>
<phase>integration-test</phase>
@@ -1169,7 +1185,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
@@ -1742,6 +1758,22 @@
</configuration>
</execution>
<!-- bugfixes compiled -->
+ <execution>
+ <id>bugfixes.TestAtNewWithCountAll.compiled</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ <configuration>
+ <forkCount>1</forkCount>
+ <reuseForks>true</reuseForks>
+ <includes>
+ <include>org/jboss/byteman/tests/bugfixes/TestAtNewWithCountAll.class</include>
+ </includes>
+ <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/TestAtNewWithCountAll.btm</argLine>
+ </configuration>
+ </execution>
<execution>
<id>bugfixes.TestEmptySignature.compiled</id>
<phase>integration-test</phase>
@@ -2203,7 +2235,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>
View it on GitLab: https://salsa.debian.org/java-team/byteman/-/compare/681fd05f62a0dc89416254a711f4a507dd126c53...c5b3788e87ff8ce360e8ac64af760e2176f1ba72
--
View it on GitLab: https://salsa.debian.org/java-team/byteman/-/compare/681fd05f62a0dc89416254a711f4a507dd126c53...c5b3788e87ff8ce360e8ac64af760e2176f1ba72
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20200723/508d3964/attachment.html>
More information about the pkg-java-commits
mailing list