Skip to content
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.

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

Rework maven code for faster calculation of path config #1661

Merged
merged 21 commits into from
Nov 26, 2024
Merged
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
1fc579d
Added fast path to avoid starting maven just to install dependencies
DavyLandman Oct 3, 2022
0e8b61a
Rewrote to using internal maven engine instead of forking jvm
DavyLandman Oct 4, 2022
f574853
Rewrote to calling maven without changing global properties (but sadl…
DavyLandman Oct 4, 2022
fb3c978
Merge branch 'main' into reduce-maven-overhead
rodinaarssen Jul 22, 2024
6dc6715
Fixed path normalization for embedded maven
rodinaarssen Jul 22, 2024
a2ce678
Updated maven library version
rodinaarssen Jul 22, 2024
df9a698
Added another necessary dependency for maven-embedder
rodinaarssen Jul 30, 2024
d5cff33
Configured maven-shade-plugin to correctly shade required files for d…
rodinaarssen Aug 20, 2024
0bcadda
Fixed regular expression to obtain the classpath from Maven's output
rodinaarssen Aug 20, 2024
cb9851d
Layout
rodinaarssen Aug 20, 2024
c9fc81e
Merge branch 'main' into reduce-maven-overhead
rodinaarssen Aug 20, 2024
d5c655b
No longer manipulating System.out and System.err streams, instead wri…
rodinaarssen Aug 20, 2024
2aab716
Correctly extracting class path from maven output
rodinaarssen Aug 27, 2024
d374969
Merge branch 'main' into reduce-maven-overhead
rodinaarssen Aug 27, 2024
90271d3
Changed slf4j dependency to suppress maven output to the REPL
rodinaarssen Sep 10, 2024
0529f26
Removed now-redundant constant
rodinaarssen Sep 10, 2024
d30a696
Created separate class for Maven interaction
rodinaarssen Sep 11, 2024
d181d88
Fully qualified dependency plugin; removed quiet argument from maven …
rodinaarssen Sep 17, 2024
badd6e0
Make sure that maven-dependency-plugin is downloaded when not yet pre…
rodinaarssen Sep 17, 2024
dd327ad
Merge branch 'main' into reduce-maven-overhead
rodinaarssen Nov 25, 2024
c82fbc9
Added missing license header
rodinaarssen Nov 25, 2024
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
Prev Previous commit
Next Next commit
Layout
rodinaarssen committed Aug 20, 2024
commit cb9851d1548a931b6d4e76d7cfbe04389e2213d8
4 changes: 2 additions & 2 deletions src/org/rascalmpl/library/util/PathConfig.java
Original file line number Diff line number Diff line change
@@ -677,7 +677,7 @@ private static IList getPomXmlCompilerClasspath(ISourceLocation manifestRoot) {
var match = FIND_CLASS_PATH.matcher(mavenOutput);
var foundClassPath = match.find() ? match.group(1) : "";

return Arrays.stream(foundClassPath.split(File.pathSeparator) )
return Arrays.stream(foundClassPath.split(File.pathSeparator))
.filter(fileName -> new File(fileName).exists())
.map(elem -> {
try {
@@ -696,7 +696,7 @@ private static IList getPomXmlCompilerClasspath(ISourceLocation manifestRoot) {
}
}

private static void setField(CliRequest req, String fieldName, Object value) throws ReflectiveOperationException {
private static void setField(CliRequest req, String fieldName, Object value) throws ReflectiveOperationException {
var field = CliRequest.class.getDeclaredField(fieldName);
field.setAccessible(true);
field.set(req, value);