Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move the OkHttpSender to rewrite-maven tests #4782

Merged
merged 1 commit into from
Dec 13, 2024
Merged

Move the OkHttpSender to rewrite-maven tests #4782

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions rewrite-core/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@ dependencies {

api("org.jspecify:jspecify:latest.release")

// Pinning okhttp while waiting on 5.0.0
// https://github.com/openrewrite/rewrite/issues/1479
compileOnly("com.squareup.okhttp3:okhttp:4.9.3")

implementation("org.apache.commons:commons-compress:latest.release")

implementation("io.micrometer:micrometer-core:1.9.+")
Expand Down
2 changes: 2 additions & 0 deletions rewrite-maven/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ dependencies {
implementation("org.apache.commons:commons-text:latest.release")

testImplementation(project(":rewrite-test"))

testImplementation("com.squareup.okhttp3:okhttp:4.+")
testImplementation("com.squareup.okhttp3:mockwebserver:4.+")
testImplementation("com.squareup.okhttp3:okhttp-tls:4.+")
testImplementation("com.squareup.okio:okio-jvm:3.9.1")
Expand Down
2 changes: 1 addition & 1 deletion rewrite-maven/src/test/java/org/openrewrite/maven/MavenParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
import org.openrewrite.Issue;
import org.openrewrite.ParseExceptionResult;
import org.openrewrite.Parser;
import org.openrewrite.ipc.http.OkHttpSender;
import org.openrewrite.maven.http.OkHttpSender;
import org.openrewrite.maven.internal.MavenParsingException;
import org.openrewrite.maven.tree.*;
import org.openrewrite.test.RewriteTest;
Expand Down
3 changes: 2 additions & 1 deletion ...rg/openrewrite/ipc/http/OkHttpSender.java → .../openrewrite/maven/http/OkHttpSender.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.openrewrite.ipc.http;
package org.openrewrite.maven.http;

import okhttp3.MediaType;
import okhttp3.OkHttpClient;
import okhttp3.RequestBody;
import okhttp3.ResponseBody;
import org.openrewrite.ipc.http.HttpSender;

import java.io.IOException;
import java.io.UncheckedIOException;
Expand Down
2 changes: 1 addition & 1 deletion rewrite-maven/src/test/java/org/openrewrite/maven/internal/MavenPomDownloaderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
import org.openrewrite.*;
import org.openrewrite.ipc.http.HttpSender;
import org.openrewrite.ipc.http.HttpUrlConnectionSender;
import org.openrewrite.ipc.http.OkHttpSender;
import org.openrewrite.maven.http.OkHttpSender;
import org.openrewrite.maven.MavenDownloadingException;
import org.openrewrite.maven.MavenExecutionContextView;
import org.openrewrite.maven.MavenParser;
Expand Down
Loading