Skip to content

Commit ce70421

Browse files
jbachorikjbachorik
committed
Merge release-1.3
2 parents 6e1151d + e7e6e1e commit ce70421

8 files changed

Lines changed: 18 additions & 18 deletions

File tree

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,5 @@ junit*
3333
CHANGELOG.md
3434
gradle.properties
3535
/.nb-gradle/
36-
/.nb-gradle-properties
36+
/.nb-gradle-properties
37+
.github_changelog_generator

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
A safe, dynamic tracing tool for the Java platform
66

77
## Version
8-
1.3.10.1 ([Release Page](https://github.com/jbachorik/btrace/releases/latest))
8+
1.3.10.2 ([Release Page](https://github.com/jbachorik/btrace/releases/latest))
99

1010
## Quick Summary
1111
BTrace is a safe, dynamic tracing tool for the Java platform.

‎benchmark/maven/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,17 +53,17 @@ questions.
5353
<dependency>
5454
<groupId>com.sun.tools.btrace</groupId>
5555
<artifactId>btrace-client</artifactId>
56-
<version>1.4-SNAPSHOT</version>
56+
<version>1.3.6</version>
5757
</dependency>
5858
<dependency>
5959
<groupId>com.sun.tools.btrace</groupId>
6060
<artifactId>btrace-agent</artifactId>
61-
<version>1.4-SNAPSHOT</version>
61+
<version>1.3.6</version>
6262
</dependency>
6363
<dependency>
6464
<groupId>com.sun.tools.btrace</groupId>
6565
<artifactId>btrace-boot</artifactId>
66-
<version>1.4-SNAPSHOT</version>
66+
<version>1.3.6</version>
6767
</dependency>
6868
<dependency>
6969
<groupId>sun.jdk</groupId>

‎benchmark/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,17 +53,17 @@ questions.
5353
<dependency>
5454
<groupId>com.sun.tools.btrace</groupId>
5555
<artifactId>btrace-client</artifactId>
56-
<version>1.3.9-unravel-1705</version>
56+
<version>1.3.10</version>
5757
</dependency>
5858
<dependency>
5959
<groupId>com.sun.tools.btrace</groupId>
6060
<artifactId>btrace-agent</artifactId>
61-
<version>1.3.9-unravel-1705</version>
61+
<version>1.3.10</version>
6262
</dependency>
6363
<dependency>
6464
<groupId>com.sun.tools.btrace</groupId>
6565
<artifactId>btrace-boot</artifactId>
66-
<version>1.3.9-unravel-1705</version>
66+
<version>1.3.10</version>
6767
</dependency>
6868
<dependency>
6969
<groupId>sun.jdk</groupId>

‎build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ if (!currentJvm.toString().startsWith("1.7")) {
2828
}
2929

3030
group 'com.sun.tools.btrace'
31-
version = '1.3.9-unravel-2010'
31+
version = '1.3.10.2'
3232
description = 'BTrace - a safe, dynamic tracing tool for the Java platform'
3333

3434
sourceCompatibility = 7
@@ -500,4 +500,4 @@ jacocoTestReport {
500500
}
501501
}
502502

503-
check.dependsOn jacocoTestReport
503+
check.dependsOn jacocoTestReport

‎make/build.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@ docs.dir=${project.dir}/docs
2828
samples.dir=${project.dir}/samples
2929
dist.dir=${project.dir}/dist
3030
junit.jar=${test.lib.dir}/junit-4.6.jar
31-
release.version=1.4-SNAPSHOT
32-
asm.version=5.0.4
31+
release.version=1.3.10.2
32+
asm.version=5.2
3333
maven.repo.local=../build/maven

‎make/build.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
</condition>
3737
</target>
3838
<target name="initialize.maven" depends="prepare">
39-
<setproxy proxyhost="emea-proxy.uk.oracle.com" proxyport="80"/>
4039
<get
4140
src="http://apache.petsads.us/maven/ant-tasks/2.1.3/binaries/maven-ant-tasks-2.1.3.jar"
4241
dest="${build.dir}/maven-ant-tasks-2.1.3.jar"

‎samples/JdbcQueries.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
* different types of aggregation function.
4242
* <p>
4343
*
44-
* @author Christian Glencross
44+
* @author Christian Glencross
4545
*/
4646
@BTrace
4747
public class JdbcQueries {
@@ -70,7 +70,7 @@ public class JdbcQueries {
7070

7171
/**
7272
* If "--stack" is passed on command line, print the Java stack trace of the JDBC statement.
73-
*
73+
*
7474
* Otherwise we print the SQL.
7575
*/
7676
private static boolean useStackTrace = Sys.$(2) != null && Strings.strcmp("--stack", Sys.$(2)) == 0;
@@ -80,7 +80,7 @@ public class JdbcQueries {
8080

8181
/**
8282
* Capture SQL used to create prepared statements.
83-
*
83+
*
8484
* @param args
8585
* the list of method parameters. args[1] is the SQL.
8686
*/
@@ -91,7 +91,7 @@ public static void onPrepare(AnyType[] args) {
9191

9292
/**
9393
* Cache SQL associated with a prepared statement.
94-
*
94+
*
9595
* @param arg
9696
* the return value from the prepareXxx() method.
9797
*/
@@ -109,7 +109,7 @@ public static void onPrepareReturn(@Return Statement preparedStatement) {
109109
// Otherwise the SQL is in the first argument.
110110

111111
@OnMethod(clazz = "+java.sql.Statement", method = "/execute($|Update|Query|Batch)/")
112-
public static void onExecute(@Self Object currentStatement, AnyType[] args) {
112+
public static void onExecute(@Self Statement currentStatement, AnyType[] args) {
113113
if (args.length == 0) {
114114
// No SQL argument; lookup the SQL from the prepared statement
115115
executingStatement = Collections.get(preparedStatementDescriptions, (Statement) currentStatement);

0 commit comments

Comments
 (0)