Skip to content

Update release 40 #268

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

Merged
manovotn merged 4 commits into from
May 21, 2025
Merged

Update release 40 #268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a98efe5
Update release workflow, update Parent and related inherited properties
manovotn May 21, 2025
184e86c
Trigger 4.0.6.Final release
manovotn May 21, 2025
563fe0c
Correct javadoc reference
manovotn May 21, 2025
d6b23d2
Override formatter version from Parent to get a JDK 11 compatible one
manovotn May 21, 2025
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
4 changes: 2 additions & 2 deletions .github/project.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Weld Parent
release:
current-version: 4.0.4.Final
next-version: 4.0.5-SNAPSHOT
current-version: 4.0.5.Final
next-version: 4.0.6-SNAPSHOT
10 changes: 5 additions & 5 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,16 @@ jobs:
with:
distribution: temurin
java-version: 17
server-id: 'sonatype-nexus-staging'
server-username: 'MAVEN_DEPLOY_USERNAME'
server-password: 'MAVEN_DEPLOY_TOKEN'
server-id: 'central'
server-username: 'CENTRAL_PORTAL_USERNAME'
server-password: 'CENTRAL_PORTAL_PWD'
gpg-private-key: ${{secrets.MAVEN_GPG_PRIVATE_KEY}}
gpg-passphrase: 'MAVEN_GPG_PASSPHRASE'

- name: Maven release ${{steps.metadata.outputs.current-version}}
env:
MAVEN_DEPLOY_USERNAME: ${{secrets.MAVEN_DEPLOY_USERNAME}}
MAVEN_DEPLOY_TOKEN: ${{secrets.MAVEN_DEPLOY_TOKEN}}
CENTRAL_PORTAL_USERNAME: ${{secrets.CENTRAL_PORTAL_USERNAME}}
CENTRAL_PORTAL_PWD: ${{secrets.CENTRAL_PORTAL_PWD}}
MAVEN_GPG_PASSPHRASE: ${{secrets.MAVEN_GPG_PASSPHRASE}}
run: |
export MAVEN_OPTS="--add-opens=java.base/java.util=ALL-UNNAMED"
Expand Down
2 changes: 1 addition & 1 deletion junit-common/src/main/java/org/jboss/weld/junit/MockBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,7 @@ public Builder<T> creating(final T instance) {
* Use {@link Unmanaged} to create/destroy the bean instance.
*
* <p>
* NOTE: {@link CreationalContext#toString()} is used as a key in a map and therefore must be unique for the lifetime of
* NOTE: {@code CreationalContext#toString()} is used as a key in a map and therefore must be unique for the lifetime of
* a bean instance. Weld
* implementation fulfills this requirement.
* </p>
Expand Down
22 changes: 17 additions & 5 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-parent</artifactId>
<version>50</version>
<version>56</version>
</parent>

<url>http://weld.cdi-spec.org</url>
Expand All @@ -36,10 +36,18 @@
</developers>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<!-- Versions -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<!-- Maven Compiler plugin configuration defined in Weld Parent -->
<maven.compiler.argument.source>11</maven.compiler.argument.source>
<maven.compiler.argument.target>11</maven.compiler.argument.target>
<maven.compiler.argument.testSource>11</maven.compiler.argument.testSource>
<maven.compiler.argument.testTarget>11</maven.compiler.argument.testTarget>

<!-- Javadoc source version -->
<javadoc.source>11</javadoc.source>

<!-- Versions -->
<version.junit4>4.13.2</version.junit4>
<version.junit.jupiter>5.10.2</version.junit.jupiter>
<!-- version.spock and version.junit.platform should be upgraded together -->
Expand All @@ -59,6 +67,10 @@
<version.spotbugs.plugin>4.8.5.0</version.spotbugs.plugin>
<spotbugs.failOnError>false</spotbugs.failOnError>
<spotbugs.threshold>Low</spotbugs.threshold>

<!-- Override formatter/impsort versions from Weld parent to get JDK 11 compatible versions -->
<formatter.version>2.23.0</formatter.version>
<impsort.version>1.9.0</impsort.version>
</properties>

<modules>
Expand Down
Loading