From 9c1077f6aff91e1e296a7dcdfe6379512c5174ed Mon Sep 17 00:00:00 2001 From: Gary O'Neall Date: Wed, 24 Feb 2021 20:00:19 -0800 Subject: [PATCH 1/4] Update POM file for release Signed-off-by: Gary O'Neall --- .github/workflows/maven.yml | 4 ++-- README.md | 13 ++++++++++++- pom.xml | 21 ++++++++++++++++----- 3 files changed, 30 insertions(+), 8 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index c8aeb3a27..74c342fe0 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -16,9 +16,9 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 1.8 + - name: Set up JDK 11 uses: actions/setup-java@v1 with: - java-version: 1.8 + java-version: 11 - name: Build with Maven run: mvn -B package --file pom.xml diff --git a/README.md b/README.md index 06bdd1afd..f8c9a589c 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,17 @@ Most common use of the library would de-serialize an existing SPDX document usi The methods enterCriticalSection and leaveCritialSection are available to support multi-threaded applications. These methods serialize access to the model store for the specific SPDX document used for the SPDX model object. ## Getting Started +The library is available in [Maven Central org.spdx:java-spdx-library](https://search.maven.org/artifact/org.spdx/java-spdx-library). + +If you are using Maven, you can add the following dependency in your POM file: +``` + + org.spdx + java-spdx-library + (,1.0] + +``` + There are a couple of static classes that help common usage scenarios: - org.spdx.library.SPDXModelFactory supports the creation of specific model objects @@ -26,4 +37,4 @@ To update Spdx-Java-Library, the following is a very brief checklist: 4. Update unit tests ## Development Status -Note: This library is in development and likely contains defects. Reviews, suggestions are welcome. Please enter an issue with any suggestions. +Note: This library is mostly stable, but and contains some defects. Reviews, suggestions are welcome. Please enter an issue with any suggestions. diff --git a/pom.xml b/pom.xml index 6eee2dc00..e56883fd0 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.spdx java-spdx-library - 0.0.8-SNAPSHOT + 1.0.0-SNAPSHOT jar java-spdx-library @@ -31,14 +31,14 @@ https://github.com/spdx/Spdx-Java-Library - https://github.com/spdx/Spdx-Java-Library.git - https://github.com/spdx/Spdx-Java-Library.git + scm:git:git://github.com/spdx/Spdx-Java-Library.git + scm:git:git@github.com:spdx/Spdx-Java-Library.git - bintray-spdx-spdx-tools + ossrh spdx-spdx-tools - https://api.bintray.com/maven/spdx/spdx-tools/java-spdx-library/;publish=1 + https://oss.sonatype.org/service/local/staging/deploy/maven2/ @@ -251,6 +251,17 @@ Organization: Linux Foundation + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.7 + true + + ossrh + https://oss.sonatype.org/ + true + + From d8460f52471d88b1f500ec33487782599f3cbf27 Mon Sep 17 00:00:00 2001 From: Gary O'Neall Date: Wed, 24 Feb 2021 20:01:34 -0800 Subject: [PATCH 2/4] [maven-release-plugin] prepare release v1.0.0 --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index e56883fd0..599ba456b 100644 --- a/pom.xml +++ b/pom.xml @@ -1,10 +1,9 @@ - + 4.0.0 org.spdx java-spdx-library - 1.0.0-SNAPSHOT + 1.0.0 jar java-spdx-library @@ -33,7 +32,8 @@ https://github.com/spdx/Spdx-Java-Library scm:git:git://github.com/spdx/Spdx-Java-Library.git scm:git:git@github.com:spdx/Spdx-Java-Library.git - + v1.0.0 + ossrh From 1b79a310131a9974afc63f2ad4d3adbdb0d86174 Mon Sep 17 00:00:00 2001 From: Gary O'Neall Date: Wed, 24 Feb 2021 20:22:59 -0800 Subject: [PATCH 3/4] [maven-release-plugin] prepare for next development iteration --- pom.xml | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 599ba456b..cff895d2a 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ org.spdx java-spdx-library - 1.0.0 + 1.0.1-SNAPSHOT jar java-spdx-library @@ -32,7 +32,7 @@ https://github.com/spdx/Spdx-Java-Library scm:git:git://github.com/spdx/Spdx-Java-Library.git scm:git:git@github.com:spdx/Spdx-Java-Library.git - v1.0.0 + HEAD @@ -251,6 +251,24 @@ Organization: Linux Foundation + + org.apache.maven.plugins + maven-release-plugin + 2.5.3 + + true + false + forked-path + -Dgpg.passphrase=${gpg.passphrase} + + + + org.apache.maven.scm + maven-scm-provider-gitexe + 1.9.5 + + + org.sonatype.plugins nexus-staging-maven-plugin From e572d47202b64ad7f1820d920a6a857bd14dfce5 Mon Sep 17 00:00:00 2001 From: Gary O'Neall Date: Wed, 24 Feb 2021 21:07:53 -0800 Subject: [PATCH 4/4] Update to POM file for Maven repo Signed-off-by: Gary O'Neall --- pom.xml | 39 +++++---------------------------------- 1 file changed, 5 insertions(+), 34 deletions(-) diff --git a/pom.xml b/pom.xml index cff895d2a..92939abfc 100644 --- a/pom.xml +++ b/pom.xml @@ -1,9 +1,10 @@ - + 4.0.0 org.spdx java-spdx-library - 1.0.1-SNAPSHOT + 0.0.8-SNAPSHOT jar java-spdx-library @@ -31,9 +32,8 @@ https://github.com/spdx/Spdx-Java-Library scm:git:git://github.com/spdx/Spdx-Java-Library.git - scm:git:git@github.com:spdx/Spdx-Java-Library.git - HEAD - + scm:git:git@github.com:/spdx/Spdx-Java-Library.git + ossrh @@ -251,35 +251,6 @@ Organization: Linux Foundation - - org.apache.maven.plugins - maven-release-plugin - 2.5.3 - - true - false - forked-path - -Dgpg.passphrase=${gpg.passphrase} - - - - org.apache.maven.scm - maven-scm-provider-gitexe - 1.9.5 - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - ossrh - https://oss.sonatype.org/ - true - -