Skip to content

Commit 96cf1e6

Browse files
jhanders34jhanders34
authored
Merge pull request #6279 from OpenLiberty/revert-6274-global-oss-index
Revert "Globally apply ossindex plugin to all non-test projects"
2 parents f081811 + 4348aac commit 96cf1e6

File tree

626 files changed

+3799
-28
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

626 files changed

+3799
-28
lines changed

‎dev/build.gradle‎

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,21 @@
1313
*
1414
* Depends on bnd_* values from gradle.properties.
1515
*/
16+
17+
1618
ext {
1719
cnf = rootProject.project(bnd_cnf)
1820
buildImage = project(':build.image')
1921
}
2022

23+
2124
subprojects {
22-
apply plugin: 'java'
25+
plugins.apply 'java'
2326

2427
def bndProject = bndWorkspace.getProject(name)
2528

2629
if (bndProject != null) {
27-
apply plugin: 'biz.aQute.bnd'
30+
plugins.apply 'biz.aQute.bnd'
2831
} else {
2932
task publish { }
3033
task release { }
@@ -64,13 +67,6 @@ subprojects {
6467

6568
if (bndis('fat.project')) {
6669
apply from: cnf.file('gradle/scripts/fat.gradle')
67-
} else if (!bndis('test.project')) {
68-
// Automatically apply OSS Audit plugin to all non-test projects
69-
apply plugin: 'net.ossindex.audit'
70-
audit {
71-
group = "verification"
72-
failOnError = true
73-
}
7470
}
7571

7672
}
@@ -118,9 +114,4 @@ task wrapper(type: Wrapper) {
118114
jarFile = rootProject.file('.gradle-wrapper/gradle-wrapper.jar')
119115
}
120116

121-
// Ensure the root project has the 'audit' task so it shows up in the output of `./gradlew tasks`
122-
task audit {
123-
group = "verification"
124-
}
125-
126117

‎dev/com.ibm.jbatch.container/build.gradle‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
plugins {
2+
id "net.ossindex.audit" version "0.3.8-beta"
3+
}
4+
audit {
5+
failOnError = true
6+
}

‎dev/com.ibm.jbatch.jsl.model/build.gradle‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
plugins {
2+
id "net.ossindex.audit" version "0.3.8-beta"
3+
}
4+
audit {
5+
failOnError = true
6+
}

‎dev/com.ibm.jbatch.spi/build.gradle‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
plugins {
2+
id "net.ossindex.audit" version "0.3.8-beta"
3+
}
4+
audit {
5+
failOnError = true
6+
}

‎dev/com.ibm.json4j/build.gradle‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
plugins {
2+
id "net.ossindex.audit" version "0.3.8-beta"
3+
}
4+
audit {
5+
failOnError = true
6+
}

‎dev/com.ibm.rls.jdbc/build.gradle‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
plugins {
2+
id "net.ossindex.audit" version "0.3.8-beta"
3+
}
4+
audit {
5+
failOnError = true
6+
}

‎dev/com.ibm.tx.core/build.gradle‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
plugins {
2+
id "net.ossindex.audit" version "0.3.8-beta"
3+
}
4+
audit {
5+
failOnError = true
6+
}

‎dev/com.ibm.tx.jta/build.gradle‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
plugins {
2+
id "net.ossindex.audit" version "0.3.8-beta"
3+
}
4+
audit {
5+
failOnError = true
6+
}

‎dev/com.ibm.tx.ltc/build.gradle‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
plugins {
2+
id "net.ossindex.audit" version "0.3.8-beta"
3+
}
4+
audit {
5+
failOnError = true
6+
}

‎dev/com.ibm.tx.util/build.gradle‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
plugins {
2+
id "net.ossindex.audit" version "0.3.8-beta"
3+
}
4+
audit {
5+
failOnError = true
6+
}

0 commit comments

Comments
 (0)