Skip to content

Commit

Permalink
Merge pull request #22 from spdx/libversion
Browse files Browse the repository at this point in the history 
Update SPDX libraries to version 1.1.1
  • Loading branch information
@goneall
goneall authored Oct 9, 2022
2 parents 1bb4147 + f42c632 commit 6c15e19
Show file tree
Hide file tree
Showing 3 changed files with 155 additions and 113 deletions.
34 changes: 34 additions & 0 deletions dependency-check-supress.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd">
<suppress>
<notes><![CDATA[
The feature referenced in the CVE is not used by this software.
file name: guava-28.2-android.jar
]]></notes>
<packageUrl regex="true">^pkg:maven/com\.google\.guava/guava@.*$</packageUrl>
<cve>CVE-2020-8908</cve>
</suppress>
<suppress>
<notes><![CDATA[
The feature referenced in the CVE is not used by this software.
file name: poi-4.1.2.jar
]]></notes>
<packageUrl regex="true">^pkg:maven/org\.apache\.poi/poi@.*$</packageUrl>
<cve>CVE-2022-26336</cve>
</suppress>
<suppress>
<notes><![CDATA[
The feature referenced in the CVE is not used by this software.
file name: poi-ooxml-4.1.2.jar
]]></notes>
<packageUrl regex="true">^pkg:maven/org\.apache\.poi/poi\-ooxml@.*$</packageUrl>
<cve>CVE-2022-26336</cve>
</suppress>
<suppress>
<notes><![CDATA[
file name: poi-ooxml-schemas-4.1.2.jar
]]></notes>
<packageUrl regex="true">^pkg:maven/org\.apache\.poi/poi\-ooxml\-schemas@.*$</packageUrl>
<cve>CVE-2022-26336</cve>
</suppress>
</suppressions>
233 changes: 121 additions & 112 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>org.spdx</groupId>
<artifactId>cdx2spdx</artifactId>
<version>0.0.2-SNAPSHOT</version>
<version>0.1.0-SNAPSHOT</version>
<packaging>jar</packaging>

