[420738] Determine which eclipse.inf files are necessary for Tycho (CBI
builds)
diff --git a/plugins/org.eclipse.jst.server.generic.jboss/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.server.generic.jboss/META-INF/MANIFEST.MF
index 7cf678a..c732ae2 100644
--- a/plugins/org.eclipse.jst.server.generic.jboss/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.server.generic.jboss/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jst.server.generic.jboss;singleton:=true
-Bundle-Version: 1.6.200.qualifier
+Bundle-Version: 1.6.300.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Require-Bundle: org.eclipse.jst.server.core;bundle-version="[1.0.102,2.0.0)",
diff --git a/plugins/org.eclipse.jst.server.generic.jboss/META-INF/eclipse.inf b/plugins/org.eclipse.jst.server.generic.jboss/META-INF/eclipse.inf
deleted file mode 100644
index 19042e4..0000000
--- a/plugins/org.eclipse.jst.server.generic.jboss/META-INF/eclipse.inf
+++ /dev/null
@@ -1 +0,0 @@
-jarprocessor.exclude.children.pack=true
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.generic.jboss/pom.xml b/plugins/org.eclipse.jst.server.generic.jboss/pom.xml
index bea887a..6b43877 100644
--- a/plugins/org.eclipse.jst.server.generic.jboss/pom.xml
+++ b/plugins/org.eclipse.jst.server.generic.jboss/pom.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2012, 2013 Eclipse Foundation and others.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Distribution License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/org/documents/edl-v10.php
-
- Contributors:
- Thanh Ha (Eclipse Foundation) - initial implementation
--->
-
-<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.eclipse.webtools.servertools</groupId>
- <artifactId>org.eclipse.webtools.servertools</artifactId>
- <version>3.6.0-SNAPSHOT</version>
- <relativePath>../../</relativePath>
- </parent>
-
- <groupId>org.eclipse.webtools.servertools</groupId>
- <artifactId>org.eclipse.jst.server.generic.jboss</artifactId>
- <version>1.6.200-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2012, 2013 Eclipse Foundation and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Distribution License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/org/documents/edl-v10.php
+
+ Contributors:
+ Thanh Ha (Eclipse Foundation) - initial implementation
+-->
+
+<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.eclipse.webtools.servertools</groupId>
+ <artifactId>org.eclipse.webtools.servertools</artifactId>
+ <version>3.6.0-SNAPSHOT</version>
+ <relativePath>../../</relativePath>
+ </parent>
+
+ <groupId>org.eclipse.webtools.servertools</groupId>
+ <artifactId>org.eclipse.jst.server.generic.jboss</artifactId>
+ <version>1.6.300-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/org.eclipse.jst.server.generic.jonas/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.server.generic.jonas/META-INF/MANIFEST.MF
index 2ed9ea4..3cd16f9 100644
--- a/plugins/org.eclipse.jst.server.generic.jonas/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.server.generic.jonas/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jst.server.generic.jonas; singleton:=true
-Bundle-Version: 1.5.400.qualifier
+Bundle-Version: 1.5.500.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Require-Bundle: org.eclipse.jst.server.core;bundle-version="[1.0.102,2.0.0)",
diff --git a/plugins/org.eclipse.jst.server.generic.jonas/META-INF/eclipse.inf b/plugins/org.eclipse.jst.server.generic.jonas/META-INF/eclipse.inf
deleted file mode 100644
index 19042e4..0000000
--- a/plugins/org.eclipse.jst.server.generic.jonas/META-INF/eclipse.inf
+++ /dev/null
@@ -1 +0,0 @@
-jarprocessor.exclude.children.pack=true
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.generic.jonas/pom.xml b/plugins/org.eclipse.jst.server.generic.jonas/pom.xml
index 006f463..e5d4c9f 100644
--- a/plugins/org.eclipse.jst.server.generic.jonas/pom.xml
+++ b/plugins/org.eclipse.jst.server.generic.jonas/pom.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2012, 2013 Eclipse Foundation and others.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Distribution License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/org/documents/edl-v10.php
-
- Contributors:
- Thanh Ha (Eclipse Foundation) - initial implementation
--->
-
-<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.eclipse.webtools.servertools</groupId>
- <artifactId>org.eclipse.webtools.servertools</artifactId>
- <version>3.6.0-SNAPSHOT</version>
- <relativePath>../../</relativePath>
- </parent>
-
- <groupId>org.eclipse.webtools.servertools</groupId>
- <artifactId>org.eclipse.jst.server.generic.jonas</artifactId>
- <version>1.5.400-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2012, 2013 Eclipse Foundation and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Distribution License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/org/documents/edl-v10.php
+
+ Contributors:
+ Thanh Ha (Eclipse Foundation) - initial implementation
+-->
+
+<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.eclipse.webtools.servertools</groupId>
+ <artifactId>org.eclipse.webtools.servertools</artifactId>
+ <version>3.6.0-SNAPSHOT</version>
+ <relativePath>../../</relativePath>
+ </parent>
+
+ <groupId>org.eclipse.webtools.servertools</groupId>
+ <artifactId>org.eclipse.jst.server.generic.jonas</artifactId>
+ <version>1.5.500-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.server.tomcat.core/META-INF/MANIFEST.MF
index 18a0dfe..81aa3e3 100644
--- a/plugins/org.eclipse.jst.server.tomcat.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.server.tomcat.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jst.server.tomcat.core; singleton:=true
-Bundle-Version: 1.1.500.qualifier
+Bundle-Version: 1.1.600.qualifier
Bundle-Activator: org.eclipse.jst.server.tomcat.core.internal.TomcatPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/META-INF/eclipse.inf b/plugins/org.eclipse.jst.server.tomcat.core/META-INF/eclipse.inf
deleted file mode 100644
index 19042e4..0000000
--- a/plugins/org.eclipse.jst.server.tomcat.core/META-INF/eclipse.inf
+++ /dev/null
@@ -1 +0,0 @@
-jarprocessor.exclude.children.pack=true
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/pom.xml b/plugins/org.eclipse.jst.server.tomcat.core/pom.xml
index 7c94d6e..847941a 100644
--- a/plugins/org.eclipse.jst.server.tomcat.core/pom.xml
+++ b/plugins/org.eclipse.jst.server.tomcat.core/pom.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2012, 2013 Eclipse Foundation and others.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Distribution License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/org/documents/edl-v10.php
-
- Contributors:
- Thanh Ha (Eclipse Foundation) - initial implementation
--->
-
-<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.eclipse.webtools.servertools</groupId>
- <artifactId>org.eclipse.webtools.servertools</artifactId>
- <version>3.6.0-SNAPSHOT</version>
- <relativePath>../../</relativePath>
- </parent>
-
- <groupId>org.eclipse.webtools.servertools</groupId>
- <artifactId>org.eclipse.jst.server.tomcat.core</artifactId>
- <version>1.1.500-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2012, 2013 Eclipse Foundation and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Distribution License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/org/documents/edl-v10.php
+
+ Contributors:
+ Thanh Ha (Eclipse Foundation) - initial implementation
+-->
+
+<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.eclipse.webtools.servertools</groupId>
+ <artifactId>org.eclipse.webtools.servertools</artifactId>
+ <version>3.6.0-SNAPSHOT</version>
+ <relativePath>../../</relativePath>
+ </parent>
+
+ <groupId>org.eclipse.webtools.servertools</groupId>
+ <artifactId>org.eclipse.jst.server.tomcat.core</artifactId>
+ <version>1.1.600-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
+</project>