#8345 Apache any dependency fix

Former-commit-id: b1e511ad

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

@@ -111,7 +111,7 @@
 
     <!-- Quick search. Includes minimized ant bundle. -->
 
-    <plugin id="org.apache.ant" download-size="0" install-size="0" version="1.10.0"/>
+<!--    <plugin id="org.apache.ant" download-size="0" install-size="0" version="0.0.0"/>-->
     <plugin id="org.eclipse.text.quicksearch" download-size="0" install-size="0" version="0.0.0"/>
 
     <!-- GEF -->

pom.xml

@@ -45,13 +45,13 @@
 
     <repositories>
         <repository>
-            <id>eclipse-p2-repo</id>
-            <url>${eclipse-p2-repo.url}</url>
+            <id>local-contrib</id>
+            <url>${local-p2-repo.url}</url>
             <layout>p2</layout>
         </repository>
         <repository>
-            <id>local-contrib</id>
-            <url>${local-p2-repo.url}</url>
+            <id>eclipse-p2-repo</id>
+            <url>${eclipse-p2-repo.url}</url>
             <layout>p2</layout>
         </repository>
     </repositories>
@@ -71,23 +71,6 @@
                     </resources>
                 </configuration>
             </plugin>
-            <!-- Tycho target platform -->
-<!--
-            <plugin>
-                <groupId>org.eclipse.tycho</groupId>
-                <artifactId>target-platform-configuration</artifactId>
-                <version>${tycho-version}</version>
-                <configuration>
-                    <target>
-                        <artifact>
-                            <groupId>org.example</groupId>
-                            <artifactId>target-definition</artifactId>
-                            <version>1.0.0-SNAPSHOT</version>
-                        </artifact>
-                    </target>
-                </configuration>
-            </plugin>
--->
 
             <!-- Tycho build -->
             <plugin>
@@ -96,25 +79,11 @@
                 <version>${tycho-version}</version>
                 <configuration>
                     <environments>
-<!--
-                        <environment>
-                            <os>win32</os>
-                            <ws>win32</ws>
-                            <arch>x86</arch>
-                        </environment>
--->
                         <environment>
                             <os>win32</os>
                             <ws>win32</ws>
                             <arch>x86_64</arch>
                         </environment>
-<!--
-                        <environment>
-                            <os>linux</os>
-                            <ws>gtk</ws>
-                            <arch>x86</arch>
-                        </environment>
--->
                         <environment>
                             <os>linux</os>
                             <ws>gtk</ws>
@@ -126,7 +95,9 @@
                             <arch>x86_64</arch>
                         </environment>
                     </environments>
+
                 </configuration>
+
             </plugin>
 
             <plugin>

product/standalone/pom.xml

@@ -56,7 +56,22 @@
                     </execution>
                 </executions>
             </plugin>
-
+            <plugin>
+                <groupId>org.eclipse.tycho</groupId>
+                <artifactId>target-platform-configuration</artifactId>
+                <version>${tycho-version}</version>
+                <configuration>
+                    <filters>
+                        <filter>
+                            <type>eclipse-plugin</type>
+                            <id>org.apache.ant</id>
+                            <restrictTo>
+                                <version>1.10.0</version>
+                            </restrictTo>
+                        </filter>
+                    </filters>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>