Skip to content

Commit

Permalink
Merge branch 'master' into montoya
Browse files Browse the repository at this point in the history
# Conflicts:
#	build.gradle
  • Loading branch information
CoreyD97 committed Jan 24, 2023
2 parents 63e833c + bf7fc26 commit 7b57f9a
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
uses: actions/setup-java@v2
with:
distribution: adopt
java-version: '15'
java-version: '17'

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
5 changes: 2 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ plugins {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17


repositories {
mavenCentral()
maven {
Expand All @@ -21,9 +20,9 @@ dependencies {
implementation 'org.elasticsearch.client:elasticsearch-rest-high-level-client:7.15.2'
implementation 'org.apache.httpcomponents:httpclient:4.5.13'
implementation 'org.apache.commons:commons-text:1.10.0'

implementation 'org.apache.logging.log4j:log4j-core:2.19.0'
testCompileOnly files("${System.properties['user.home']}/BurpSuitePro/burpsuite_pro.jar")

testRuntimeOnly files("${System.properties['user.home']}/BurpSuitePro/burpsuite_pro.jar")
}

jar {
Expand Down
9 changes: 8 additions & 1 deletion src/test/java/Test.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
import java.lang.reflect.Method;

public class Test {
public static void main(String[] args) {
burp.StartBurp.main(args);
try {
Method main = Class.forName("burp.StartBurp").getMethod("main", String[].class);
main.invoke(null, (Object) args);
}catch (Exception e){
System.err.println("Cannot start burp. Check the burp jar is correctly included in the classpath.");
}
}
}

0 comments on commit 7b57f9a

Please sign in to comment.