Merge branch 'develop' into fix/NR-140814

newrelic · Nov 29, 2023 · b3a71db · b3a71db
2 parents f52ffd1 + 41609a7
commit b3a71db
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 34 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -4,7 +4,7 @@ Noteworthy changes to the agent are documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [1.0.6-public-preview] - 2023-10-19
+## [1.0.6-public-preview] - 2023-10-17
 ### Changes
 - Cassandra DB v3.0+ Support: The Security agent now supports Cassandra DB version 3.0 and above
 - HttpClient v5.0+ Support: The Security agent now also supports HttpClient version 5.0 and above

diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 # The agent version.
-agentVersion=1.0.6
+agentVersion=1.0.7
 jsonVersion=1.1.0
 # Updated exposed NR APM API version.
 nrAPIVersion=8.3.0

diff --git a/...-security/java-io-inputstream-jdk8/src/main/java/java/io/InputStream_Instrumentation.java b/...-security/java-io-inputstream-jdk8/src/main/java/java/io/InputStream_Instrumentation.java
@@ -9,7 +9,7 @@
 import com.newrelic.api.agent.security.NewRelicSecurity;
 import com.newrelic.api.agent.security.instrumentation.helpers.GenericHelper;
 import com.newrelic.api.agent.weaver.*;
-import com.newrelic.agent.security.instrumentation.javaio.InputStreamHelper;
+import com.newrelic.api.agent.security.instrumentation.helpers.InputStreamHelper;
 
 @Weave(type = MatchType.BaseClass, originalName = "java.io.InputStream")
 public abstract class InputStream_Instrumentation {

diff --git a/...9/src/main/java/com/newrelic/agent/security/instrumentation/javaio/InputStreamHelper.java b/...9/src/main/java/com/newrelic/agent/security/instrumentation/javaio/InputStreamHelper.java
diff --git a/...va/com/newrelic/agent/security/instrumentation/javaio/io/InputStream_Instrumentation.java b/...va/com/newrelic/agent/security/instrumentation/javaio/io/InputStream_Instrumentation.java
@@ -8,8 +8,8 @@
 package com.newrelic.agent.security.instrumentation.javaio.io;
 import com.newrelic.api.agent.security.NewRelicSecurity;
 import com.newrelic.api.agent.security.instrumentation.helpers.GenericHelper;
+import com.newrelic.api.agent.security.instrumentation.helpers.InputStreamHelper;
 import com.newrelic.api.agent.weaver.*;
-import com.newrelic.agent.security.instrumentation.javaio.InputStreamHelper;
 import java.io.IOException;
 
 @Weave(type = MatchType.BaseClass, originalName = "java.io.InputStream")

diff --git a/instrumentation-security/r2dbc-oracle/build.gradle b/instrumentation-security/r2dbc-oracle/build.gradle
@@ -10,7 +10,7 @@ jar {
 }
 
 verifyInstrumentation {
-    passesOnly 'com.oracle.database.r2dbc:oracle-r2dbc:[0.0.0,1.1.2)'
+    passesOnly 'com.oracle.database.r2dbc:oracle-r2dbc:[0.0.0,)'
 }
 
 //java {

diff --git a/...rumentation/javaio/InputStreamHelper.java → ...umentation/helpers/InputStreamHelper.java b/...rumentation/javaio/InputStreamHelper.java → ...umentation/helpers/InputStreamHelper.java
@@ -1,4 +1,4 @@
-package com.newrelic.agent.security.instrumentation.javaio;
+package com.newrelic.api.agent.security.instrumentation.helpers;
 
 import com.newrelic.api.agent.security.NewRelicSecurity;