Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(ci): check dependency licenses #460

Merged
merged 2 commits into from
Oct 26, 2022
Merged

chore(ci): check dependency licenses #460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a126aeb
chore(ci): check dependency licenses
bednar Oct 26, 2022
c952d0d
docs: update CHANGELOG.md
bednar Oct 26, 2022
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
19 changes: 19 additions & 0 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,23 @@ jobs:
name: "Check dependency rules"
command: mvn enforcer:enforce -Drules=banDuplicatePomDependencyVersions,dependencyConvergence

check-licenses:
parameters:
maven-image:
type: string
default: *default-maven-image
docker:
- image: << parameters.maven-image >>
steps:
- checkout
- restore_cache:
name: Restoring Maven Cache
keys:
- maven-cache_v3-<< parameters.maven-image >>-
- run:
name: "Check dependency licenses"
command: mvn license:check -Dlicense.dependencies.enforce=true

check-generate-site:
parameters:
maven-image:
Expand Down Expand Up @@ -232,6 +249,7 @@ workflows:
jobs:
- check-dependencies
- check-generate-site
- check-licenses
- tests-java:
name: jdk-8
- tests-java:
Expand All @@ -256,6 +274,7 @@ workflows:
requires:
- check-dependencies
- check-generate-site
- check-licenses
- jdk-8
- jdk-11
- jdk-17
Expand Down
4 changes: 3 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@
### Bug Fixes
1. [#459](https://github.com/influxdata/influxdb-client-java/pull/459): Fix support for InfluxDB 1.8.x in InfluxQLQueryAPI

### Dependencies
### CI
1. [#460](https://github.com/influxdata/influxdb-client-java/pull/460): Check dependency licenses

### Dependencies
1. [#446](https://github.com/influxdata/influxdb-client-java/pull/446): Remove `gson-fire`

Update dependencies:
Expand Down
44 changes: 43 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,48 @@
<properties>
<organizationName>${project.organization.name}</organizationName>
</properties>
<dependencyPolicies>
<dependencyPolicy>
<type>LICENSE_NAME</type>
<rule>APPROVE</rule>
<value>The MIT License (MIT)</value>
</dependencyPolicy>
<dependencyPolicy>
<type>LICENSE_NAME</type>
<rule>APPROVE</rule>
<value>The MIT License</value>
</dependencyPolicy>
<dependencyPolicy>
<type>LICENSE_NAME</type>
<rule>APPROVE</rule>
<value>Apache-2.0</value>
</dependencyPolicy>
<dependencyPolicy>
<type>LICENSE_URL</type>
<rule>APPROVE</rule>
<value>http://www.apache.org/licenses/LICENSE-2.0.txt</value>
</dependencyPolicy>
<dependencyPolicy>
<type>LICENSE_URL</type>
<rule>APPROVE</rule>
<value>https://www.apache.org/licenses/LICENSE-2.0.txt</value>
</dependencyPolicy>
<dependencyPolicy>
<type>LICENSE_URL</type>
<rule>APPROVE</rule>
<value>https://www.apache.org/licenses/LICENSE-2.0</value>
</dependencyPolicy>
<dependencyPolicy>
<type>LICENSE_URL</type>
<rule>APPROVE</rule>
<value>http://opensource.org/licenses/BSD-3-Clause</value>
</dependencyPolicy>
<dependencyPolicy>
<type>LICENSE_URL</type>
<rule>APPROVE</rule>
<value>https://www.eclipse.org/legal/epl-v20.html</value>
</dependencyPolicy>
</dependencyPolicies>
</configuration>
<executions>
<execution>
Expand Down Expand Up @@ -375,7 +417,7 @@
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>4.1</version>
<version>4.2.rc2</version>
</plugin>

<plugin>
Expand Down