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.

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

Merging develop to master #40

Merged
merged 71 commits into from
Dec 14, 2023
Merged

Merging develop to master #40

merged 71 commits into from
Dec 14, 2023

Conversation

bertysentry
Copy link
Member

In the process of restructuring branches to use main only, instead of old Gitflow

bertysentry and others added 30 commits July 20, 2023 18:37
Merge master back to develop
…SNAPSHOT

Update version to 2.1.00-SNAPSHOT and upgrade Maven plugins
Bumps [advanced-security/maven-dependency-submission-action](https://github.com/advanced-security/maven-dependency-submission-action) from 2.0.0 to 3.0.2.
- [Release notes](https://github.com/advanced-security/maven-dependency-submission-action/releases)
- [Commits](advanced-security/maven-dependency-submission-action@571e99a...c5ad0fd)

---
updated-dependencies:
- dependency-name: advanced-security/maven-dependency-submission-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps org.sonatype.plugins:nexus-staging-maven-plugin from 1.6.7 to 1.6.13.

---
updated-dependencies:
- dependency-name: org.sonatype.plugins:nexus-staging-maven-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
…ype.plugins-nexus-staging-maven-plugin-1.6.13

Bump org.sonatype.plugins:nexus-staging-maven-plugin from 1.6.7 to 1.6.13
…advanced-security/maven-dependency-submission-action-3.0.2

Bump advanced-security/maven-dependency-submission-action from 2.0.0 to 3.0.2
Bumps [org.apache.maven.plugins:maven-gpg-plugin](https://github.com/apache/maven-gpg-plugin) from 1.6 to 3.1.0.
- [Commits](apache/maven-gpg-plugin@maven-gpg-plugin-1.6...maven-gpg-plugin-3.1.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-gpg-plugin
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
bertysentry and others added 28 commits July 28, 2023 17:40
…a-strings

Added support for octal (`"\033"`) and hexa (`"\x1B"`) strings
…gs-AwkParser

Code clean-up: Fixed warnings in AwkParser
Removed unnecessary logback.xml
…-warnings

Code clean-up: Fixed remaining warnings
…ompiler-classes

Clean up: removed remaining AWK compiling logic
…lgpl

Change license to LGPL for the library, add headers
Moved license files, and clarified GPL vs LGPL in CONTRIBUTING.md
…rysoftware

Refactored package to be org.sentrysoftware instead of org.jawk
Use Printf4J library instead of inline functions
@bertysentry bertysentry merged commit 5a723ce into master Dec 14, 2023
3 checks passed
@bertysentry bertysentry deleted the develop branch December 14, 2023 22:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant