Skip to content

Commit 9619b0c

Browse files
authored
Merge pull request #115 from smillst/updating-javaparser-parent-3.25.5
Update to JavaParser 3.25.5
2 parents 888ff78 + a14847b commit 9619b0c

File tree

168 files changed

+2544
-1331
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

168 files changed

+2544
-1331
lines changed

.github/workflows/create_github_release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Checkout code
16-
uses: actions/checkout@v3.5.2
16+
uses: actions/checkout@v3.6.0
1717

1818
- name: Create Release
1919
id: create_release

.github/workflows/maven_tests.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
steps:
4747
## Checkout the current version of the code from the repo.
4848
- name: Checkout latest code
49-
uses: actions/checkout@v3.5.2
49+
uses: actions/checkout@v3.6.0
5050
with:
5151
fetch-depth: "0"
5252

@@ -85,7 +85,7 @@ jobs:
8585

8686

8787
- name: CodeCov - JavaParser Core
88-
uses: codecov/[email protected].3
88+
uses: codecov/[email protected].4
8989
timeout-minutes: 10
9090
with:
9191
files: javaparser-core-testing/target/site/jacoco/jacoco.xml,javaparser-core-testing-bdd/target/site/jacoco/jacoco.xml
@@ -95,7 +95,7 @@ jobs:
9595
env_vars: OS,JDK
9696

9797
- name: CodeCov - JavaParser Symbol Solver
98-
uses: codecov/[email protected].3
98+
uses: codecov/[email protected].4
9999
timeout-minutes: 10
100100
with:
101101
file: javaparser-symbol-solver-testing/target/site/jacoco/jacoco.xml
@@ -110,7 +110,7 @@ jobs:
110110
runs-on: ubuntu-latest
111111
steps:
112112
- name: Checkout latest code
113-
uses: actions/checkout@v3.5.2
113+
uses: actions/checkout@v3.6.0
114114
with:
115115
fetch-depth: "0"
116116
- name: Set up JDK 11

.github/workflows/prepare_release_changelog.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515

1616
# Check out current repository
1717
- name: Fetch Sources
18-
uses: actions/checkout@v3.5.2
18+
uses: actions/checkout@v3.6.0
1919

2020
# Setup Java 11 environment for the next steps
2121
- name: Setup Java
@@ -39,11 +39,13 @@ jobs:
3939
RELEASE_TITLE="SNAPSHOT - $SHA_SHORT"
4040
RELEASE_TAG_NAME="v_snapshot_$SHA_SHORT"
4141
42-
echo "::set-output name=sha_long::$SHA_LONG"
43-
echo "::set-output name=sha_short::$SHA_SHORT"
44-
echo "::set-output name=changelog::$CHANGELOG"
45-
echo "::set-output name=release_title::$RELEASE_TITLE"
46-
echo "::set-output name=release_tag_name::$RELEASE_TAG_NAME"
42+
echo "sha_long=$SHA_LONG" >> $GITHUB_OUTPUT
43+
echo "sha_short=$SHA_SHORT" >> $GITHUB_OUTPUT
44+
echo "changelog<<EOF" >> $GITHUB_OUTPUT
45+
echo "$CHANGELOG" >> $GITHUB_OUTPUT
46+
echo "EOF" >> $GITHUB_OUTPUT
47+
echo "release_title=$RELEASE_TITLE" >> $GITHUB_OUTPUT
48+
echo "release_tag_name=$RELEASE_TAG_NAME" >> $GITHUB_OUTPUT
4749
4850
4951
- name: Output variables

.mvn/wrapper/maven-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@
1414
# KIND, either express or implied. See the License for the
1515
# specific language governing permissions and limitations
1616
# under the License.
17-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.1/apache-maven-3.9.1-bin.zip
17+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.4/apache-maven-3.9.4-bin.zip
1818
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar

changelog.md

Lines changed: 98 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

