Skip to content

Commit 4fd023a

Browse files
committed
Merge branch 'develop' into update-from-template-github_com_xdev-software_standard-maven-template_master-merged
2 parents 577b3a4 + 9f3885c commit 4fd023a

18 files changed

Lines changed: 401 additions & 302 deletions

File tree

‎.github/ISSUE_TEMPLATE/bug_report.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ body:
1515
attributes:
1616
label: "Checklist"
1717
options:
18-
- label: "I am able to reproduce the bug with the [latest version](https://github.com/xdev-software/template-placeholder/releases/latest)"
18+
- label: "I am able to reproduce the bug with the [latest version](https://github.com/xdev-software/thread-origin-agent/releases/latest)"
1919
required: true
20-
- label: "I made sure that there are *no existing issues* - [open](https://github.com/xdev-software/template-placeholder/issues) or [closed](https://github.com/xdev-software/template-placeholder/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
20+
- label: "I made sure that there are *no existing issues* - [open](https://github.com/xdev-software/thread-origin-agent/issues) or [closed](https://github.com/xdev-software/thread-origin-agent/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
2121
required: true
2222
- label: "I have taken the time to fill in all the required details. I understand that the bug report will be dismissed otherwise."
2323
required: true

‎.github/ISSUE_TEMPLATE/enhancement.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ body:
1313
attributes:
1414
label: "Checklist"
1515
options:
16-
- label: "I made sure that there are *no existing issues* - [open](https://github.com/xdev-software/template-placeholder/issues) or [closed](https://github.com/xdev-software/template-placeholder/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
16+
- label: "I made sure that there are *no existing issues* - [open](https://github.com/xdev-software/thread-origin-agent/issues) or [closed](https://github.com/xdev-software/thread-origin-agent/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
1717
required: true
1818
- label: "I have taken the time to fill in all the required details. I understand that the feature request will be dismissed otherwise."
1919
required: true

‎.github/ISSUE_TEMPLATE/question.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ body:
1212
attributes:
1313
label: "Checklist"
1414
options:
15-
- label: "I made sure that there are *no existing issues* - [open](https://github.com/xdev-software/template-placeholder/issues) or [closed](https://github.com/xdev-software/template-placeholder/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
15+
- label: "I made sure that there are *no existing issues* - [open](https://github.com/xdev-software/thread-origin-agent/issues) or [closed](https://github.com/xdev-software/thread-origin-agent/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
1616
required: true
1717
- label: "I have taken the time to fill in all the required details. I understand that the question will be dismissed otherwise."
1818
required: true

‎.github/workflows/check-build.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ on:
2020
- 'assets/**'
2121

2222
env:
23-
DEMO_MAVEN_MODULE: ${{ github.event.repository.name }}-demo
23+
PRIMARY_MAVEN_MODULE: ${{ github.event.repository.name }}
2424

2525
jobs:
2626
build:
@@ -68,11 +68,11 @@ jobs:
6868
exit 1
6969
fi
7070
71-
- name: Upload demo files
71+
- name: Upload files
7272
uses: actions/upload-artifact@v7
7373
with:
74-
name: demo-files-java-${{ matrix.java }}
75-
path: ${{ env.DEMO_MAVEN_MODULE }}/target/${{ env.DEMO_MAVEN_MODULE }}.jar
74+
name: files-java-${{ matrix.java }}
75+
path: ${{ env.PRIMARY_MAVEN_MODULE }}/target/${{ env.PRIMARY_MAVEN_MODULE }}-*.jar
7676
if-no-files-found: error
7777

7878
checkstyle:

‎.github/workflows/release.yml‎

