Skip to content

Commit

Permalink
Merge pull request #2 from scanoss/SP-272-update-default-urls
Browse files Browse the repository at this point in the history
Update default scanning URIs
  • Loading branch information
eeisegn authored Mar 26, 2024
2 parents 1319053 + 55e2468 commit c87952e
Show file tree
Hide file tree
Showing 11 changed files with 572 additions and 27 deletions.
Binary file added .mvn/wrapper/maven-wrapper.jar
Binary file not shown.
18 changes: 18 additions & 0 deletions .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you 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.
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.1/apache-maven-3.8.1-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Upcoming changes...

## [0.6.0] - 2024-03-26
### Changed
- Updated free default URL to now point to `https://api.osskb.org`
- Updated premium default URL to now point to `https://api.scanoss.com`

## [0.5.5] - 2023-10-25
### Fixed
- Fixed issue with `processFileList` file path
Expand Down Expand Up @@ -63,3 +68,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
[0.5.3]: https://github.com/scanoss/scanoss.java/compare/v0.5.2...v0.5.3
[0.5.4]: https://github.com/scanoss/scanoss.java/compare/v0.5.3...v0.5.4
[0.5.5]: https://github.com/scanoss/scanoss.java/compare/v0.5.4...v0.5.5
[0.6.0]: https://github.com/scanoss/scanoss.java/compare/v0.5.5...v0.6.0
30 changes: 19 additions & 11 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,44 +11,52 @@ help: ## This help

clean: ## Run maven clean
@echo "Running package clean..."
mvn clean
./mvnw clean

test: ## Run package tests
@echo "Running package tests..."
mvn test
./mvnw test

dep_update_check: ## Run maven versions command to check for dependency updates
@echo "Running dependency update check..."
./mvnw versions:display-dependency-updates

dep_use_next_version: ## Run maven to update dependencies to next available version
@echo "Running dependency update check..."
./mvnw versions:use-next-versions

compile: ## Run maven compile goal
@echo "Running package compilation..."
mvn compile
./mvnw compile

verify: ## Run maven verify goal
@echo "Running package verify..."
mvn verify
./mvnw verify

package: ## Run maven package goal
@echo "Running package..."
mvn package
./mvnw package

deploy: ## Deploy the package to central repos
@echo "Deploying latest package..."
mvn deploy
./mvnw deploy

native: ## Run maven native binary build
@echo "Running native package..."
mvn -Pnative -DskipTests package -X
./mvnw -Pnative -DskipTests package -X

inc_patch: ## Increment the patch version on pom.xml
@echo "Incrementing patch version..."
mvn build-helper:parse-version versions:set -DnewVersion='$${parsedVersion.majorVersion}.$${parsedVersion.minorVersion}.$${parsedVersion.nextIncrementalVersion}' versions:commit
./mvnw build-helper:parse-version versions:set -DnewVersion='$${parsedVersion.majorVersion}.$${parsedVersion.minorVersion}.$${parsedVersion.nextIncrementalVersion}' versions:commit

inc_minor: ## Increment the minor version on pom.xml
@echo "Incrementing minor version..."
mvn build-helper:parse-version versions:set -DnewVersion='$${parsedVersion.majorVersion}.$${parsedVersion.nextMinorVersion}.$${parsedVersion.incrementalVersion}' versions:commit
./mvnw build-helper:parse-version versions:set -DnewVersion='$${parsedVersion.majorVersion}.$${parsedVersion.nextMinorVersion}.$${parsedVersion.incrementalVersion}' versions:commit

inc_major: ## Increment the major version on pom.xml
@echo "Incrementing major version..."
mvn build-helper:parse-version versions:set -DnewVersion='$${parsedVersion.nextMajorVersion}.$${parsedVersion.minorVersion}.$${parsedVersion.incrementalVersion}' versions:commit
./mvnw build-helper:parse-version versions:set -DnewVersion='$${parsedVersion.nextMajorVersion}.$${parsedVersion.minorVersion}.$${parsedVersion.incrementalVersion}' versions:commit

version: ## Show the current version of the package
@echo "Getting package version..."
VER=$(shell mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
VER=$(shell ./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Include in a maven project using:
<dependency>
<groupId>com.scanoss</groupId>
<artifactId>scanoss</artifactId>
<version>0.1.0</version>
<version>0.6.0</version>
</dependency>
```

Expand Down
Loading

0 comments on commit c87952e

Please sign in to comment.