#12149 JNA deps version configuration

Former-commit-id: 79ee3169

features/org.jkiss.dbeaver.rcp.feature/feature.xml

@@ -112,9 +112,6 @@
 
     <plugin id="org.eclipse.update.configurator" download-size="0" install-size="0" version="0.0.0"/>
 
-    <plugin id="com.sun.jna" download-size="0" install-size="0" version="0.0.0"/>
-    <plugin id="com.sun.jna.platform" download-size="0" install-size="0" version="0.0.0"/>
-
     <!-- Quick search. Includes minimized ant bundle. -->
 
 <!--    <plugin id="org.apache.ant" download-size="0" install-size="0" version="0.0.0"/>-->

features/org.jkiss.dbeaver.rcp.feature/pom.xml

 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+    xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.jkiss.dbeaver</groupId>
-    <artifactId>dbeaver</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
-  </parent>
-  <artifactId>org.jkiss.dbeaver.rcp.feature</artifactId>
-  <version>2.1.130-SNAPSHOT</version>
-  <packaging>eclipse-feature</packaging>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.jkiss.dbeaver</groupId>
+        <artifactId>dbeaver</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../../</relativePath>
+    </parent>
+    <artifactId>org.jkiss.dbeaver.rcp.feature</artifactId>
+    <version>2.1.130-SNAPSHOT</version>
+    <packaging>eclipse-feature</packaging>
+
+    <build>
+        <plugins>
+            <!-- Tycho configuration -->
+            <plugin>
+                <groupId>org.eclipse.tycho</groupId>
+                <artifactId>target-platform-configuration</artifactId>
+                <version>${tycho-version}</version>
+                <configuration>
+                    <filters>
+                        <!-- Limit JNA to version 4.5. Newer version added in E4 2021-03 and it leads to JNA dups. #12149 -->
+                        <filter>
+                            <type>eclipse-plugin</type>
+                            <id>com.sun.jna</id>
+                            <restrictTo>
+                                <type>eclipse-plugin</type>
+                                <id>com.sun.jna</id>
+                                <versionRange>[4.5.1, 5.0.0]</versionRange>
+                            </restrictTo>
+                        </filter>
+                        <filter>
+                            <type>eclipse-plugin</type>
+                            <id>com.sun.jna.platform</id>
+                            <restrictTo>
+                                <type>eclipse-plugin</type>
+                                <id>com.sun.jna.platform</id>
+                                <versionRange>[4.5.1, 5.0.0]</versionRange>
+                            </restrictTo>
+                        </filter>
+                    </filters>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

features/org.jkiss.dbeaver.runtime.feature/feature.xml

@@ -45,8 +45,5 @@
     <plugin id="org.apache.commons.jexl" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
     <plugin id="net.sf.opencsv" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
     <plugin id="com.google.gson" download-size="0" install-size="0" version="0.0.0"/>
-    <plugin id="com.jcraft.jsch" download-size="0" install-size="0" version="0.0.0"/>
-    <plugin id="com.sun.jna" download-size="0" install-size="0" version="0.0.0"/>
-    <plugin id="com.sun.jna.platform" download-size="0" install-size="0" version="0.0.0"/>
 
 </feature>

pom.xml

@@ -80,7 +80,6 @@
                             <arch>x86_64</arch>
                         </environment>
                     </environments>
-
                 </configuration>
 
             </plugin>

product/community/pom.xml

@@ -69,25 +69,6 @@
                                 <version>1.10.0</version>
                             </restrictTo>
                         </filter>
-
-                        <!--<filter>
-                            <type>eclipse-plugin</type>
-                            <id>com.sun.jna</id>
-                            <restrictTo>
-                                <type>eclipse-plugin</type>
-                                <id>com.sun.jna</id>
-                                <versionRange>[4.5.1, 5.0.0]</versionRange>
-                            </restrictTo>
-                        </filter>
-                        <filter>
-                            <type>eclipse-plugin</type>
-                            <id>com.sun.jna.platform</id>
-                            <restrictTo>
-                                <type>eclipse-plugin</type>
-                                <id>com.sun.jna.platform</id>
-                                <versionRange>[4.5.1, 5.0.0]</versionRange>
-                            </restrictTo>
-                        </filter>-->
                     </filters>
                 </configuration>
             </plugin>