2-
Next Release (Version 3.25.4-snapshot)
2+
Next Release (Version 3.25.6-snapshot)
33
--------------------------------------
4-
[issues resolved](https://github.com/javaparser/javaparser/milestone/200?closed=1)
4+
[issues resolved](https://github.com/javaparser/javaparser/milestone/202?closed=1)
55

66
### Added
77
### Changed
@@ -11,10 +11,106 @@ Next Release (Version 3.25.4-snapshot)
1111
### Security
1212

1313

14+
Version 3.25.5
15+
--------------
16+
[issues resolved](https://github.com/javaparser/javaparser/milestone/201?closed=1)
17+
18+
### Added
19+
20+
* fix: issue 4115 ResolvedUnionType should give access to a list of resolved types (PR [#4119](https://github.com/javaparser/javaparser/pull/4119) by [@jlerbsc](https://github.com/jlerbsc))
21+
* Support getting more annotation default values using reflection (PR [#4103](https://github.com/javaparser/javaparser/pull/4103) by [@freya022](https://github.com/freya022))
22+
23+
### Changed
24+
25+
* Minor refactoring: Simplifies how to group deleted tokens by extracting a method into an independent class (PR [#4134](https://github.com/javaparser/javaparser/pull/4134) by [@jlerbsc](https://github.com/jlerbsc))
26+
* Replace deprecated command with environment file (PR [#4122](https://github.com/javaparser/javaparser/pull/4122) by [@70825](https://github.com/70825))
27+
* Fixes missing named constructor in Modifier.java (PR [#4092](https://github.com/javaparser/javaparser/pull/4092) by [@Auties00](https://github.com/Auties00))
28+
29+
### Fixed
30+
31+
* Fix: issue 4133 Top-level class containerType() throws an exception instead of Optional.empty() (PR [#4135](https://github.com/javaparser/javaparser/pull/4135) by [@jlerbsc](https://github.com/jlerbsc))
32+
* Fix: apply multiline strings (PR [#4130](https://github.com/javaparser/javaparser/pull/4130) by [@70825](https://github.com/70825))
33+
* Fix: issue 3976 Issue resolving implicit generic types (PR [#4128](https://github.com/javaparser/javaparser/pull/4128) by [@jlerbsc](https://github.com/jlerbsc))
34+
* Add unit test for PR 4091 Fixed missing permits in pretty printer (PR [#4126](https://github.com/javaparser/javaparser/pull/4126) by [@jlerbsc](https://github.com/jlerbsc))
35+
* Fix: issue 4124 UnsupportedOperationException: 'T' is thrown in MethodCallExpr resolve (PR [#4125](https://github.com/javaparser/javaparser/pull/4125) by [@jlerbsc](https://github.com/jlerbsc))
36+
* Fix: issue 4051 Switched upperBounds and lowerBounds on ResolvedTypeP… (PR [#4123](https://github.com/javaparser/javaparser/pull/4123) by [@jlerbsc](https://github.com/jlerbsc))
37+
* Fix failing test on JDK 17 (PR [#4121](https://github.com/javaparser/javaparser/pull/4121) by [@mahesh-hegde](https://github.com/mahesh-hegde))
38+
* Fix: issue 3673 isAssignableBy method StackOverflowError (PR [#4118](https://github.com/javaparser/javaparser/pull/4118) by [@jlerbsc](https://github.com/jlerbsc))
39+
* Orphan comment added when using lexical preservation is not printed (PR [#4114](https://github.com/javaparser/javaparser/pull/4114) by [@jlerbsc](https://github.com/jlerbsc))
40+
* Fixed missing permits in pretty printer (PR [#4091](https://github.com/javaparser/javaparser/pull/4091) by [@Auties00](https://github.com/Auties00))
41+
42+
### Developer Changes
43+
44+
* chore(deps): update actions/checkout action to v3.6.0 (PR [#4127](https://github.com/javaparser/javaparser/pull/4127) by [@renovate[bot]](https://github.com/apps/renovate))
45+
* chore(deps): bump com.google.guava:guava from 32.1.1-jre to 32.1.2-jre (PR [#4109](https://github.com/javaparser/javaparser/pull/4109) by [@dependabot[bot]](https://github.com/apps/dependabot))
46+
47+
### Uncategorised
48+
49+
* Fix: issue 4104 LPP doesn't handle new switch entries well (PR [#4106](https://github.com/javaparser/javaparser/pull/4106) by [@jlerbsc](https://github.com/jlerbsc))
50+
51+
### :heart: Contributors
52+
53+
Thank You to all contributors who worked on this release!
54+
55+
* [@freya022](https://github.com/freya022)
56+
* [@Auties00](https://github.com/Auties00)
57+
* [@mahesh-hegde](https://github.com/mahesh-hegde)
58+
* [@jlerbsc](https://github.com/jlerbsc)
59+
* [@70825](https://github.com/70825)
60+
61+
62+
Version 3.25.4
63+
--------------
64+
[issues resolved](https://github.com/javaparser/javaparser/milestone/200?closed=1)
65+
66+
### Changed
67+
68+
* Nested 'if' statements should be simplified (PR [#4085](https://github.com/javaparser/javaparser/pull/4085) by [@jlerbsc](https://github.com/jlerbsc))
69+
* BDD tests: migarte to JBehave 5 (PR [#4028](https://github.com/javaparser/javaparser/pull/4028) by [@valfirst](https://github.com/valfirst))
70+
71+
### Fixed
72+
73+
* Fix: issue 4077 After building JavaParser (with tests) on MacOS multi… (PR [#4086](https://github.com/javaparser/javaparser/pull/4086) by [@jlerbsc](https://github.com/jlerbsc))
74+
* fix line separators of selected test files (PR [#4083](https://github.com/javaparser/javaparser/pull/4083) by [@abego](https://github.com/abego))
75+
* Fix: issue 3978 typesolver can't parse in parallel (PR [#4073](https://github.com/javaparser/javaparser/pull/4073) by [@jlerbsc](https://github.com/jlerbsc))
76+
* Fix #4056 isDeclaredInInterface() returns true for fields declared inside enumerations contained in an interface (PR [#4057](https://github.com/javaparser/javaparser/pull/4057) by [@Elewyth](https://github.com/Elewyth))
77+
* Fix: issue 4037 ArrayIndexOutOfBoundsException throws when method param is variadic (PR [#4046](https://github.com/javaparser/javaparser/pull/4046) by [@jlerbsc](https://github.com/jlerbsc))
78+
* Fix: issue 4016 Failed to parse variable with name 'sealed' or 'permits' (PR [#4039](https://github.com/javaparser/javaparser/pull/4039) by [@jlerbsc](https://github.com/jlerbsc))
79+
80+
### Developer Changes
81+
82+
* chore(deps): bump guava from 32.1.0-jre to 32.1.1-jre (PR [#4089](https://github.com/javaparser/javaparser/pull/4089) by [@dependabot[bot]](https://github.com/apps/dependabot))
83+
* chore(deps): bump guava from 32.0.0-jre to 32.1.0-jre (PR [#4087](https://github.com/javaparser/javaparser/pull/4087) by [@dependabot[bot]](https://github.com/apps/dependabot))
84+
* chore(deps): bump checkstyle from 10.12.0 to 10.12.1 (PR [#4084](https://github.com/javaparser/javaparser/pull/4084) by [@dependabot[bot]](https://github.com/apps/dependabot))
85+
* chore(deps): bump versions-maven-plugin from 2.15.0 to 2.16.0 (PR [#4055](https://github.com/javaparser/javaparser/pull/4055) by [@dependabot[bot]](https://github.com/apps/dependabot))
86+
* chore(deps): bump maven-release-plugin from 3.0.0 to 3.0.1 (PR [#4053](https://github.com/javaparser/javaparser/pull/4053) by [@dependabot[bot]](https://github.com/apps/dependabot))
87+
* chore(deps): bump guava from 31.1-jre to 32.0.0-jre (PR [#4042](https://github.com/javaparser/javaparser/pull/4042) by [@dependabot[bot]](https://github.com/apps/dependabot))
88+
* chore(deps): bump maven-dependency-plugin from 3.5.0 to 3.6.0 (PR [#4035](https://github.com/javaparser/javaparser/pull/4035) by [@dependabot[bot]](https://github.com/apps/dependabot))
89+
* chore(deps): bump maven-checkstyle-plugin from 3.2.2 to 3.3.0 (PR [#4033](https://github.com/javaparser/javaparser/pull/4033) by [@dependabot[bot]](https://github.com/apps/dependabot))
90+
* chore(deps): bump maven-scm-plugin from 2.0.0 to 2.0.1 (PR [#4031](https://github.com/javaparser/javaparser/pull/4031) by [@dependabot[bot]](https://github.com/apps/dependabot))
91+
* chore(deps): bump codecov/codecov-action from 3.1.3 to 3.1.4 (PR [#4030](https://github.com/javaparser/javaparser/pull/4030) by [@dependabot[bot]](https://github.com/apps/dependabot))
92+
* chore(deps): bump build-helper-maven-plugin from 3.3.0 to 3.4.0 (PR [#4026](https://github.com/javaparser/javaparser/pull/4026) by [@dependabot[bot]](https://github.com/apps/dependabot))
93+
* chore(deps): update dependency maven to v3.9.2 (PR [#4024](https://github.com/javaparser/javaparser/pull/4024) by [@renovate[bot]](https://github.com/apps/renovate))
94+
95+
### :heart: Contributors
96+
97+
Thank You to all contributors who worked on this release!
98+
99+
* [@valfirst](https://github.com/valfirst)
100+
* [@abego](https://github.com/abego)
101+
* [@Elewyth](https://github.com/Elewyth)
102+
* [@jlerbsc](https://github.com/jlerbsc)
103+
104+
14105
Version 3.25.3
15106
--------------
16107
[issues resolved](https://github.com/javaparser/javaparser/milestone/199?closed=1)
17108

109+
110+
### Added
111+
112+
* add Java 17 sealed/non-sealed classes (PR [#3997](https://github.com/javaparser/javaparser/pull/3997) by [@kris-scheibe](https://github.com/kris-scheibe))
113+
18114
### Changed
19115

20116
* Minor simplification of the Difference class (PR [#4008](https://github.com/javaparser/javaparser/pull/4008) by [@jlerbsc](https://github.com/jlerbsc))

javaparser-core-generators/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>javaparser-parent</artifactId>
55
<groupId>com.github.javaparser</groupId>
6-
<version>3.25.3</version>
6+
<version>3.25.5</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99

javaparser-core-generators/src/main/java/com/github/javaparser/generator/core/utils/CodeUtils.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,9 @@ private CodeUtils() {
4949
public static String castValue(String value, Type requiredType, String valueType) {
5050
String requiredTypeName = requiredType.asString();
5151

52-
if (requiredTypeName.equals(valueType))
53-
return value;
54-
else
55-
return String.format("(%s) %s", requiredTypeName, value);
52+
if (requiredTypeName.equals(valueType))
53+
return value;
54+
return String.format("(%s) %s", requiredTypeName, value);
5655
}
5756

5857
}

javaparser-core-generators/src/main/java/com/github/javaparser/generator/core/visitor/NoCommentHashCodeVisitorGenerator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ protected void generateVisitMethodBody(BaseNodeMetaModel node, MethodDeclaration
6262
if (propertyMetaModels.size() == 1) {
6363
builder.append("0");
6464
break;
65-
} else
66-
continue;
65+
}
66+
continue;
6767
}
6868
// Is this field another AST node? Visit it.
6969
if (field.getNodeReference().isPresent()) {

javaparser-core-metamodel-generator/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>javaparser-parent</artifactId>
55
<groupId>com.github.javaparser</groupId>
6-
<version>3.25.3</version>
6+
<version>3.25.5</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99

javaparser-core-serialization/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<parent>
33
<artifactId>javaparser-parent</artifactId>
44
<groupId>com.github.javaparser</groupId>
5-
<version>3.25.3</version>
5+
<version>3.25.5</version>
66
</parent>
77
<modelVersion>4.0.0</modelVersion>
88

0 commit comments

Comments
 (0)