Lines changed: 13 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -101,16 +101,9 @@ jobs:
101101
See [Changelog#v${{ steps.version.outputs.release }}](https://github.com/${{ github.repository }}/blob/develop/CHANGELOG.md#${{ steps.version.outputs.releasenumber }}) for more information.
102102
103103
## Installation
104-
Add the following lines to your pom:
105-
```XML
106-
<dependency>
107-
<groupId>software.xdev</groupId>
108-
<artifactId>${{ env.PRIMARY_MAVEN_MODULE }}</artifactId>
109-
<version>${{ steps.version.outputs.release }}</version>
110-
</dependency>
111-
```
112-
113-
publish-maven:
104+
Download the javaagent from the assets section below and [attach it to your java application](https://github.com/xdev-software/thread-origin-agent#usage).
105+
106+
publish-assets:
114107
runs-on: ubuntu-latest
115108
needs: [prepare-release]
116109
timeout-minutes: 60
@@ -125,39 +118,20 @@ jobs:
125118
126119
- name: Set up JDK
127120
uses: actions/setup-java@v5
128-
with: # running setup-java overwrites the settings.xml
129-
distribution: 'temurin'
121+
with:
130122
java-version: '17'
131-
server-id: github-central
132-
server-password: PACKAGES_CENTRAL_TOKEN
133-
gpg-passphrase: MAVEN_GPG_PASSPHRASE
134-
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Only import once
135-
136-
- name: Publish to GitHub Packages Central
137-
run: ../mvnw -B deploy -P publish -DskipTests -DaltDeploymentRepository=github-central::https://maven.pkg.github.com/xdev-software/central
138-
working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
139-
env:
140-
PACKAGES_CENTRAL_TOKEN: ${{ secrets.PACKAGES_CENTRAL_TOKEN }}
141-
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
142-
143-
- name: Set up JDK
144-
uses: actions/setup-java@v5
145-
with: # running setup-java again overwrites the settings.xml
146123
distribution: 'temurin'
147-
java-version: '17'
148-
server-id: sonatype-central-portal
149-
server-username: MAVEN_CENTRAL_USERNAME
150-
server-password: MAVEN_CENTRAL_TOKEN
151-
gpg-passphrase: MAVEN_GPG_PASSPHRASE
152124

153-
- name: Publish to Central Portal
154-
run: ../mvnw -B deploy -P publish,publish-sonatype-central-portal -DskipTests
155-
env:
156-
MAVEN_CENTRAL_USERNAME: ${{ secrets.SONATYPE_MAVEN_CENTRAL_PORTAL_USERNAME }}
157-
MAVEN_CENTRAL_TOKEN: ${{ secrets.SONATYPE_MAVEN_CENTRAL_PORTAL_TOKEN }}
158-
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
125+
- name: Build
126+
run: ../mvnw -B clean package -DskipTests
159127
working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
160128

129+
- name: Upload Assets
130+
uses: shogo82148/actions-upload-release-asset@8f6863c6c894ba46f9e676ef5cccec4752723c1e # v1
131+
with:
132+
upload_url: ${{ needs.prepare-release.outputs.upload_url }}
133+
asset_path: ${{ env.PRIMARY_MAVEN_MODULE }}/target/${{ env.PRIMARY_MAVEN_MODULE }}-*.jar
134+
161135
publish-pages:
162136
runs-on: ubuntu-latest
163137
needs: [prepare-release]
@@ -199,7 +173,7 @@ jobs:
199173

200174
after-release:
201175
runs-on: ubuntu-latest
202-
needs: [publish-maven]
176+
needs: [publish-assets]
203177
timeout-minutes: 10
204178
steps:
205179
- uses: actions/checkout@v6

‎.github/workflows/test-deploy.yml‎

Lines changed: 0 additions & 49 deletions
This file was deleted.

‎.run/Run Demo.run.xml‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎CHANGELOG.md‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# 1.1.1
2+
* Updated dependencies
3+
4+
# 1.1.0
5+
* Add option to log caller threads #11 (@3nol)
6+
* Updated dependencies
7+
8+
# 1.0.1
9+
* Reword and improve logging
10+
* Can now monitor classes that extend from Thread
11+
* ``Thread#join`` is no longer logged by default. Can be enabled using ``-DTOA_LOG_THREAD_JOINS``
12+
* Method instrumentation failures can be displayed using ``-DTOA_DISPLAY_METHOD_INSTRUMENTATION_FAILURES``
13+
14+
# 1.0.0
15+
<i>Initial release</i>
16+
* Migrated from old repository

‎CONTRIBUTING.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,9 @@ You should have the following things installed:
3434
* Ensure that the JDK/Java-Version is correct
3535

3636

37-
## Releasing [![Build](https://img.shields.io/github/actions/workflow/status/xdev-software/template-placeholder/release.yml?branch=master)](https://github.com/xdev-software/template-placeholder/actions/workflows/release.yml)
37+
## Releasing [![Build](https://img.shields.io/github/actions/workflow/status/xdev-software/thread-origin-agent/release.yml?branch=master)](https://github.com/xdev-software/thread-origin-agent/actions/workflows/release.yml)
3838

3939
Before releasing:
40-
* Consider doing a [test-deployment](https://github.com/xdev-software/template-placeholder/actions/workflows/test-deploy.yml?query=branch%3Adevelop) before actually releasing.
4140
* Check the [changelog](CHANGELOG.md)
4241

4342
If the ``develop`` is ready for release, create a pull request to the ``master``-Branch and merge the changes

‎LICENSE‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,8 @@
186186
same "printed page" as the copyright notice for easier
187187
identification within third-party archives.
188188

189-
Copyright 2024 XDEV Software
189+
Copyright 2019 XDEV Software
190+
Copyright 2011 kreyssel
190191

191192
Licensed under the Apache License, Version 2.0 (the "License");
192193
you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)