Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 7 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,30 +1,31 @@

plugins {
id 'java-gradle-plugin'
id 'com.gradle.plugin-publish' version '0.10.1'
id 'com.gradle.plugin-publish' version '0.12.0'
id 'maven-publish'
}

repositories {
jcenter()
mavenCentral()
mavenLocal()
maven {
url 'https://jitpack.io'
}
}

dependencies {
compile(group: 'org.cyclonedx', name: 'cyclonedx-core-java', version: '3.0.1') {
compile(group: 'org.cyclonedx', name: 'cyclonedx-core-java', version: '3.0.5') {
// gradle-api already includes an slf4j binding
exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl'
}
compile 'commons-codec:commons-codec:1.13'
compile 'commons-io:commons-io:2.6'
compile 'commons-codec:commons-codec:1.15'
compile 'commons-io:commons-io:2.7'
compile 'org.apache.maven:maven-core:3.5.0'
}

group = 'com.cyclonedx'
version = '1.2.0-SNAPSHOT'
version = '1.2.0'

sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
Expand All @@ -42,7 +43,7 @@ pluginBundle {
gradlePlugin {
plugins {
cycloneDxPlugin {
id = 'org.cyclonedx.bom'
id = 'com.cyclonedx.bom'
displayName = 'CycloneDX BOM Generator'
description = 'The CycloneDX Gradle plugin creates an aggregate of all direct and transitive dependencies of a project and creates a valid CycloneDX bill-of-materials document from the results. CycloneDX is a lightweight BOM specification that is easily created, human readable, and simple to parse.'
implementationClass = 'org.cyclonedx.gradle.CycloneDxPlugin'
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@

<modelVersion>4.0.0</modelVersion>

<groupId>org.cyclonedx</groupId>
<groupId>com.cyclonedx</groupId>
<artifactId>cyclonedx-gradle-plugin</artifactId>
<packaging>jar</packaging>
<version>1.2.0-SNAPSHOT</version>
<version>1.2.0</version>

<name>CycloneDX Gradle Plugin</name>
<description>The CycloneDX Gradle plugin creates an aggregate of all direct and transitive dependencies of a project and creates a valid CycloneDX bill-of-materials document from the results. CycloneDX is a lightweight BOM specification that is easily created, human readable, and simple to parse.</description>
Expand Down
1 change: 1 addition & 0 deletions src/main/java/org/cyclonedx/gradle/CycloneDxTask.java
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,7 @@ private Component.Type resolveProjectType() {

private Component convertArtifact(ResolvedArtifact artifact) {
final Component component = new Component();
getLogger().debug("convertArtifact: working on " + artifact.getModuleVersion().getId().getName());
component.setGroup(artifact.getModuleVersion().getId().getGroup());
component.setName(artifact.getModuleVersion().getId().getName());
component.setVersion(artifact.getModuleVersion().getId().getVersion());
Expand Down
2 changes: 1 addition & 1 deletion src/test/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'org.cyclonedx.bom' version '1.1.0' apply true
id 'org.cyclonedx.bom' version '1.2.0' apply true
}

apply plugin: 'java'
Expand Down
2 changes: 1 addition & 1 deletion src/test/settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ pluginManagement {
resolutionStrategy {
eachPlugin {
if (requested.id.toString() == 'org.cyclonedx.bom') {
useModule('org.cyclonedx:cyclonedx-gradle-plugin:1.1.0')
useModule('org.cyclonedx:cyclonedx-gradle-plugin:1.2.0')
}
}
}
Expand Down