You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ds...@apache.org on 2025/01/30 12:40:32 UTC
(tomcat) branch 10.1.x updated (0871cda882 -> fd0d633fce)
This is an automated email from the ASF dual-hosted git repository.
dsoumis pushed a change to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
from 0871cda882 Work around available tricks
new 3ccf4611a4 Exclude openssl and panama directories from idea support
new 0f0b08ab71 Added instructions on how to remove the exclusion of FFM directories in IDEA
new fdbb392c31 Remove possible exclusions from compiler.xml
new fd0d633fce Add `--add-opens` JVM argument for IDE IDEA support after automation introduced in commit 6b00658 for CVE-2024-56337
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
build.xml | 8 +++++++-
res/ide-support/idea/compiler.xml | 8 +-------
res/ide-support/idea/tomcat.iml | 7 +++++++
res/ide-support/idea/workspace.xml | 8 ++++++++
4 files changed, 23 insertions(+), 8 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
(tomcat) 03/04: Remove possible exclusions from compiler.xml
Posted by ds...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dsoumis pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit fdbb392c318ca1bd825ce64cc4367d7c910b782a
Author: Dimitris Soumis <ds...@redhat.com>
AuthorDate: Wed Jun 5 10:47:17 2024 +0300
Remove possible exclusions from compiler.xml
(cherry picked from commit f408255a12736fc0dade2434d9ddb9b8ed383998)
---
res/ide-support/idea/compiler.xml | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/res/ide-support/idea/compiler.xml b/res/ide-support/idea/compiler.xml
index c65738a15b..a699b319c1 100644
--- a/res/ide-support/idea/compiler.xml
+++ b/res/ide-support/idea/compiler.xml
@@ -17,14 +17,8 @@
-->
<project version="4">
<component name="CompilerConfiguration">
- <excludeFromCompile>
- <!--
- <directory url="file://$PROJECT_DIR$/java/org/apache/tomcat/util/openssl" includeSubdirectories="true" />
- <directory url="file://$PROJECT_DIR$/java/org/apache/tomcat/util/net/openssl/panama" includeSubdirectories="true" />
- -->
- </excludeFromCompile>
<annotationProcessing>
<profile default="true" name="Default" enabled="true" />
</annotationProcessing>
</component>
-</project>
\ No newline at end of file
+</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
(tomcat) 01/04: Exclude openssl and panama directories from idea support
Posted by ds...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dsoumis pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 3ccf4611a465d417b5d93f76595b1ef4f5ec5099
Author: Dimitris Soumis <ds...@redhat.com>
AuthorDate: Wed Jun 5 10:44:50 2024 +0300
Exclude openssl and panama directories from idea support
(cherry picked from commit c82308dea00441c883ab19d11e0be72d6782e760)
---
res/ide-support/idea/tomcat.iml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/res/ide-support/idea/tomcat.iml b/res/ide-support/idea/tomcat.iml
index 96f128d993..50349c2121 100644
--- a/res/ide-support/idea/tomcat.iml
+++ b/res/ide-support/idea/tomcat.iml
@@ -22,6 +22,8 @@
<sourceFolder url="file://$MODULE_DIR$/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/webapps/examples/WEB-INF/classes" isTestSource="true" />
+ <excludeFolder url="file://$MODULE_DIR$/java/org/apache/tomcat/util/net/openssl/panama" />
+ <excludeFolder url="file://$MODULE_DIR$/java/org/apache/tomcat/util/openssl" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
(tomcat) 02/04: Added instructions on how to remove the exclusion of FFM directories in IDEA
Posted by ds...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dsoumis pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 0f0b08ab71815fabd3126202ce00712b0086118c
Author: Igal Sapir <is...@apache.org>
AuthorDate: Tue Jun 11 17:00:35 2024 -0700
Added instructions on how to remove the exclusion of FFM directories in IDEA
(cherry picked from commit 7118991902b3ae27e3ef128e86f94ef8b5dbb509)
---
build.xml | 8 +++++++-
res/ide-support/idea/tomcat.iml | 5 +++++
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/build.xml b/build.xml
index 3950cb96d5..7fa3ccd89f 100644
--- a/build.xml
+++ b/build.xml
@@ -3962,8 +3962,14 @@ Read the Building page on the Apache Tomcat documentation site for details on ho
<mkdir dir="${tomcat.home}/lib"/>
<echo>IntelliJ IDEA project directory created.
+
The SDK was set to "${build.java.version}" so make sure that your IDE has an SDK with that name,
-or update the Project Settings accordingly.</echo>
+or update the Project Settings accordingly. Choose [File > Project Structure] to open the settings dialog
+and set the SDK level, language level, etc. as needed.
+
+Some folders have been excluded by default as they require the latest SDK version and enabling of preview
+features. You can remove or comment out the exclusions to enable the directories in the .idea/tomcat.iml
+file, or via the IDEA UI by right-clicking folders, and choosing [Mark Directory as > Cancel Exclusion]</echo>
</target>
<!-- ============================ NetBeans =============================== -->
diff --git a/res/ide-support/idea/tomcat.iml b/res/ide-support/idea/tomcat.iml
index 50349c2121..df08b480eb 100644
--- a/res/ide-support/idea/tomcat.iml
+++ b/res/ide-support/idea/tomcat.iml
@@ -22,6 +22,11 @@
<sourceFolder url="file://$MODULE_DIR$/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/webapps/examples/WEB-INF/classes" isTestSource="true" />
+
+ <!-- The directories below are excluded by default as they require the FFM API which is
+ available as a preview feature in Java SDK 22. If you wish to use the FFM API in the
+ IDE then set your project and module SDK levels to Java 22 or later, enable preview
+ features if needed, and comment out or remove the excludeFolder lines below. !-->
<excludeFolder url="file://$MODULE_DIR$/java/org/apache/tomcat/util/net/openssl/panama" />
<excludeFolder url="file://$MODULE_DIR$/java/org/apache/tomcat/util/openssl" />
</content>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
(tomcat) 04/04: Add `--add-opens` JVM argument for IDE IDEA support after automation introduced in commit 6b00658 for CVE-2024-56337
Posted by ds...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dsoumis pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit fd0d633fcefb8a763c6e8f206d0e87a29c47e936
Author: Dimitris Soumis <ji...@gmail.com>
AuthorDate: Wed Jan 29 18:34:20 2025 +0200
Add `--add-opens` JVM argument for IDE IDEA support after automation introduced in commit 6b00658 for CVE-2024-56337
---
res/ide-support/idea/workspace.xml | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/res/ide-support/idea/workspace.xml b/res/ide-support/idea/workspace.xml
index bb47d31574..9d8906a99c 100644
--- a/res/ide-support/idea/workspace.xml
+++ b/res/ide-support/idea/workspace.xml
@@ -30,5 +30,13 @@
<option name="Make" enabled="true" />
</method>
</configuration>
+
+ <configuration default="true" type="JUnit" factoryName="JUnit">
+ <option name="VM_PARAMETERS" value="--add-opens java.base/java.io=ALL-UNNAMED" />
+ <module name="tomcat" />
+ <method v="2">
+ <option name="Make" enabled="true" />
+ </method>
+ </configuration>
</component>
</project>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org