Skip to content

Commit

Permalink
Merge branch 'features/argo-cd-dev' of github.com:mercedes-benz/manag…
Browse files Browse the repository at this point in the history
…ed-identity-wallet into features/argo-cd-dev
  • Loading branch information
DominikPinsel committed Oct 13, 2023
2 parents c9f8c96 + b7ece91 commit ae6ec5a
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
7 changes: 2 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,8 @@ build
!.idea/dictionaries/*
!.idea/copyright
!.idea/copyright/*
!.idea/codeStyles
!.idea/codeStyles/*
!.idea/icon.png


out
*.iml
.vscode
Expand All @@ -39,8 +38,6 @@ out
*.releaseBackup
release.properties

# eclipse dash license library, downloaded from /scripts/update-dependencies_file.sh
org.eclipse.dash.licenses-1.0.3-*.jar

local.properties
*.swp
Expand Down
2 changes: 1 addition & 1 deletion .releaserc
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
[
"@semantic-release/exec",
{
"prepareCmd": "./gradlew dashLicenseCheck && (grep -q rejected DEPENDENCIES && exit 1 || exit 0)"
"prepareCmd": "./gradlew dashLicenseCheck"
}
],
"@semantic-release/release-notes-generator",
Expand Down
2 changes: 2 additions & 0 deletions DEPENDENCIES
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,8 @@ maven/mavencentral/javax.activation/javax.activation-api/1.2.0, (CDDL-1.1 OR GPL
maven/mavencentral/javax.xml.bind/jaxb-api/2.3.1, CDDL-1.1 OR GPL-2.0-only WITH Classpath-exception-2.0, approved, CQ16911
maven/mavencentral/joda-time/joda-time/2.12.5, Apache-2.0, approved, clearlydefined
maven/mavencentral/junit/junit/4.13.2, EPL-2.0, approved, CQ23636
maven/mavencentral/love.forte.simbot/simbot-logger-jvm/3.3.0, , restricted, clearlydefined
maven/mavencentral/love.forte.simbot/simbot-logger/3.3.0, , restricted, clearlydefined
maven/mavencentral/net.bytebuddy/byte-buddy-agent/1.14.5, Apache-2.0, approved, #7164
maven/mavencentral/net.bytebuddy/byte-buddy/1.14.5, Apache-2.0 AND BSD-3-Clause, approved, #7163
maven/mavencentral/net.i2p.crypto/eddsa/0.3.0, CC0-1.0, approved, CQ22537
Expand Down

0 comments on commit ae6ec5a

Please sign in to comment.