<name>cdx2spdx</name>
Expand Down Expand Up @@ -55,6 +55,7 @@
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
<sonar.organization>spdx</sonar.organization>
<sonar.projectKey>cdx2spdx</sonar.projectKey>
<dependency-check-maven.version>7.2.1</dependency-check-maven.version>
</properties>
<profiles>
<profile>
Expand Down Expand Up @@ -102,7 +103,7 @@
<dependency>
<groupId>org.spdx</groupId>
<artifactId>java-spdx-library</artifactId>
<version>1.1.0</version>
<version>1.1.1</version>
</dependency>
<dependency>
<groupId>org.cyclonedx</groupId>
Expand All @@ -112,22 +113,22 @@
<dependency>
<groupId>org.spdx</groupId>
<artifactId>spdx-rdf-store</artifactId>
<version>1.1.0</version>
<version>1.1.1</version>
</dependency>
<dependency>
<groupId>org.spdx</groupId>
<artifactId>spdx-jackson-store</artifactId>
<version>1.1.0</version>
<version>1.1.1</version>
</dependency>
<dependency>
<groupId>org.spdx</groupId>
<artifactId>spdx-tagvalue-store</artifactId>
<version>1.1.0</version>
<version>1.1.1</version>
</dependency>
<dependency>
<groupId>org.spdx</groupId>
<artifactId>spdx-spreadsheet-store</artifactId>
<version>1.1.0</version>
<version>1.1.1</version>
</dependency>
</dependencies>
<build>
Expand Down Expand Up @@ -167,116 +168,124 @@
</testResource>
</testResources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<configuration>
<release>11</release>
<encoding>${project.build.sourceEncoding}</encoding>
<showDeprecation>true</showDeprecation>
<showWarnings>true</showWarnings>
<optimize>true</optimize>
</configuration>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<archive>
<manifest>
<mainClass>org.spdx.cdx2spdx.CycloneToSpdx</mainClass>
</manifest>
</archive>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
</configuration>
<executions>
<execution>
<id>make-assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9</version>
<configuration>
<quiet>true</quiet>
<source>8</source>
<javadocExecutable>${env.JAVA_HOME}/bin/javadoc</javadocExecutable>
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>
<executions>
<execution>
<id>attach-javadocs</id>
<configuration>
<additionalparam>${javadoc.opts}</additionalparam>
</configuration>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
<phase>verify</phase>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.spdx</groupId>
<artifactId>spdx-maven-plugin</artifactId>
<version>0.5.5</version>
<plugin>
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
<version>${dependency-check-maven.version}</version>
<configuration>
<suppressionFiles>dependency-check-supress.xml</suppressionFiles>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<configuration>
<release>11</release>
<encoding>${project.build.sourceEncoding}</encoding>
<showDeprecation>true</showDeprecation>
<showWarnings>true</showWarnings>
<optimize>true</optimize>
</configuration>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<archive>
<manifest>
<mainClass>org.spdx.cdx2spdx.CycloneToSpdx</mainClass>
</manifest>
</archive>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
</configuration>
<executions>
<execution>
<id>make-assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9</version>
<configuration>
<quiet>true</quiet>
<source>8</source>
<javadocExecutable>${env.JAVA_HOME}/bin/javadoc</javadocExecutable>
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>
<executions>
<execution>
<id>build-spdx</id>
<phase>prepare-package</phase>
<id>attach-javadocs</id>
<configuration>
<additionalparam>${javadoc.opts}</additionalparam>
</configuration>
<goals>
<goal>createSPDX</goal>
<goal>jar</goal>
</goals>
</execution>
</executions>
<configuration>
<spdxDocumentNamespace>http://spdx.org/spdxdocs/cdx2spdx-{$version}</spdxDocumentNamespace>
<defaultFileCopyright>Copyright (c) 2022 Source Auditor Inc.</defaultFileCopyright>
<defaultFileContributors>
<param>Gary O'Neall</param>
</defaultFileContributors>
<defaultLicenseInformationInFile>Apache-2.0</defaultLicenseInformationInFile>
<defaultFileConcludedLicense>Apache-2.0</defaultFileConcludedLicense>
<defaultFileNotice>Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.</defaultFileNotice>
<licenseDeclared>Apache-2.0</licenseDeclared>
<licenseConcluded>Apache-2.0</licenseConcluded>
<creators>
<param>Person: Gary O'Neall</param>
</creators>
<originator>Organization: Source Auditor Inc.</originator>
</configuration>
</plugin>
</plugins>
</build>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
<phase>verify</phase>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.spdx</groupId>
<artifactId>spdx-maven-plugin</artifactId>
<version>0.6.2</version>
<executions>
<execution>
<id>build-spdx</id>
<phase>prepare-package</phase>
<goals>
<goal>createSPDX</goal>
</goals>
</execution>
</executions>
<configuration>
<spdxDocumentNamespace>http://spdx.org/spdxdocs/cdx2spdx-${version}</spdxDocumentNamespace>
<defaultFileCopyright>Copyright (c) 2022 Source Auditor Inc.</defaultFileCopyright>
<defaultFileContributors>
<param>Gary O'Neall</param>
</defaultFileContributors>
<defaultLicenseInformationInFile>Apache-2.0</defaultLicenseInformationInFile>
<defaultFileConcludedLicense>Apache-2.0</defaultFileConcludedLicense>
<defaultFileNotice>Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.</defaultFileNotice>
<licenseDeclared>Apache-2.0</licenseDeclared>
<licenseConcluded>Apache-2.0</licenseConcluded>
<creators>
<param>Person: Gary O'Neall</param>
</creators>
<originator>Organization: Source Auditor Inc.</originator>
</configuration>
</plugin>
</plugins>
</build>
</project>
1 change: 0 additions & 1 deletion src/main/java/org/spdx/cdx2spdx/CycloneToSpdx.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,6 @@ public static void main(String[] args) {
/**
* @param cycloneDxFilePath
* @param spdxFilePath
* @param warnings
* @throws CycloneConversionException
*/
public static List<String> cycloneDxToSpdx(String cycloneDxFilePath, String spdxFilePath) throws CycloneConversionException {
Expand Down

0 comments on commit 6c15e19

Please sign in to comment.