Skip to content

Commit f40f186

Browse files
authored
Merge pull request #3 from microsphere-projects/main
Remove CompositeInterceptor and adjust Maven wrapper usage
2 parents 5119def + e81006a commit f40f186

3 files changed

Lines changed: 16 additions & 216 deletions

File tree

.github/workflows/maven-build.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,10 @@ jobs:
3939
with:
4040
distribution: 'temurin'
4141
java-version: ${{ matrix.java }}
42+
cache: maven
4243

4344
- name: Build with Maven
44-
run: ./mvnw
45+
run: mvn
4546
--batch-mode
4647
--update-snapshots
4748
--file pom.xml

.github/workflows/maven-publish.yml

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,9 @@ jobs:
4040
with:
4141
java-version: '17'
4242
distribution: 'temurin'
43-
server-id: ossrh
44-
server-username: MAVEN_USERNAME
45-
server-password: MAVEN_PASSWORD
46-
cache: maven
4743

4844
- name: Publish package
49-
run: mvn
45+
run: ./mvnw
5046
--batch-mode
5147
--update-snapshots
5248
--file pom.xml
@@ -120,8 +116,9 @@ jobs:
120116
prompt = (
121117
f"Generate concise release notes for version {current_tag}.\n\n"
122118
f"Commits since {prev_tag}:\n{commits}\n\n"
123-
"Format the output as markdown with sections for New Features, Bug Fixes, "
124-
"and Other Changes (only include sections that have relevant commits). "
119+
"Format the output as markdown with sections if present for New Features, Bug Fixes, "
120+
"Documentations, Dependency Updates, Test Improvements, Build and Workflow Enhancements "
121+
"and Other Changes(excludes Full Changelog).\n\n"
125122
"Be concise and clear."
126123
)
127124
@@ -154,20 +151,25 @@ jobs:
154151
if [ ! -f "$NOTES_FILE" ]; then
155152
printf "# Release Notes\n\n" > "$NOTES_FILE"
156153
fi
154+
155+
FULL_CHANGELOG="**Full Changelog**: $GITHUB_SERVER_URL/$GITHUB_REPOSITORY/compare/$PREV_TAG...$CURRENT_TAG"
156+
157157
printf "## v%s\n\n%s\n\n" "$CURRENT_TAG" "$SUMMARY" >> "$NOTES_FILE"
158-
158+
printf "%s" "$FULL_CHANGELOG" >> "$NOTES_FILE"
159+
159160
# Write the current release notes to a temp file for the Create Release step
160-
printf "%s" "$SUMMARY" > /tmp/current-release-notes.md
161+
printf "%s\n\n" "$SUMMARY" > /tmp/current-release-notes.md
162+
printf "%s" "$FULL_CHANGELOG" >> /tmp/current-release-notes.md
161163
162164
echo "Release notes generated and appended to $NOTES_FILE"
163165
164166
- name: Create Release
165167
run: |
166-
if gh release view "v${{ inputs.revision }}" >/dev/null 2>&1; then
167-
echo "Release v${{ inputs.revision }} already exists, skipping."
168+
if gh release view "${{ inputs.revision }}" >/dev/null 2>&1; then
169+
echo "Release ${{ inputs.revision }} already exists, skipping."
168170
else
169171
gh release create ${{ inputs.revision }} \
170-
--title "v${{ inputs.revision }}" \
172+
--title "${{ inputs.revision }}" \
171173
--notes-file /tmp/current-release-notes.md \
172174
--latest
173175
fi

microsphere-hibernate-core/src/main/java/io/microsphere/hibernate/CompositeInterceptor.java

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

0 commit comments

Comments
 (0)