Skip to content

Commit f853116

Browse files
authored
Merge pull request #220 from marklogic/feature/dhf
MLE-12345 Fixing weird plugin classpath issue
2 parents 9c0696d + 66d6013 commit f853116

File tree

8 files changed

+18
-353
lines changed

8 files changed

+18
-353
lines changed

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ pipeline{
2424
export JAVA_HOME=$JAVA_HOME_DIR
2525
export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
2626
export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
27-
cd kafka-connector/test-app
27+
cd kafka-connector
2828
./gradlew hubInit
2929
./gradlew mlDeploy -PmlPassword=admin
3030
'''

build.gradle

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,19 @@
1+
buildscript {
2+
repositories {
3+
mavenCentral()
4+
}
5+
dependencies {
6+
// Add jaxen to buildscript classpath to prevent NoClassDefFoundError when shadow plugin interferes with
7+
// ml-data-hub plugin execution. It is not yet known why the shadow plugin causes this problem or why it's
8+
// specific to the jaxen library, but this resolves the problem.
9+
classpath 'jaxen:jaxen:2.0.0'
10+
}
11+
}
12+
113
plugins {
214
id 'java'
315
id 'net.saliman.properties' version '1.5.2'
4-
id 'com.gradleup.shadow' version '8.3.4'
16+
id 'com.gradleup.shadow' version '9.2.2'
517

618
// Only used for testing
719
id 'jacoco'

settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
rootProject.name = 'kafka-connect-marklogic'
2-
2+
include "test-app"

test-app/.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
src/main/hub-internal-config
22
src/main/entity-config
3+
gradle
4+
gradlew
5+
gradlew.bat
-58.1 KB
Binary file not shown.

test-app/gradle/wrapper/gradle-wrapper.properties

Lines changed: 0 additions & 5 deletions
This file was deleted.

test-app/gradlew

Lines changed: 0 additions & 251 deletions
This file was deleted.

test-app/gradlew.bat

Lines changed: 0 additions & 94 deletions
This file was deleted.

0 commit comments

Comments
 (0)