fix gitignores and poms so they don't include test-time deps; instead move those into MANIFEST.MF where needed or remove where not; ignore unnecessary casts in .settings/org.eclipse.jdt.core.prefs for server.core.tests and wst.internet.monitor.tests
Signed-off-by: nickboldt <nboldt@redhat.com>
diff --git a/plugins/org.eclipse.jst.server.generic.jonas/.gitignore b/plugins/org.eclipse.jst.server.generic.jonas/.gitignore
new file mode 100644
index 0000000..ddbba60
--- /dev/null
+++ b/plugins/org.eclipse.jst.server.generic.jonas/.gitignore
@@ -0,0 +1 @@
+genericjonas.jar
diff --git a/pom.xml b/pom.xml
index dda85e9..e138e11 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,6 +28,8 @@
<properties>
<tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/servertools/webtools.servertools.git</tycho.scmUrl>
+ <tycho.version>1.0.0</tycho.version>
+ <tycho-extras.version>1.0.0</tycho-extras.version>
</properties>
<modules>
@@ -100,6 +102,26 @@
<module>features/org.eclipse.wst.server_tests.feature</module>
<module>features/org.eclipse.jst.server_tests.feature</module>
</modules>
+<!-- <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <configuration>
+ <skip>${skipITests}</skip>
+ <dependency-resolution>
+ <extraRequirements>
+ <requirement>
+ <type>p2-installable-unit</type>
+ <id>org.eclipse.wst.server.ui</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ </extraRequirements>
+ </dependency-resolution>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build> -->
</profile>
</profiles>
</project>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.server.core.tests/.gitignore b/tests/org.eclipse.jst.server.core.tests/.gitignore
index ae3c172..4ae1f72 100644
--- a/tests/org.eclipse.jst.server.core.tests/.gitignore
+++ b/tests/org.eclipse.jst.server.core.tests/.gitignore
@@ -1 +1,2 @@
/bin/
+tests.jar
diff --git a/tests/org.eclipse.jst.server.core.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.server.core.tests/.settings/org.eclipse.jdt.core.prefs
index c0bf49d..3fcbe03 100644
--- a/tests/org.eclipse.jst.server.core.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.jst.server.core.tests/.settings/org.eclipse.jdt.core.prefs
@@ -57,7 +57,7 @@
org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
diff --git a/tests/org.eclipse.jst.server.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.server.core.tests/META-INF/MANIFEST.MF
index 9a14fbc..21479b5 100644
--- a/tests/org.eclipse.jst.server.core.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.jst.server.core.tests/META-INF/MANIFEST.MF
@@ -16,6 +16,7 @@
org.eclipse.jdt.launching,
org.eclipse.wst.server.core,
org.eclipse.jst.server.core,
- org.eclipse.jst.standard.schemas
+ org.eclipse.jst.standard.schemas,
+ org.eclipse.jst.j2ee.ui
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/tests/org.eclipse.jst.server.core.tests/pom.xml b/tests/org.eclipse.jst.server.core.tests/pom.xml
index 6977722..34d6b40 100644
--- a/tests/org.eclipse.jst.server.core.tests/pom.xml
+++ b/tests/org.eclipse.jst.server.core.tests/pom.xml
@@ -39,14 +39,14 @@
<configuration>
<useUIHarness>true</useUIHarness>
<useUIThread>true</useUIThread>
- <skipTests>${skipWithIssues}</skipTests>
+<!-- <skipTests>${skipWithIssues}</skipTests>
<dependencies>
<dependency>
<type>p2-installable-unit</type>
<artifactId>org.eclipse.jst.j2ee.ui</artifactId>
<version>0.0.0</version>
</dependency>
- </dependencies>
+ </dependencies> -->
</configuration>
</plugin>
</plugins>
diff --git a/tests/org.eclipse.jst.server.generic.tests/.gitignore b/tests/org.eclipse.jst.server.generic.tests/.gitignore
index ae3c172..42824e2 100644
--- a/tests/org.eclipse.jst.server.generic.tests/.gitignore
+++ b/tests/org.eclipse.jst.server.generic.tests/.gitignore
@@ -1 +1,2 @@
/bin/
+genericServerTests.jar
diff --git a/tests/org.eclipse.jst.server.generic.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.server.generic.tests/META-INF/MANIFEST.MF
index ea2ccc7..5ba8482 100644
--- a/tests/org.eclipse.jst.server.generic.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.jst.server.generic.tests/META-INF/MANIFEST.MF
@@ -18,6 +18,7 @@
org.eclipse.jdt.launching,
org.eclipse.wst.server.core,
org.eclipse.debug.core,
- org.eclipse.jst.server.core
+ org.eclipse.jst.server.core,
+ org.eclipse.jst.server.generic.jonas
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/tests/org.eclipse.jst.server.generic.tests/pom.xml b/tests/org.eclipse.jst.server.generic.tests/pom.xml
index 6b7b289..a440eae 100644
--- a/tests/org.eclipse.jst.server.generic.tests/pom.xml
+++ b/tests/org.eclipse.jst.server.generic.tests/pom.xml
@@ -30,7 +30,7 @@
<testClass>org.eclipse.jst.server.generic.tests.AllGenericServerTests</testClass>
</properties>
- <build>
+<!-- <build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
@@ -47,5 +47,5 @@
</configuration>
</plugin>
</plugins>
- </build>
+ </build> -->
</project>
diff --git a/tests/org.eclipse.jst.server.tomcat.core.tests/.gitignore b/tests/org.eclipse.jst.server.tomcat.core.tests/.gitignore
index 5e56e04..ee87341 100644
--- a/tests/org.eclipse.jst.server.tomcat.core.tests/.gitignore
+++ b/tests/org.eclipse.jst.server.tomcat.core.tests/.gitignore
@@ -1 +1,2 @@
/bin
+tests.jar
diff --git a/tests/org.eclipse.jst.server.tomcat.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.server.tomcat.core.tests/META-INF/MANIFEST.MF
index 9099f97..e7c9889 100644
--- a/tests/org.eclipse.jst.server.tomcat.core.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.jst.server.tomcat.core.tests/META-INF/MANIFEST.MF
@@ -19,6 +19,7 @@
org.eclipse.wst.common.frameworks,
org.eclipse.wst.common.project.facet.core,
org.eclipse.jst.j2ee,
+ org.eclipse.jst.j2ee.ui,
org.eclipse.jdt.launching,
org.eclipse.core.resources,
org.eclipse.jst.server.core,
diff --git a/tests/org.eclipse.jst.server.tomcat.core.tests/pom.xml b/tests/org.eclipse.jst.server.tomcat.core.tests/pom.xml
index 20b8493..60fc631 100644
--- a/tests/org.eclipse.jst.server.tomcat.core.tests/pom.xml
+++ b/tests/org.eclipse.jst.server.tomcat.core.tests/pom.xml
@@ -30,7 +30,7 @@
<testClass>org.eclipse.jst.server.tomcat.core.tests.AllTests</testClass>
</properties>
- <build>
+<!-- <build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
@@ -47,5 +47,5 @@
</configuration>
</plugin>
</plugins>
- </build>
+ </build> -->
</project>
diff --git a/tests/org.eclipse.jst.server.ui.tests/.gitignore b/tests/org.eclipse.jst.server.ui.tests/.gitignore
index ae3c172..4ae1f72 100644
--- a/tests/org.eclipse.jst.server.ui.tests/.gitignore
+++ b/tests/org.eclipse.jst.server.ui.tests/.gitignore
@@ -1 +1,2 @@
/bin/
+tests.jar
diff --git a/tests/org.eclipse.wst.internet.monitor.core.tests/.gitignore b/tests/org.eclipse.wst.internet.monitor.core.tests/.gitignore
index ae3c172..cc74f0a 100644
--- a/tests/org.eclipse.wst.internet.monitor.core.tests/.gitignore
+++ b/tests/org.eclipse.wst.internet.monitor.core.tests/.gitignore
@@ -1 +1,2 @@
/bin/
+monitortests.jar
diff --git a/tests/org.eclipse.wst.internet.monitor.ui.tests/.gitignore b/tests/org.eclipse.wst.internet.monitor.ui.tests/.gitignore
index ae3c172..cc74f0a 100644
--- a/tests/org.eclipse.wst.internet.monitor.ui.tests/.gitignore
+++ b/tests/org.eclipse.wst.internet.monitor.ui.tests/.gitignore
@@ -1 +1,2 @@
/bin/
+monitortests.jar
diff --git a/tests/org.eclipse.wst.internet.monitor.ui.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.internet.monitor.ui.tests/.settings/org.eclipse.jdt.core.prefs
index c0bf49d..3fcbe03 100644
--- a/tests/org.eclipse.wst.internet.monitor.ui.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.wst.internet.monitor.ui.tests/.settings/org.eclipse.jdt.core.prefs
@@ -57,7 +57,7 @@
org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
diff --git a/tests/org.eclipse.wst.server.core.tests/.gitignore b/tests/org.eclipse.wst.server.core.tests/.gitignore
index ae3c172..3a3e089 100644
--- a/tests/org.eclipse.wst.server.core.tests/.gitignore
+++ b/tests/org.eclipse.wst.server.core.tests/.gitignore
@@ -1 +1,2 @@
/bin/
+servertests.jar
diff --git a/tests/org.eclipse.wst.server.http.core.tests/.gitignore b/tests/org.eclipse.wst.server.http.core.tests/.gitignore
index ae3c172..4ae1f72 100644
--- a/tests/org.eclipse.wst.server.http.core.tests/.gitignore
+++ b/tests/org.eclipse.wst.server.http.core.tests/.gitignore
@@ -1 +1,2 @@
/bin/
+tests.jar
diff --git a/tests/org.eclipse.wst.server.ui.tests/.gitignore b/tests/org.eclipse.wst.server.ui.tests/.gitignore
index ae3c172..4ae1f72 100644
--- a/tests/org.eclipse.wst.server.ui.tests/.gitignore
+++ b/tests/org.eclipse.wst.server.ui.tests/.gitignore
@@ -1 +1,2 @@
/bin/
+tests.jar
diff --git a/tests/org.eclipse.wst.server.ui.tests/pom.xml b/tests/org.eclipse.wst.server.ui.tests/pom.xml
index 477b731..41613c4 100644
--- a/tests/org.eclipse.wst.server.ui.tests/pom.xml
+++ b/tests/org.eclipse.wst.server.ui.tests/pom.xml
@@ -39,13 +39,13 @@
<configuration>
<useUIHarness>true</useUIHarness>
<useUIThread>true</useUIThread>
- <dependencies>
+<!-- <dependencies>
<dependency>
<type>p2-installable-unit</type>
<artifactId>org.eclipse.sdk.ide</artifactId>
<version>0.0.0</version>
</dependency>
- </dependencies>
+ </dependencies> -->
</configuration>
</plugin>
</plugins>
