Skip to content

Commit 8b79d9a

Browse files
committed
Correct the script to look inside nested jar for binaries
1 parent d724708 commit 8b79d9a

File tree

2 files changed

+36
-2
lines changed

2 files changed

+36
-2
lines changed

.github/scripts/sign-osx-distro-file.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ function signExecutableInsideJar2() {
7878
function signExecutableInsideNestedJar() {
7979
for f in `find $1 -type f | grep -E $2`
8080
do
81-
echo "Looking for '$3' files inside ${f} to sign..."
8281
f_name="$(basename -- $f)"
8382
extracted_jar_dir=extracted_${f_name}
8483
rm -rf $extracted_jar_dir
@@ -126,7 +125,7 @@ signExecutableInsideJar2 {dir}/${destination_folder_name}/SpringToolSuite4.app "
126125
signExecutableInsideJar ".*/jna-\d+.*\.jar$" "libjnidispatch.jnilib.jnilib" ".*/libjnidispatch\.jnilib$"
127126

128127
#sign libjnidispatch.jnilib inside jna.jar which is inside org.springframework.ide.eclipse.docker.client.jar bundle
129-
signExecutableInsideNestedJar {dir}/${destination_folder_name}/SpringToolSuite4.app ".*/org.springframework.ide.eclipse.docker.client.*\.jar$" "org.springframework.ide.eclipse.docker.client.jar" "libjnidispatch.jnilib.jnilib" ".*/libjnidispatch\.jnilib$"
128+
signExecutableInsideNestedJar {dir}/${destination_folder_name}/SpringToolSuite4.app ".*/org.springframework.ide.eclipse.docker.client.*\.jar$" ".*/jna-\d+.*\.jar$" "libjnidispatch.jnilib" ".*/libjnidispatch\.jnilib$"
130129

131130
# Sign the app
132131
ls -la ${dir}/${destination_folder_name}/SpringToolSuite4.app/

vscode-extensions/vscode-spring-boot/CHANGELOG.md

+35
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,38 @@
1+
## 2024-09-11 (4.25.0 RELEASE, incl. language servers version 1.57.0)
2+
3+
#### important highlights
4+
5+
* _(Spring Boot)_ Explain SPEL expressions and AOP annotations via CodeLens with Copilot
6+
* _(Spring Boot)_ Support language features for `@Named`, `@Resource`, `@Innject` and `@ConditionalOnResource` annotations
7+
* _(Spring Boot)_ Syntax highlighting and validation for CRON expressions inside `@Scheduled` annotation
8+
* _(Spring Boot)_ Navigating to definition for some elements of Data Queries embedded into `@Query` annotations
9+
10+
#### all fixes and improvements in detail
11+
12+
* _(Spring Boot)_ Refactor ConditionalOnResource attribute to be based on AnnotationAttributeCompletionProcessor [#1344](https://github.com/spring-projects/sts4/issues/1344)
13+
* _(Spring Boot)_ GH-1310: Add support for ConditionalOnResource annotation [#1343](https://github.com/spring-projects/sts4/pull/1343)
14+
* _(Spring Boot)_ GH-1330: Explain AOP annotations with copilot [#1338](https://github.com/spring-projects/sts4/pull/1338)
15+
* _(Spring Boot)_ [Spring Data Query] Navigate to parameter definitions in Java source [#1336](https://github.com/spring-projects/sts4/issues/1336)
16+
* _(Spring Boot)_ [Spring Data Queries] Show inline hint for query parameter [#1333](https://github.com/spring-projects/sts4/issues/1333)
17+
* _(Spring Boot)_ [Spring Data Queries] Show document highlights when the cursor is at query parameter AST node [#1332](https://github.com/spring-projects/sts4/issues/1332)
18+
* _(Spring Boot)_ add code lens to explain expressions using Copilot to AOP related annotations [#1330](https://github.com/spring-projects/sts4/issues/1330)
19+
* _(Spring Boot)_ Fix missing proposal if the prefix starts with "/" for `@ContextConfiguration` [#1327](https://github.com/spring-projects/sts4/pull/1327)
20+
* _(Spring Boot)_ Syntax Highlighting and Validation for embedded CRON expressions [#1322](https://github.com/spring-projects/sts4/issues/1322)
21+
* _(Spring Boot)_ add support for `@Named` annotation [#1313](https://github.com/spring-projects/sts4/issues/1313)
22+
* _(Spring Boot)_ create generic symbols for `@Resource` and `@Inject` [#1312](https://github.com/spring-projects/sts4/issues/1312)
23+
* _(Spring Boot)_ add support for `@ConditionalOnResource` annotation attributes [#1310](https://github.com/spring-projects/sts4/issues/1310)
24+
* _(Spring Boot)_ change name of "Remove Unnecessary `@Autowired`" validation marker description [#1302](https://github.com/spring-projects/sts4/issues/1302)
25+
* _(Spring Boot)_ change name of problem description for "unnecessary web annotation names" validation [#1301](https://github.com/spring-projects/sts4/issues/1301)
26+
* _(Spring Boot)_ content-assist for annotation attributes doesn't work when spaces are involved [#1299](https://github.com/spring-projects/sts4/issues/1299)
27+
* _(Spring Boot)_ [performance] explore options to deploy and run the language server from JAR files [#1293](https://github.com/spring-projects/sts4/issues/1293)
28+
* _(Spring Boot)_ Recognise `!---` as a document separator in properties files [#1129](https://github.com/spring-projects/sts4/issues/1129)
29+
* _(Spring Boot)_ Add file completion from classpath for `@ContextConfiguration` [#650](https://github.com/spring-projects/sts4/issues/650)
30+
* _(Spring Boot)_ SpEL parsing issue in Query annotation [#1320](https://github.com/spring-projects/sts4/issues/1320)
31+
* _(Spring Boot)_ When editing a Spring XML configuration file, the package names and class names do not appear accurately [#1317](https://github.com/spring-projects/sts4/issues/1317)
32+
* _(Spring Boot)_ No syntax highlighting and validation for data qieries inside `@NamedQuery` [#1314](https://github.com/spring-projects/sts4/issues/1314)
33+
* _(Spring Boot)_ False positive SQL error [#1304](https://github.com/spring-projects/sts4/issues/1304)
34+
* _(Spring Boot)_ Replace `OkHttp3ClientHttpRequestFactory` with `JdkClientHttpRequestFactory` [#1296](https://github.com/spring-projects/sts4/issues/1296)
35+
136
## 2024-07-24 (4.24.0 RELEASE, incl. language servers version 1.56.0)
237

338
#### important highlights

0 commit comments

Comments
 (0)