Merge branch 'master' into twatson/container
diff --git a/bundles/org.eclipse.equinox.app/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.app/forceQualifierUpdate.txt
new file mode 100644
index 0000000..56f1032
--- /dev/null
+++ b/bundles/org.eclipse.equinox.app/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.app/pom.xml b/bundles/org.eclipse.equinox.app/pom.xml
index 01f30f5..7964a57 100644
--- a/bundles/org.eclipse.equinox.app/pom.xml
+++ b/bundles/org.eclipse.equinox.app/pom.xml
@@ -9,14 +9,12 @@
Contributors:
Igor Fedorenko - 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.bundles</artifactId>
<groupId>org.eclipse.equinox.bundles</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.bidi.tests/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.bidi.tests/forceQualifierUpdate.txt
new file mode 100644
index 0000000..56f1032
--- /dev/null
+++ b/bundles/org.eclipse.equinox.bidi.tests/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.bidi.tests/pom.xml b/bundles/org.eclipse.equinox.bidi.tests/pom.xml
index af486dd..97ea040 100644
--- a/bundles/org.eclipse.equinox.bidi.tests/pom.xml
+++ b/bundles/org.eclipse.equinox.bidi.tests/pom.xml
@@ -9,14 +9,12 @@
Contributors:
Igor Fedorenko - 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.bundles</artifactId>
<groupId>org.eclipse.equinox.bundles</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.bidi/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.bidi/forceQualifierUpdate.txt
new file mode 100644
index 0000000..56f1032
--- /dev/null
+++ b/bundles/org.eclipse.equinox.bidi/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.bidi/pom.xml b/bundles/org.eclipse.equinox.bidi/pom.xml
index ae7869f..ca49c37 100644
--- a/bundles/org.eclipse.equinox.bidi/pom.xml
+++ b/bundles/org.eclipse.equinox.bidi/pom.xml
@@ -9,14 +9,12 @@
Contributors:
Igor Fedorenko - 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.bundles</artifactId>
<groupId>org.eclipse.equinox.bundles</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.cm.test/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.cm.test/forceQualifierUpdate.txt
new file mode 100644
index 0000000..56f1032
--- /dev/null
+++ b/bundles/org.eclipse.equinox.cm.test/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.cm.test/pom.xml b/bundles/org.eclipse.equinox.cm.test/pom.xml
index 01bfb83..4e86af5 100644
--- a/bundles/org.eclipse.equinox.cm.test/pom.xml
+++ b/bundles/org.eclipse.equinox.cm.test/pom.xml
@@ -9,14 +9,12 @@
Contributors:
Igor Fedorenko - 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.bundles</artifactId>
<groupId>org.eclipse.equinox.bundles</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.cm/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.cm/forceQualifierUpdate.txt
new file mode 100644
index 0000000..56f1032
--- /dev/null
+++ b/bundles/org.eclipse.equinox.cm/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.cm/pom.xml b/bundles/org.eclipse.equinox.cm/pom.xml
index 2dfcf51..a088e6e 100644
--- a/bundles/org.eclipse.equinox.cm/pom.xml
+++ b/bundles/org.eclipse.equinox.cm/pom.xml
@@ -9,14 +9,12 @@
Contributors:
Igor Fedorenko - 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.bundles</artifactId>
<groupId>org.eclipse.equinox.bundles</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.common/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.common/META-INF/MANIFEST.MF
index a5842e7..edb8f7f 100644
--- a/bundles/org.eclipse.equinox.common/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.common/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.equinox.common; singleton:=true
-Bundle-Version: 3.6.100.qualifier
+Bundle-Version: 3.6.200.qualifier
Bundle-Localization: plugin
Export-Package: org.eclipse.core.internal.boot;x-friends:="org.eclipse.core.resources,org.eclipse.core.runtime.compatibility,org.eclipse.pde.build",
org.eclipse.core.internal.runtime;common=split;mandatory:=common;
diff --git a/bundles/org.eclipse.equinox.common/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.common/forceQualifierUpdate.txt
new file mode 100644
index 0000000..56f1032
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.common/pom.xml b/bundles/org.eclipse.equinox.common/pom.xml
index b20484b..2856ced 100644
--- a/bundles/org.eclipse.equinox.common/pom.xml
+++ b/bundles/org.eclipse.equinox.common/pom.xml
@@ -9,18 +9,16 @@
Contributors:
Igor Fedorenko - 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.bundles</artifactId>
<groupId>org.eclipse.equinox.bundles</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.common</artifactId>
- <version>3.6.100-SNAPSHOT</version>
+ <version>3.6.200-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.common/src/org/eclipse/core/internal/runtime/DataArea.java b/bundles/org.eclipse.equinox.common/src/org/eclipse/core/internal/runtime/DataArea.java
index 1e8d37d..66d9fee 100644
--- a/bundles/org.eclipse.equinox.common/src/org/eclipse/core/internal/runtime/DataArea.java
+++ b/bundles/org.eclipse.equinox.common/src/org/eclipse/core/internal/runtime/DataArea.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
+ * Copyright (c) 2004, 2013 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -97,7 +97,11 @@
if (debugOptions == null) {
return null;
}
- return new Path(debugOptions.getFile().getAbsolutePath());
+ File file = debugOptions.getFile();
+ if (file == null) {
+ return null;
+ }
+ return new Path(file.getAbsolutePath());
}
/**
diff --git a/bundles/org.eclipse.equinox.compendium.tests/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.compendium.tests/forceQualifierUpdate.txt
new file mode 100644
index 0000000..56f1032
--- /dev/null
+++ b/bundles/org.eclipse.equinox.compendium.tests/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.compendium.tests/pom.xml b/bundles/org.eclipse.equinox.compendium.tests/pom.xml
index 3dac6d5..822aae8 100644
--- a/bundles/org.eclipse.equinox.compendium.tests/pom.xml
+++ b/bundles/org.eclipse.equinox.compendium.tests/pom.xml
@@ -9,14 +9,12 @@
Contributors:
Igor Fedorenko - 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.bundles</artifactId>
<groupId>org.eclipse.equinox.bundles</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.concurrent/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.concurrent/forceQualifierUpdate.txt
new file mode 100644
index 0000000..56f1032
--- /dev/null
+++ b/bundles/org.eclipse.equinox.concurrent/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.concurrent/pom.xml b/bundles/org.eclipse.equinox.concurrent/pom.xml
index e52ff7a..9381a36 100644
--- a/bundles/org.eclipse.equinox.concurrent/pom.xml
+++ b/bundles/org.eclipse.equinox.concurrent/pom.xml
@@ -9,14 +9,12 @@
Contributors:
Igor Fedorenko - 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.bundles</artifactId>
<groupId>org.eclipse.equinox.bundles</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.console.jaas.fragment/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.console.jaas.fragment/forceQualifierUpdate.txt
new file mode 100644
index 0000000..56f1032
--- /dev/null
+++ b/bundles/org.eclipse.equinox.console.jaas.fragment/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.console.jaas.fragment/pom.xml b/bundles/org.eclipse.equinox.console.jaas.fragment/pom.xml
index 10c8c47..e158c48 100644
--- a/bundles/org.eclipse.equinox.console.jaas.fragment/pom.xml
+++ b/bundles/org.eclipse.equinox.console.jaas.fragment/pom.xml
@@ -9,14 +9,12 @@
Contributors:
Igor Fedorenko - 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.bundles</artifactId>
<groupId>org.eclipse.equinox.bundles</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.console.ssh.tests/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.console.ssh.tests/forceQualifierUpdate.txt
new file mode 100644
index 0000000..56f1032
--- /dev/null
+++ b/bundles/org.eclipse.equinox.console.ssh.tests/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.console.ssh.tests/pom.xml b/bundles/org.eclipse.equinox.console.ssh.tests/pom.xml
index eeb38b3..23440a3 100644
--- a/bundles/org.eclipse.equinox.console.ssh.tests/pom.xml
+++ b/bundles/org.eclipse.equinox.console.ssh.tests/pom.xml
@@ -9,14 +9,12 @@
Contributors:
Igor Fedorenko - 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.bundles</artifactId>
<groupId>org.eclipse.equinox.bundles</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.console.ssh/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.console.ssh/forceQualifierUpdate.txt
new file mode 100644
index 0000000..56f1032
--- /dev/null
+++ b/bundles/org.eclipse.equinox.console.ssh/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.console.ssh/pom.xml b/bundles/org.eclipse.equinox.console.ssh/pom.xml
index 055c7aa..fd687d9 100644
--- a/bundles/org.eclipse.equinox.console.ssh/pom.xml
+++ b/bundles/org.eclipse.equinox.console.ssh/pom.xml
@@ -9,15 +9,12 @@
Contributors:
Igor Fedorenko - 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.bundles</artifactId>
<groupId>org.eclipse.equinox.bundles</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.console.tests/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.console.tests/forceQualifierUpdate.txt
new file mode 100644
index 0000000..56f1032
--- /dev/null
+++ b/bundles/org.eclipse.equinox.console.tests/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.console.tests/pom.xml b/bundles/org.eclipse.equinox.console.tests/pom.xml
index 042b00d..3512c20 100644
--- a/bundles/org.eclipse.equinox.console.tests/pom.xml
+++ b/bundles/org.eclipse.equinox.console.tests/pom.xml
@@ -9,14 +9,12 @@
Contributors:
Igor Fedorenko - 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.bundles</artifactId>
<groupId>org.eclipse.equinox.bundles</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.console.tests/src/org/eclipse/equinox/console/command/adapter/CommandProviderAdapterTest.java b/bundles/org.eclipse.equinox.console.tests/src/org/eclipse/equinox/console/command/adapter/CommandProviderAdapterTest.java
index c59b1d6..91ce5f5 100755
--- a/bundles/org.eclipse.equinox.console.tests/src/org/eclipse/equinox/console/command/adapter/CommandProviderAdapterTest.java
+++ b/bundles/org.eclipse.equinox.console.tests/src/org/eclipse/equinox/console/command/adapter/CommandProviderAdapterTest.java
@@ -17,9 +17,11 @@
import java.util.HashSet;
import java.util.Set;
+import org.apache.felix.service.command.CommandSession;
import org.eclipse.osgi.framework.console.CommandInterpreter;
import org.eclipse.osgi.framework.console.CommandProvider;
import org.junit.Test;
+import org.easymock.EasyMock;
public class CommandProviderAdapterTest {
@@ -34,11 +36,12 @@
}
}
CommandProviderAdapter providerAdapter = new CommandProviderAdapter(provider, m.toArray(new Method[0]));
+ CommandSession session = EasyMock.createMock(CommandSession.class);
- String result = (String) providerAdapter.main(new Object[] {"test"});
+ String result = (String) providerAdapter.main(session, new Object[] {"test"});
assertEquals("Result should be test", "test", result);
- result = (String) providerAdapter.main(new Object[] {"echo", "hello"});
+ result = (String) providerAdapter.main(session, new Object[] {"echo", "hello"});
assertEquals("Result should be hello", "hello", result);
}
diff --git a/bundles/org.eclipse.equinox.console/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.console/forceQualifierUpdate.txt
new file mode 100644
index 0000000..56f1032
--- /dev/null
+++ b/bundles/org.eclipse.equinox.console/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.console/pom.xml b/bundles/org.eclipse.equinox.console/pom.xml
index 235efdb..04f72a2 100644
--- a/bundles/org.eclipse.equinox.console/pom.xml
+++ b/bundles/org.eclipse.equinox.console/pom.xml
@@ -9,14 +9,12 @@
Contributors:
Igor Fedorenko - 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.bundles</artifactId>
<groupId>org.eclipse.equinox.bundles</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/command/adapter/CommandProviderAdapter.java b/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/command/adapter/CommandProviderAdapter.java
index f784835..d6a7ebe 100755
--- a/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/command/adapter/CommandProviderAdapter.java
+++ b/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/command/adapter/CommandProviderAdapter.java
@@ -16,6 +16,7 @@
import java.lang.reflect.Method;
import java.util.ArrayList;
+import org.apache.felix.service.command.CommandSession;
import org.eclipse.osgi.framework.console.CommandProvider;
/**
@@ -36,14 +37,14 @@
this.commands = commands;
}
- public Object main(Object[] args) throws Exception {
+ public Object main(CommandSession commandSession, Object[] args) throws Exception {
try {
// first argument is the command
Method command = findCommand("_" + args[0]);
ArrayList<Object> argList = new ArrayList<Object>();
for (int i = 1; i < args.length; i++)
argList.add(args[i]);
- return command.invoke(commandProvider, new CustomCommandInterpreter(argList));
+ return command.invoke(commandProvider, new CustomCommandInterpreter(commandSession, argList));
} catch (InvocationTargetException e) {
if (e.getTargetException() instanceof Exception)
throw (Exception) e.getTargetException();
@@ -60,7 +61,7 @@
}
// TODO Felix gogo seems to search for _main
- public Object _main(Object[] args) throws Exception {
- return main(args);
+ public Object _main(CommandSession commandSession, Object[] args) throws Exception {
+ return main(commandSession, args);
}
}
diff --git a/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/command/adapter/CustomCommandInterpreter.java b/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/command/adapter/CustomCommandInterpreter.java
index c401e36..5feaeb4 100755
--- a/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/command/adapter/CustomCommandInterpreter.java
+++ b/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/command/adapter/CustomCommandInterpreter.java
@@ -11,10 +11,20 @@
*******************************************************************************/
package org.eclipse.equinox.console.command.adapter;
-import java.io.*;
-import java.lang.reflect.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintStream;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
import java.net.URL;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Dictionary;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.felix.service.command.CommandSession;
import org.eclipse.osgi.framework.console.CommandInterpreter;
import org.osgi.framework.Bundle;
@@ -29,6 +39,7 @@
private String tab = "\t"; //$NON-NLS-1$
private String newline = "\r\n"; //$NON-NLS-1$
private final Iterator<Object> arguments;
+ private final CommandSession commandSession;
/**
* The maximum number of lines to print without user prompt.
* 0 means no user prompt is required, the window is scrollable.
@@ -38,12 +49,19 @@
/** The number of lines printed without user prompt.*/
protected int currentLineCount;
- public CustomCommandInterpreter(List<Object> args) {
+ public CustomCommandInterpreter(CommandSession commandSession, List<Object> args) {
+ this.commandSession = commandSession;
arguments = args.iterator();
}
public Object execute(String cmd) {
- return null;
+ try {
+ return commandSession.execute(cmd);
+ } catch (RuntimeException e) {
+ throw e;
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
}
public String nextArgument() {
diff --git a/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/commands/EquinoxCommandProvider.java b/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/commands/EquinoxCommandProvider.java
index af44c57..b89fba1 100755
--- a/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/commands/EquinoxCommandProvider.java
+++ b/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/commands/EquinoxCommandProvider.java
@@ -1093,7 +1093,6 @@
public void close() throws Exception {
if (confirmStop()) {
context.getBundle(0).stop();
- System.exit(0);
}
}
diff --git a/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/commands/HelpCommand.java b/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/commands/HelpCommand.java
index 6a4461f..ddd59e5 100755
--- a/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/commands/HelpCommand.java
+++ b/bundles/org.eclipse.equinox.console/src/org/eclipse/equinox/console/commands/HelpCommand.java
@@ -18,8 +18,6 @@
import java.util.Hashtable;
import java.util.Set;
-import org.apache.felix.service.command.CommandProcessor;
-import org.apache.felix.service.command.CommandSession;
import org.eclipse.equinox.console.command.adapter.CustomCommandInterpreter;
import org.eclipse.osgi.framework.console.CommandInterpreter;
import org.eclipse.osgi.framework.console.CommandProvider;
@@ -29,6 +27,8 @@
import org.osgi.framework.ServiceReference;
import org.osgi.util.tracker.ServiceTracker;
import org.osgi.util.tracker.ServiceTrackerCustomizer;
+import org.apache.felix.service.command.CommandProcessor;
+import org.apache.felix.service.command.CommandSession;
/**
* This class provides help for the legacy equinox commands, which are adapted to Gogo commands.
@@ -116,7 +116,7 @@
}
if (command != null) {
- printLegacyCommandHelp(command);
+ printLegacyCommandHelp(session, command);
printGogoCommandHelp(session, command);
return;
}
@@ -158,7 +158,7 @@
}
}
- private void printLegacyCommandHelp(String command) {
+ private void printLegacyCommandHelp(final CommandSession session, String command) {
for (CommandProvider provider : legacyCommandProviders) {
Method[] methods = provider.getClass().getMethods();
for (Method method : methods) {
@@ -168,7 +168,7 @@
Method helpMethod = provider.getClass().getMethod("_help", CommandInterpreter.class);
ArrayList<Object> argsList = new ArrayList<Object>();
argsList.add(command);
- retval = helpMethod.invoke(provider, new CustomCommandInterpreter(argsList));
+ retval = helpMethod.invoke(provider, new CustomCommandInterpreter(session, argsList));
} catch (Exception e) {
System.out.println(provider.getHelp());
break;
diff --git a/bundles/org.eclipse.equinox.coordinator/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.coordinator/META-INF/MANIFEST.MF
index f59ca22..0b27e5d 100644
--- a/bundles/org.eclipse.equinox.coordinator/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.coordinator/META-INF/MANIFEST.MF
@@ -14,5 +14,5 @@
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Localization: plugin
Bundle-ActivationPolicy: lazy
-Export-Package: org.osgi.service.coordinator;version="1.0.0"
+Export-Package: org.osgi.service.coordinator;version="1.0.1"
Service-Component: OSGI-INF/component.xml
diff --git a/bundles/org.eclipse.equinox.coordinator/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.coordinator/forceQualifierUpdate.txt
new file mode 100644
index 0000000..56f1032
--- /dev/null
+++ b/bundles/org.eclipse.equinox.coordinator/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.coordinator/pom.xml b/bundles/org.eclipse.equinox.coordinator/pom.xml
index 9927f42..488bef0 100644
--- a/bundles/org.eclipse.equinox.coordinator/pom.xml
+++ b/bundles/org.eclipse.equinox.coordinator/pom.xml
@@ -9,15 +9,12 @@
Contributors:
Igor Fedorenko - 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.bundles</artifactId>
<groupId>org.eclipse.equinox.bundles</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.coordinator/src/org/osgi/service/coordinator/Coordination.java b/bundles/org.eclipse.equinox.coordinator/src/org/osgi/service/coordinator/Coordination.java
index 6547f72..67f67b5 100644
--- a/bundles/org.eclipse.equinox.coordinator/src/org/osgi/service/coordinator/Coordination.java
+++ b/bundles/org.eclipse.equinox.coordinator/src/org/osgi/service/coordinator/Coordination.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) OSGi Alliance (2010, 2011). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2010, 2013). All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,17 +13,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.osgi.service.coordinator;
import java.util.List;
import java.util.Map;
-
import org.osgi.framework.Bundle;
/**
* A Coordination object is used to coordinate a number of independent
* Participants.
- *
+ *
* <p>
* Once a Coordination is {@link Coordinator#create(String, long) created}, it
* can be used to add {@link Participant} objects. When the Coordination is
@@ -31,39 +31,39 @@
* A Coordination can also fail for various reasons. When this occurs, the
* participants are {@link Participant#failed(Coordination) notified} of the
* failure.
- *
+ *
* <p>
* A Coordination must be in one of two states, either ACTIVE or TERMINATED. The
* transition between ACTIVE and TERMINATED must be atomic, ensuring that a
* Participant can be guaranteed of either receiving an exception when adding
* itself to a Coordination or of receiving notification the Coordination has
* terminated.
- *
+ *
* <p>
* A Coordination object is thread safe and can be passed as a parameter to
* other parties regardless of the threads these parties use.
- *
+ *
* <p>
* The following example code shows how a Coordination should be used.
- *
+ *
* <pre>
* void foo() {
* Coordination c = coordinator.create("work", 0);
- * try {
- * doWork(c);
- * }
- * catch (Exception e) {
+ * try {
+ * doWork(c);
+ * }
+ * catch (Exception e) {
* c.fail(e);
- * }
- * finally {
- * c.end();
- * }
+ * }
+ * finally {
+ * c.end();
+ * }
* }
* </pre>
- *
+ *
* @ThreadSafe
* @noimplement
- * @version $Id$
+ * @author $Id$
*/
public interface Coordination {
@@ -89,36 +89,36 @@
/**
* Returns the id assigned to this Coordination.
- *
+ *
* The id is assigned by the {@link Coordinator} service which created this
* Coordination and is unique among all the Coordinations created by the
* Coordinator service and must not be reused as long as the Coordinator
* service remains registered. The id must be positive and monotonically
* increases for each Coordination created by the Coordinator service.
- *
+ *
* @return The id assigned to this Coordination.
*/
long getId();
/**
* Returns the name of this Coordination.
- *
+ *
* The name is specified when this Coordination was created.
- *
+ *
* @return The name of this Coordination.
- *
+ *
*/
String getName();
/**
* Terminate this Coordination normally.
- *
+ *
* <p>
* If this Coordination has been {@link #push() pushed} on the thread local
* Coordination stack of another thread, this method does nothing except
* throw a CoordinationException of type
* {@link CoordinationException#WRONG_THREAD}.
- *
+ *
* <p>
* If this Coordination has been {@link #push() pushed} on the thread local
* Coordination stack of this thread but is not the
@@ -134,18 +134,18 @@
* Coordination will be the current Coordination and will have been
* terminated as a failure if any of the terminated Coordinations threw a
* CoordinationException
- *
+ *
* <p>
* If this Coordination is the {@link Coordinator#peek() current
* Coordination}, then it will be {@link Coordinator#pop() removed} from the
* thread local Coordination stack.
- *
+ *
* <p>
* If this Coordination is already terminated, a CoordinationException is
* thrown. If this Coordination was terminated as a failure, the
* {@link #getFailure() failure cause} will be the cause of the thrown
* CoordinationException.
- *
+ *
* <p>
* Otherwise, this Coordination is terminated normally and then all
* registered {@link #getParticipants() Participants} are
@@ -154,30 +154,30 @@
* return of this method indicates that the Coordination has terminated
* normally and all registered Participants have been notified of the normal
* termination.
- *
+ *
* <p>
* It is possible that one of the Participants throws an exception during
* notification. If this happens, this Coordination is considered to have
* partially failed and this method must throw a CoordinationException of
* type {@link CoordinationException#PARTIALLY_ENDED} after all the
* registered Participants have been notified.
- *
+ *
* @throws CoordinationException If this Coordination has failed, including
* timed out, or partially failed or this Coordination is on the
* thread local Coordination stack of another thread.
- * @throws SecurityException If the caller does not have {@code
- * CoordinationPermission[INITIATE]} for this Coordination.
+ * @throws SecurityException If the caller does not have
+ * {@code CoordinationPermission[INITIATE]} for this Coordination.
*/
void end();
/**
* Terminate this Coordination as a failure with the specified failure
* cause.
- *
+ *
* <p>
* If this Coordination is already {@link #isTerminated() terminated}, this
* method does nothing and returns {@code false}.
- *
+ *
* <p>
* Otherwise, this Coordination is terminated as a failure with the
* specified failure cause and then all registered
@@ -185,20 +185,21 @@
* {@link Participant#failed(Coordination) notified}. Participants should
* discard any work associated with this Coordination. This method will
* return {@code true}.
- *
+ *
* <p>
* If this Coordination has been {@link #push() pushed} onto a thread local
* Coordination stack, this Coordination is not removed from the stack. The
* creator of this Coordination must still call {@link #end()} on this
* Coordination to cause it to be removed from the thread local Coordination
* stack.
- *
+ *
* @param cause The failure cause. The failure cause must not be
* {@code null}.
* @return {@code true} if this Coordination was active and was terminated
* by this method, otherwise {@code false}.
- * @throws SecurityException If the caller does not have {@code
- * CoordinationPermission[PARTICIPATE]} for this Coordination.
+ * @throws SecurityException If the caller does not have
+ * {@code CoordinationPermission[PARTICIPATE]} for this
+ * Coordination.
*/
boolean fail(Throwable cause);
@@ -226,7 +227,7 @@
/**
* Returns whether this Coordination is terminated.
- *
+ *
* @return {@code true} if this Coordination is terminated, otherwise
* {@code false} if this Coordination is active.
*/
@@ -234,20 +235,20 @@
/**
* Register a Participant with this Coordination.
- *
+ *
* <p>
* Once a Participant is registered with this Coordination, it is guaranteed
* to receive a notification for either
* {@link Participant#ended(Coordination) normal} or
* {@link Participant#failed(Coordination) failure} termination when this
* Coordination is terminated.
- *
+ *
* <p>
* Participants are registered using their object identity. Once a
* Participant is registered with this Coordination, subsequent attempts to
* register the Participant again with this Coordination are ignored and the
* Participant is only notified once when this Coordination is terminated.
- *
+ *
* <p>
* A Participant can only be registered with a single active Coordination at
* a time. If a Participant is already registered with an active
@@ -256,16 +257,16 @@
* registered with terminates. Notice that in edge cases the notification to
* the Participant that this Coordination has terminated can happen before
* this method returns.
- *
+ *
* <p>
* Attempting to register a Participant with a {@link #isTerminated()
* terminated} Coordination will result in a CoordinationException being
* thrown.
- *
+ *
* <p>
* The ordering of notifying Participants must follow the reverse order in
* which the Participants were registered.
- *
+ *
* @param participant The Participant to register with this Coordination.
* The participant must not be {@code null}.
* @throws CoordinationException If the Participant could not be registered
@@ -280,45 +281,51 @@
/**
* Returns a snapshot of the Participants registered with this Coordination.
- *
+ *
* @return A snapshot of the Participants registered with this Coordination.
* If no Participants are registered with this Coordination, the
* returned list will be empty. The list is ordered in the order the
* Participants were registered. The returned list is the property
* of the caller and can be modified by the caller.
- * @throws SecurityException If the caller does not have {@code
- * CoordinationPermission[INITIATE]} for this Coordination.
+ * @throws SecurityException If the caller does not have
+ * {@code CoordinationPermission[INITIATE]} for this Coordination.
*/
List<Participant> getParticipants();
/**
* Returns the variable map associated with this Coordination.
- *
+ *
* Each Coordination has a map that can be used for communicating between
* different Participants. The key of the map is a class, allowing for
* private data to be stored in the map by using implementation classes or
* shared data by using shared interfaces.
- *
+ *
* The returned map is not synchronized. Users of the map must synchronize
* on the Map object while making changes.
- *
+ *
* @return The variable map associated with this Coordination.
- * @throws SecurityException If the caller does not have {@code
- * CoordinationPermission[PARTICIPANT]} for this Coordination.
+ * @throws SecurityException If the caller does not have
+ * {@code CoordinationPermission[PARTICIPANT]} for this
+ * Coordination.
*/
- Map<Class< ? >, Object> getVariables();
+ Map<Class<?>, Object> getVariables();
/**
* Extend the time out of this Coordination.
- *
+ *
* <p>
* Participants can call this method to extend the timeout of this
* Coordination with at least the specified time. This can be done by
* Participants when they know a task will take more than normal time.
- *
- * This method returns the new deadline. Specifying a timeout extension of 0
- * will return the existing deadline.
- *
+ *
+ * <p>
+ * This method will return the new deadline if an extension took place or
+ * the current deadline if, for whatever reason, no extension takes place.
+ * Note that if a maximum timeout is in effect, the deadline may not be
+ * extended by as much as was requested, if at all. If there is no deadline,
+ * zero is returned. Specifying a timeout extension of 0 will return the
+ * existing deadline.
+ *
* @param timeMillis The time in milliseconds to extend the current timeout.
* If the initial timeout was specified as 0, no extension must take
* place. A zero must have no effect.
@@ -329,21 +336,23 @@
* @throws CoordinationException If this Coordination
* {@link #isTerminated() is terminated}.
* @throws IllegalArgumentException If the specified time is negative.
- * @throws SecurityException If the caller does not have {@code
- * CoordinationPermission[PARTICIPATE]} for this Coordination.
+ * @throws SecurityException If the caller does not have
+ * {@code CoordinationPermission[PARTICIPATE]} for this
+ * Coordination.
*/
long extendTimeout(long timeMillis);
/**
* Wait until this Coordination is terminated and all registered
* Participants have been notified.
- *
+ *
* @param timeMillis Maximum time in milliseconds to wait. Specifying a time
* of 0 will wait until this Coordination is terminated.
* @throws InterruptedException If the wait is interrupted.
* @throws IllegalArgumentException If the specified time is negative.
- * @throws SecurityException If the caller does not have {@code
- * CoordinationPermission[PARTICIPATE]} for this Coordination.
+ * @throws SecurityException If the caller does not have
+ * {@code CoordinationPermission[PARTICIPATE]} for this
+ * Coordination.
*/
void join(long timeMillis) throws InterruptedException;
@@ -351,25 +360,25 @@
/**
* Push this Coordination object onto the thread local Coordination stack to
* make it the {@link Coordinator#peek() current Coordination}.
- *
+ *
* @return This Coordination.
* @throws CoordinationException If this Coordination is already on the any
* thread's thread local Coordination stack or this Coordination
* {@link #isTerminated() is terminated}.
- * @throws SecurityException If the caller does not have {@code
- * CoordinationPermission[INITIATE]} for this Coordination.
+ * @throws SecurityException If the caller does not have
+ * {@code CoordinationPermission[INITIATE]} for this Coordination.
*/
Coordination push();
/**
* Returns the thread in whose thread local Coordination stack this
* Coordination has been {@link #push() pushed}.
- *
+ *
* @return The thread in whose thread local Coordination stack this
* Coordination has been pushed or {@code null} if this Coordination
* is not in any thread local Coordination stack.
- * @throws SecurityException If the caller does not have {@code
- * CoordinationPermission[ADMIN]} for this Coordination.
+ * @throws SecurityException If the caller does not have
+ * {@code CoordinationPermission[ADMIN]} for this Coordination.
*/
Thread getThread();
@@ -377,17 +386,17 @@
* Returns the bundle that created this Coordination. This is the bundle
* that obtained the {@link Coordinator} service that was used to create
* this Coordination.
- *
+ *
* @return The bundle that created this Coordination.
- * @throws SecurityException If the caller does not have {@code
- * CoordinationPermission[ADMIN]} for this Coordination.
+ * @throws SecurityException If the caller does not have
+ * {@code CoordinationPermission[ADMIN]} for this Coordination.
*/
Bundle getBundle();
/**
* Returns the Coordination enclosing this Coordination if this Coordination
* is on the thread local Coordination stack.
- *
+ *
* <p>
* When a Coordination is {@link #push() pushed} onto the thread local
* Coordination stack, the former {@link Coordinator#peek() current
@@ -395,13 +404,13 @@
* Coordination. When this Coordination is {@link Coordinator#pop() removed}
* from the thread local Coordination stack, this Coordination no longer has
* an enclosing Coordination.
- *
+ *
* @return The Coordination enclosing this Coordination if this Coordination
* is on the thread local Coordination stack or {@code null} if this
* Coordination is not on the thread local Coordination stack or has
* no enclosing Coordination.
- * @throws SecurityException If the caller does not have {@code
- * CoordinationPermission[ADMIN]} for this Coordination.
+ * @throws SecurityException If the caller does not have
+ * {@code CoordinationPermission[ADMIN]} for this Coordination.
*/
Coordination getEnclosingCoordination();
}
diff --git a/bundles/org.eclipse.equinox.coordinator/src/org/osgi/service/coordinator/CoordinationException.java b/bundles/org.eclipse.equinox.coordinator/src/org/osgi/service/coordinator/CoordinationException.java
index 9813b5b..cb7e25a 100644
--- a/bundles/org.eclipse.equinox.coordinator/src/org/osgi/service/coordinator/CoordinationException.java
+++ b/bundles/org.eclipse.equinox.coordinator/src/org/osgi/service/coordinator/CoordinationException.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) OSGi Alliance (2010, 2011). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2010, 2013). All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,12 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.osgi.service.coordinator;
/**
* Unchecked exception which may be thrown by a Coordinator implementation.
*
- * @version $Id$
+ * @author $Id$
*/
public class CoordinationException extends RuntimeException {
private static final long serialVersionUID = 1L;
@@ -80,22 +81,21 @@
* @param coordination The Coordination associated with this exception.
* @param cause The cause associated with this exception.
* @param type The type of this exception.
+ * @throws IllegalArgumentException If the specified type is {@link #FAILED}
+ * and the specified cause is {@code null}.
*/
- public CoordinationException(String message, Coordination coordination,
- int type, Throwable cause) {
+ public CoordinationException(String message, Coordination coordination, int type, Throwable cause) {
super(message, cause);
this.type = type;
if (coordination == null) {
this.id = -1L;
this.name = "<>";
- }
- else {
+ } else {
this.id = coordination.getId();
this.name = coordination.getName();
}
if ((type == FAILED) && (cause == null)) {
- throw new IllegalArgumentException(
- "A cause must be specified for type FAILED");
+ throw new IllegalArgumentException("A cause must be specified for type FAILED");
}
}
@@ -105,22 +105,21 @@
* @param message The detail message for this exception.
* @param coordination The Coordination associated with this exception.
* @param type The type of this exception.
+ * @throws IllegalArgumentException If the specified type is {@link #FAILED}
+ * .
*/
- public CoordinationException(String message, Coordination coordination,
- int type) {
+ public CoordinationException(String message, Coordination coordination, int type) {
super(message);
this.type = type;
if (coordination == null) {
this.id = -1L;
this.name = "<>";
- }
- else {
+ } else {
this.id = coordination.getId();
this.name = coordination.getName();
}
if (type == FAILED) {
- throw new IllegalArgumentException(
- "A cause must be specified for type FAILED");
+ throw new IllegalArgumentException("A cause must be specified for type FAILED");
}
}
diff --git a/bundles/org.eclipse.equinox.coordinator/src/org/osgi/service/coordinator/CoordinationPermission.java b/bundles/org.eclipse.equinox.coordinator/src/org/osgi/service/coordinator/CoordinationPermission.java
index 5c0e011..13aa34e 100644
--- a/bundles/org.eclipse.equinox.coordinator/src/org/osgi/service/coordinator/CoordinationPermission.java
+++ b/bundles/org.eclipse.equinox.coordinator/src/org/osgi/service/coordinator/CoordinationPermission.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) OSGi Alliance (2010, 2011). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2010, 2013). All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.osgi.service.coordinator;
import java.io.IOException;
@@ -33,7 +34,6 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-
import org.osgi.framework.Bundle;
import org.osgi.framework.Filter;
import org.osgi.framework.FrameworkUtil;
@@ -47,31 +47,29 @@
* {@code participate} and {@code admin}.
*
* @ThreadSafe
- * @version $Id$
+ * @author $Id$
*/
-public class CoordinationPermission extends BasicPermission {
+public final class CoordinationPermission extends BasicPermission {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
/**
* The action string {@code initiate}.
*/
- public final static String INITIATE = "initiate";
+ public final static String INITIATE = "initiate";
/**
* The action string {@code participate}.
*/
- public final static String PARTICIPATE = "participate";
+ public final static String PARTICIPATE = "participate";
/**
* The action string {@code admin}.
*/
- public final static String ADMIN = "admin";
+ public final static String ADMIN = "admin";
private final static int ACTION_INITIATE = 0x00000001;
private final static int ACTION_PARTICIPATE = 0x00000002;
private final static int ACTION_ADMIN = 0x00000004;
- private final static int ACTION_ALL = ACTION_INITIATE
- | ACTION_PARTICIPATE
- | ACTION_ADMIN;
+ private final static int ACTION_ALL = ACTION_INITIATE | ACTION_PARTICIPATE | ACTION_ADMIN;
final static int ACTION_NONE = 0;
/**
@@ -160,8 +158,7 @@
* @param actions {@code admin}, {@code initiate} or {@code participate}
* (canonical order).
*/
- public CoordinationPermission(String coordinationName,
- Bundle coordinationBundle, String actions) {
+ public CoordinationPermission(String coordinationName, Bundle coordinationBundle, String actions) {
super(coordinationName);
setTransients(null, parseActions(actions));
this.bundle = coordinationBundle;
@@ -169,8 +166,7 @@
throw new NullPointerException("coordinationName must not be null");
}
if (coordinationBundle == null) {
- throw new NullPointerException(
- "coordinationBundle must not be null");
+ throw new NullPointerException("coordinationBundle must not be null");
}
}
@@ -225,9 +221,7 @@
char c;
// skip whitespace
- while ((i != -1)
- && ((c = a[i]) == ' ' || c == '\r' || c == '\n'
- || c == '\f' || c == '\t'))
+ while ((i != -1) && ((c = a[i]) == ' ' || c == '\r' || c == '\n' || c == '\f' || c == '\t'))
i--;
// check for the known strings
@@ -270,11 +264,9 @@
matchlen = 11;
mask |= ACTION_PARTICIPATE;
- }
- else {
+ } else {
// parse error
- throw new IllegalArgumentException(
- "invalid permission: " + actions);
+ throw new IllegalArgumentException("invalid permission: " + actions);
}
}
@@ -293,8 +285,7 @@
case '\t' :
break;
default :
- throw new IllegalArgumentException(
- "invalid permission: " + actions);
+ throw new IllegalArgumentException("invalid permission: " + actions);
}
i--;
}
@@ -324,10 +315,8 @@
}
try {
return FrameworkUtil.createFilter(filterString);
- }
- catch (InvalidSyntaxException e) {
- IllegalArgumentException iae = new IllegalArgumentException(
- "invalid filter");
+ } catch (InvalidSyntaxException e) {
+ IllegalArgumentException iae = new IllegalArgumentException("invalid filter");
iae.initCause(e);
throw iae;
}
@@ -466,10 +455,7 @@
CoordinationPermission cp = (CoordinationPermission) obj;
- return (action_mask == cp.action_mask)
- && getName().equals(cp.getName())
- && ((bundle == cp.bundle) || ((bundle != null) && bundle
- .equals(cp.bundle)));
+ return (action_mask == cp.action_mask) && getName().equals(cp.getName()) && ((bundle == cp.bundle) || ((bundle != null) && bundle.equals(cp.bundle)));
}
/**
@@ -491,8 +477,7 @@
* stream. The actions are serialized, and the superclass takes care of the
* name.
*/
- private synchronized void writeObject(java.io.ObjectOutputStream s)
- throws IOException {
+ private synchronized void writeObject(java.io.ObjectOutputStream s) throws IOException {
if (bundle != null) {
throw new NotSerializableException("cannot serialize");
}
@@ -507,17 +492,15 @@
* readObject is called to restore the state of this permission from a
* stream.
*/
- private synchronized void readObject(java.io.ObjectInputStream s)
- throws IOException, ClassNotFoundException {
+ private synchronized void readObject(java.io.ObjectInputStream s) throws IOException, ClassNotFoundException {
// Read in the action, then initialize the rest
s.defaultReadObject();
setTransients(parseFilter(getName()), parseActions(actions));
}
/**
- * Called by {@code <@link CoordinationPermission#implies(Permission)>}.
- * This method is only called on a requested permission which cannot have a
- * filter set.
+ * Called by {@link CoordinationPermission#implies(Permission)}. This method
+ * is only called on a requested permission which cannot have a filter set.
*
* @return a map of properties for this permission.
*/
@@ -560,8 +543,8 @@
private final String pattern;
/**
- * String constructor used by the filter matching algorithm to construct
- * a SignerProperty from the attribute value in a filter expression.
+ * String constructor used by the filter matching algorithm to construct a
+ * SignerProperty from the attribute value in a filter expression.
*
* @param pattern Attribute value in the filter expression.
*/
@@ -582,11 +565,11 @@
}
/**
- * Used by the filter matching algorithm. This methods does NOT satisfy
- * the normal equals contract. Since the class is only used in filter
- * expression evaluations, it only needs to support comparing an
- * instance created with a Bundle to an instance created with a pattern
- * string from the filter expression.
+ * Used by the filter matching algorithm. This methods does NOT satisfy the
+ * normal equals contract. Since the class is only used in filter expression
+ * evaluations, it only needs to support comparing an instance created with
+ * a Bundle to an instance created with a pattern string from the filter
+ * expression.
*
* @param o SignerProperty to compare against.
* @return true if the DN name chain matches the pattern.
@@ -597,20 +580,17 @@
SignerProperty other = (SignerProperty) o;
Bundle matchBundle = bundle != null ? bundle : other.bundle;
String matchPattern = bundle != null ? other.pattern : pattern;
- Map<X509Certificate, List<X509Certificate>> signers = matchBundle
- .getSignerCertificates(Bundle.SIGNERS_TRUSTED);
+ Map<X509Certificate, List<X509Certificate>> signers = matchBundle.getSignerCertificates(Bundle.SIGNERS_TRUSTED);
for (List<X509Certificate> signerCerts : signers.values()) {
List<String> dnChain = new ArrayList<String>(signerCerts.size());
for (X509Certificate signerCert : signerCerts) {
dnChain.add(signerCert.getSubjectDN().getName());
}
try {
- if (FrameworkUtil.matchDistinguishedNameChain(matchPattern,
- dnChain)) {
+ if (FrameworkUtil.matchDistinguishedNameChain(matchPattern, dnChain)) {
return true;
}
- }
- catch (IllegalArgumentException e) {
+ } catch (IllegalArgumentException e) {
continue; // bad pattern
}
}
@@ -618,9 +598,8 @@
}
/**
- * Since the equals method does not obey the general equals contract,
- * this method cannot generate hash codes which obey the equals
- * contract.
+ * Since the equals method does not obey the general equals contract, this
+ * method cannot generate hash codes which obey the equals contract.
*/
public int hashCode() {
return 31;
@@ -635,8 +614,7 @@
if (bundle == null) {
return false;
}
- Map<X509Certificate, List<X509Certificate>> signers = bundle
- .getSignerCertificates(Bundle.SIGNERS_TRUSTED);
+ Map<X509Certificate, List<X509Certificate>> signers = bundle.getSignerCertificates(Bundle.SIGNERS_TRUSTED);
return !signers.isEmpty();
}
}
@@ -650,7 +628,7 @@
*/
final class CoordinationPermissionCollection extends PermissionCollection {
- static final long serialVersionUID = -3350758995234427603L;
+ static final long serialVersionUID = -3350758995234427603L;
/**
* Collection of permissions.
*
@@ -688,18 +666,15 @@
*/
public void add(final Permission permission) {
if (!(permission instanceof CoordinationPermission)) {
- throw new IllegalArgumentException("invalid permission: "
- + permission);
+ throw new IllegalArgumentException("invalid permission: " + permission);
}
if (isReadOnly()) {
- throw new SecurityException("attempt to add a Permission to a "
- + "readonly PermissionCollection");
+ throw new SecurityException("attempt to add a Permission to a " + "readonly PermissionCollection");
}
final CoordinationPermission cp = (CoordinationPermission) permission;
if (cp.bundle != null) {
- throw new IllegalArgumentException("cannot add to collection: "
- + cp);
+ throw new IllegalArgumentException("cannot add to collection: " + cp);
}
final String name = cp.getName();
@@ -710,13 +685,10 @@
final int oldMask = existing.action_mask;
final int newMask = cp.action_mask;
if (oldMask != newMask) {
- pc.put(name, new CoordinationPermission(existing.filter,
- oldMask
- | newMask));
+ pc.put(name, new CoordinationPermission(existing.filter, oldMask | newMask));
}
- }
- else {
+ } else {
pc.put(name, cp);
}
@@ -786,23 +758,18 @@
}
/* serialization logic */
- private static final ObjectStreamField[] serialPersistentFields = {
- new ObjectStreamField("permissions", HashMap.class),
- new ObjectStreamField("all_allowed", Boolean.TYPE) };
+ private static final ObjectStreamField[] serialPersistentFields = {new ObjectStreamField("permissions", HashMap.class), new ObjectStreamField("all_allowed", Boolean.TYPE)};
- private synchronized void writeObject(ObjectOutputStream out)
- throws IOException {
+ private synchronized void writeObject(ObjectOutputStream out) throws IOException {
ObjectOutputStream.PutField pfields = out.putFields();
pfields.put("permissions", permissions);
pfields.put("all_allowed", all_allowed);
out.writeFields();
}
- private synchronized void readObject(java.io.ObjectInputStream in)
- throws IOException, ClassNotFoundException {
+ private synchronized void readObject(java.io.ObjectInputStream in) throws IOException, ClassNotFoundException {
ObjectInputStream.GetField gfields = in.readFields();
- permissions = (HashMap<String, CoordinationPermission>) gfields.get(
- "permissions", null);
+ permissions = (HashMap<String, CoordinationPermission>) gfields.get("permissions", null);
all_allowed = gfields.get("all_allowed", false);
}
}
diff --git a/bundles/org.eclipse.equinox.coordinator/src/org/osgi/service/coordinator/Coordinator.java b/bundles/org.eclipse.equinox.coordinator/src/org/osgi/service/coordinator/Coordinator.java
index 0de5b2d..e2e1850 100644
--- a/bundles/org.eclipse.equinox.coordinator/src/org/osgi/service/coordinator/Coordinator.java
+++ b/bundles/org.eclipse.equinox.coordinator/src/org/osgi/service/coordinator/Coordinator.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) OSGi Alliance (2010, 2011). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2010, 2013). All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.osgi.service.coordinator;
import java.util.Collection;
@@ -63,7 +64,7 @@
* <pre>
* void doWork() {
* if (coordinator.addParticipant(this)) {
- * beginWork();
+ * beginWork();
* } else {
* beginWork();
* finishWork();
@@ -81,7 +82,7 @@
*
* @ThreadSafe
* @noimplement
- * @version $Id$
+ * @author $Id$
*/
public interface Coordinator {
@@ -91,11 +92,11 @@
* @param name The name of this coordination. The name does not have to be
* unique but must follow the {@code symbolic-name} syntax from the
* Core specification.
- * @param timeMillis Timeout in milliseconds. A value of 0 means no timeout.
- * If the Coordination is not terminated within the timeout, the
- * Coordinator service will {@link Coordination#fail(Throwable) fail}
- * the Coordination with a {@link Coordination#TIMEOUT TIMEOUT}
- * exception.
+ * @param timeMillis Timeout in milliseconds. A value of 0 means no timeout
+ * is required. If the Coordination is not terminated within the
+ * timeout, the Coordinator service will
+ * {@link Coordination#fail(Throwable) fail} the Coordination with a
+ * {@link Coordination#TIMEOUT TIMEOUT} exception.
* @return The new Coordination object.
* @throws IllegalArgumentException If the specified name does not follow
* the {@code symbolic-name} syntax or the specified time is
@@ -117,11 +118,11 @@
* @param name The name of this coordination. The name does not have to be
* unique but must follow the {@code symbolic-name} syntax from the
* Core specification.
- * @param timeMillis Timeout in milliseconds. A value of 0 means no timeout.
- * If the Coordination is not terminated within the timeout, the
- * Coordinator service will {@link Coordination#fail(Throwable) fail}
- * the Coordination with a {@link Coordination#TIMEOUT TIMEOUT}
- * exception.
+ * @param timeMillis Timeout in milliseconds. A value of 0 means no timeout
+ * is required. If the Coordination is not terminated within the
+ * timeout, the Coordinator service will
+ * {@link Coordination#fail(Throwable) fail} the Coordination with a
+ * {@link Coordination#TIMEOUT TIMEOUT} exception.
* @return A new Coordination object
* @throws IllegalArgumentException If the specified name does not follow
* the {@code symbolic-name} syntax or the specified time is
diff --git a/bundles/org.eclipse.equinox.coordinator/src/org/osgi/service/coordinator/Participant.java b/bundles/org.eclipse.equinox.coordinator/src/org/osgi/service/coordinator/Participant.java
index 52e3d84..6bef92f 100644
--- a/bundles/org.eclipse.equinox.coordinator/src/org/osgi/service/coordinator/Participant.java
+++ b/bundles/org.eclipse.equinox.coordinator/src/org/osgi/service/coordinator/Participant.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) OSGi Alliance (2010, 2011). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2010, 2013). All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.osgi.service.coordinator;
/**
@@ -45,7 +46,7 @@
* returns.
*
* @ThreadSafe
- * @version $Id$
+ * @author $Id$
*/
public interface Participant {
/**
diff --git a/bundles/org.eclipse.equinox.coordinator/src/org/osgi/service/coordinator/package-info.java b/bundles/org.eclipse.equinox.coordinator/src/org/osgi/service/coordinator/package-info.java
index a48f965..a386002 100644
--- a/bundles/org.eclipse.equinox.coordinator/src/org/osgi/service/coordinator/package-info.java
+++ b/bundles/org.eclipse.equinox.coordinator/src/org/osgi/service/coordinator/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) OSGi Alliance (2010). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2010, 2012). All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -32,7 +32,9 @@
* <p>
* {@code Import-Package: org.osgi.service.coordinator; version="[1.0,1.1)"}
*
- * @version $Id$
+ * @version 1.0
+ * @author $Id$
*/
package org.osgi.service.coordinator;
+
diff --git a/bundles/org.eclipse.equinox.coordinator/src/org/osgi/service/coordinator/packageinfo b/bundles/org.eclipse.equinox.coordinator/src/org/osgi/service/coordinator/packageinfo
index 7c8de03..b3d1f97 100644
--- a/bundles/org.eclipse.equinox.coordinator/src/org/osgi/service/coordinator/packageinfo
+++ b/bundles/org.eclipse.equinox.coordinator/src/org/osgi/service/coordinator/packageinfo
@@ -1 +1 @@
-version 1.0
+version 1.0.1
diff --git a/bundles/org.eclipse.equinox.device/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.device/forceQualifierUpdate.txt
new file mode 100644
index 0000000..56f1032
--- /dev/null
+++ b/bundles/org.eclipse.equinox.device/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.device/pom.xml b/bundles/org.eclipse.equinox.device/pom.xml
index 94bf418..4a05bd4 100644
--- a/bundles/org.eclipse.equinox.device/pom.xml
+++ b/bundles/org.eclipse.equinox.device/pom.xml
@@ -9,14 +9,12 @@
Contributors:
Igor Fedorenko - 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.bundles</artifactId>
<groupId>org.eclipse.equinox.bundles</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.ds.tests/.classpath b/bundles/org.eclipse.equinox.ds.tests/.classpath
index 7fe05fa..932ccfe 100644
--- a/bundles/org.eclipse.equinox.ds.tests/.classpath
+++ b/bundles/org.eclipse.equinox.ds.tests/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" output="scr_test/tb24" path="bundles_src/tb24"/>
diff --git a/bundles/org.eclipse.equinox.ds.tests/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.equinox.ds.tests/.settings/org.eclipse.jdt.core.prefs
index 32dfe69..bfcd136 100644
--- a/bundles/org.eclipse.equinox.ds.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.equinox.ds.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,3 @@
-#Mon Dec 15 14:23:49 EET 2008
eclipse.preferences.version=1
org.eclipse.jdt.core.builder.cleanOutputFolder=clean
org.eclipse.jdt.core.builder.duplicateResourceTask=warning
@@ -8,16 +7,104 @@
org.eclipse.jdt.core.circularClasspath=error
org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
+org.eclipse.jdt.core.compiler.compliance=1.5
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.source=1.3
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.5
org.eclipse.jdt.core.incompatibleJDKLevel=ignore
org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/bundles/org.eclipse.equinox.ds.tests/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.ds.tests/META-INF/MANIFEST.MF
index 32aa93f..17a5838 100644
--- a/bundles/org.eclipse.equinox.ds.tests/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.ds.tests/META-INF/MANIFEST.MF
@@ -16,5 +16,5 @@
org.osgi.service.permissionadmin;version="1.2.0",
org.osgi.util.tracker;version="1.4.2"
Export-Package: org.eclipse.equinox.ds.tests.tbc
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
Eclipse-BundleShape: dir
diff --git a/bundles/org.eclipse.equinox.ds.tests/bundles_src/tb16/org/eclipse/equinox/ds/tests/tb16/TargetProperties.java b/bundles/org.eclipse.equinox.ds.tests/bundles_src/tb16/org/eclipse/equinox/ds/tests/tb16/TargetProperties.java
index d629e27..ba8e21d 100644
--- a/bundles/org.eclipse.equinox.ds.tests/bundles_src/tb16/org/eclipse/equinox/ds/tests/tb16/TargetProperties.java
+++ b/bundles/org.eclipse.equinox.ds.tests/bundles_src/tb16/org/eclipse/equinox/ds/tests/tb16/TargetProperties.java
@@ -12,6 +12,7 @@
package org.eclipse.equinox.ds.tests.tb16;
import java.util.Dictionary;
+import java.util.Hashtable;
import java.util.Properties;
import org.eclipse.equinox.ds.tests.tbc.PropertiesProvider;
@@ -31,7 +32,7 @@
Object prop = properties.get("serial.num");
if (prop != null) {
- Properties serviceProps = new Properties();
+ Dictionary<String, Object> serviceProps = new Hashtable<String, Object>();
serviceProps.put("serial.num", prop);
sr = ctxt.getBundleContext().registerService(getClass().getName(), this, serviceProps);
}
diff --git a/bundles/org.eclipse.equinox.ds.tests/bundles_src/tb17/org/eclipse/equinox/ds/tests/tb17/Worker.java b/bundles/org.eclipse.equinox.ds.tests/bundles_src/tb17/org/eclipse/equinox/ds/tests/tb17/Worker.java
index 5c02d20..51a6c43 100644
--- a/bundles/org.eclipse.equinox.ds.tests/bundles_src/tb17/org/eclipse/equinox/ds/tests/tb17/Worker.java
+++ b/bundles/org.eclipse.equinox.ds.tests/bundles_src/tb17/org/eclipse/equinox/ds/tests/tb17/Worker.java
@@ -12,6 +12,7 @@
package org.eclipse.equinox.ds.tests.tb17;
import java.util.Dictionary;
+import java.util.Hashtable;
import java.util.Properties;
import org.eclipse.equinox.ds.tests.tbc.PropertiesProvider;
@@ -32,7 +33,7 @@
Object prop = properties.get(ComponentConstants.COMPONENT_NAME);
if (prop != null) {
- Properties serviceProps = new Properties();
+ Dictionary<String, Object> serviceProps = new Hashtable<String, Object>();
serviceProps.put(ComponentConstants.COMPONENT_NAME, prop);
sr = ctxt.getBundleContext().registerService(PropertiesProvider.class.getName(), this, serviceProps);
}
diff --git a/bundles/org.eclipse.equinox.ds.tests/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.ds.tests/forceQualifierUpdate.txt
new file mode 100644
index 0000000..56f1032
--- /dev/null
+++ b/bundles/org.eclipse.equinox.ds.tests/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.ds.tests/pom.xml b/bundles/org.eclipse.equinox.ds.tests/pom.xml
index 5e3cd5e..a3002ca 100644
--- a/bundles/org.eclipse.equinox.ds.tests/pom.xml
+++ b/bundles/org.eclipse.equinox.ds.tests/pom.xml
@@ -9,14 +9,12 @@
Contributors:
Igor Fedorenko - 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.bundles</artifactId>
<groupId>org.eclipse.equinox.bundles</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.ds/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.ds/forceQualifierUpdate.txt
new file mode 100644
index 0000000..56f1032
--- /dev/null
+++ b/bundles/org.eclipse.equinox.ds/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.ds/pom.xml b/bundles/org.eclipse.equinox.ds/pom.xml
index 01ff38f..77bc2eb 100644
--- a/bundles/org.eclipse.equinox.ds/pom.xml
+++ b/bundles/org.eclipse.equinox.ds/pom.xml
@@ -9,14 +9,12 @@
Contributors:
Igor Fedorenko - 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.bundles</artifactId>
<groupId>org.eclipse.equinox.bundles</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.event/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.event/forceQualifierUpdate.txt
new file mode 100644
index 0000000..56f1032
--- /dev/null
+++ b/bundles/org.eclipse.equinox.event/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.event/pom.xml b/bundles/org.eclipse.equinox.event/pom.xml
index 0a5907c..5a4d943 100644
--- a/bundles/org.eclipse.equinox.event/pom.xml
+++ b/bundles/org.eclipse.equinox.event/pom.xml
@@ -9,15 +9,12 @@
Contributors:
Igor Fedorenko - 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.bundles</artifactId>
<groupId>org.eclipse.equinox.bundles</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.http.jetty5/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.http.jetty5/forceQualifierUpdate.txt
new file mode 100644
index 0000000..56f1032
--- /dev/null
+++ b/bundles/org.eclipse.equinox.http.jetty5/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.http.jetty5/pom.xml b/bundles/org.eclipse.equinox.http.jetty5/pom.xml
index f4d1235..5d3da5e 100644
--- a/bundles/org.eclipse.equinox.http.jetty5/pom.xml
+++ b/bundles/org.eclipse.equinox.http.jetty5/pom.xml
@@ -9,15 +9,12 @@
Contributors:
Igor Fedorenko - 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.bundles</artifactId>
<groupId>org.eclipse.equinox.bundles</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.http.jetty6/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.http.jetty6/forceQualifierUpdate.txt
new file mode 100644
index 0000000..56f1032
--- /dev/null
+++ b/bundles/org.eclipse.equinox.http.jetty6/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.http.jetty6/pom.xml b/bundles/org.eclipse.equinox.http.jetty6/pom.xml
index e4935dd..e4bf023 100644
--- a/bundles/org.eclipse.equinox.http.jetty6/pom.xml
+++ b/bundles/org.eclipse.equinox.http.jetty6/pom.xml
@@ -9,14 +9,12 @@
Contributors:
Igor Fedorenko - 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.bundles</artifactId>
<groupId>org.eclipse.equinox.bundles</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.http.jetty8/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.http.jetty8/forceQualifierUpdate.txt
new file mode 100644
index 0000000..56f1032
--- /dev/null
+++ b/bundles/org.eclipse.equinox.http.jetty8/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.http.jetty8/pom.xml b/bundles/org.eclipse.equinox.http.jetty8/pom.xml
index d1dcd42..8361587 100644
--- a/bundles/org.eclipse.equinox.http.jetty8/pom.xml
+++ b/bundles/org.eclipse.equinox.http.jetty8/pom.xml
@@ -9,14 +9,12 @@
Contributors:
Igor Fedorenko - 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.bundles</artifactId>
<groupId>org.eclipse.equinox.bundles</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.http.registry/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.http.registry/META-INF/MANIFEST.MF
index 42408ad..ea5ceb9 100644
--- a/bundles/org.eclipse.equinox.http.registry/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.http.registry/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %bundleName
Bundle-SymbolicName: org.eclipse.equinox.http.registry;singleton:=true
-Bundle-Version: 1.1.200.qualifier
+Bundle-Version: 1.1.300.qualifier
Bundle-Activator: org.eclipse.equinox.http.registry.internal.Activator
Bundle-Localization: plugin
Require-Bundle: org.eclipse.equinox.common,
diff --git a/bundles/org.eclipse.equinox.http.registry/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.http.registry/forceQualifierUpdate.txt
new file mode 100644
index 0000000..56f1032
--- /dev/null
+++ b/bundles/org.eclipse.equinox.http.registry/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.http.registry/pom.xml b/bundles/org.eclipse.equinox.http.registry/pom.xml
index 9f7a1df..6dc1f82 100644
--- a/bundles/org.eclipse.equinox.http.registry/pom.xml
+++ b/bundles/org.eclipse.equinox.http.registry/pom.xml
@@ -9,19 +9,17 @@
Contributors:
Igor Fedorenko - 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.bundles</artifactId>
<groupId>org.eclipse.equinox.bundles</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.http.registry</artifactId>
- <version>1.1.200-SNAPSHOT</version>
+ <version>1.1.300-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>
diff --git a/bundles/org.eclipse.equinox.http.registry/src/org/eclipse/equinox/http/registry/internal/HttpRegistryManager.java b/bundles/org.eclipse.equinox.http.registry/src/org/eclipse/equinox/http/registry/internal/HttpRegistryManager.java
index 0266209..0349ffc 100644
--- a/bundles/org.eclipse.equinox.http.registry/src/org/eclipse/equinox/http/registry/internal/HttpRegistryManager.java
+++ b/bundles/org.eclipse.equinox.http.registry/src/org/eclipse/equinox/http/registry/internal/HttpRegistryManager.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2010 IBM Corporation and others.
+ * Copyright (c) 2007, 2013 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -292,13 +292,25 @@
HttpContext context = getHttpContext(contribution.httpContextId, contribution.contributor);
if (context == null)
return false;
+
+ Method registerFilterMethod = null;
try {
- Method registerFilterMethod = httpService.getClass().getMethod("registerFilter", new Class[] {String.class, Filter.class, Dictionary.class, HttpContext.class}); //$NON-NLS-1$
+ // First, try the Equinox http service method
+ registerFilterMethod = httpService.getClass().getMethod("registerFilter", new Class[] {String.class, Filter.class, Dictionary.class, HttpContext.class}); //$NON-NLS-1$
registerFilterMethod.invoke(httpService, new Object[] {contribution.alias, contribution.filter, contribution.initparams, context});
return true;
- } catch (NoSuchMethodException t) {
+ } catch (NoSuchMethodException e) {
+ // Give the pax-web HttpService impl a try
+ try {
+ registerFilterMethod = httpService.getClass().getMethod("registerFilter", new Class[] {Filter.class, String[].class, String[].class, Dictionary.class, HttpContext.class}); //$NON-NLS-1$
+ registerFilterMethod.invoke(httpService, new Object[] {contribution.filter, new String[] {contribution.alias}, null, contribution.initparams, context});
+ return true;
+ } catch (Throwable t) {
+ // TODO: should log this
+ // for now ignore
+ }
// TODO: should log this
- // for now ignore
+ e.printStackTrace();
} catch (Throwable t) {
// TODO: should log this
t.printStackTrace();
diff --git a/bundles/org.eclipse.equinox.http.servlet/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.http.servlet/forceQualifierUpdate.txt
new file mode 100644
index 0000000..56f1032
--- /dev/null
+++ b/bundles/org.eclipse.equinox.http.servlet/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.http.servlet/pom.xml b/bundles/org.eclipse.equinox.http.servlet/pom.xml
index e826b1d..9e703ce 100644
--- a/bundles/org.eclipse.equinox.http.servlet/pom.xml
+++ b/bundles/org.eclipse.equinox.http.servlet/pom.xml
@@ -9,14 +9,12 @@
Contributors:
Igor Fedorenko - 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.bundles</artifactId>
<groupId>org.eclipse.equinox.bundles</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.http.servletbridge/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.http.servletbridge/forceQualifierUpdate.txt
new file mode 100644
index 0000000..56f1032
--- /dev/null
+++ b/bundles/org.eclipse.equinox.http.servletbridge/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.http.servletbridge/pom.xml b/bundles/org.eclipse.equinox.http.servletbridge/pom.xml
index c77ddac..b3e03ca 100644
--- a/bundles/org.eclipse.equinox.http.servletbridge/pom.xml
+++ b/bundles/org.eclipse.equinox.http.servletbridge/pom.xml
@@ -9,15 +9,12 @@
Contributors:
Igor Fedorenko - 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.bundles</artifactId>
<groupId>org.eclipse.equinox.bundles</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
@@ -38,7 +35,7 @@
<filter>
<type>osgi-bundle</type>
<id>org.eclipse.equinox.servletbridge.extensionbundle</id>
- <removeAll />
+ <removeAll/>
</filter>
</filters>
</configuration>
diff --git a/bundles/org.eclipse.equinox.http/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.http/forceQualifierUpdate.txt
new file mode 100644
index 0000000..56f1032
--- /dev/null
+++ b/bundles/org.eclipse.equinox.http/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.http/pom.xml b/bundles/org.eclipse.equinox.http/pom.xml
index ea4d49c..fd35d28 100644
--- a/bundles/org.eclipse.equinox.http/pom.xml
+++ b/bundles/org.eclipse.equinox.http/pom.xml
@@ -9,15 +9,12 @@
Contributors:
Igor Fedorenko - 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.bundles</artifactId>
<groupId>org.eclipse.equinox.bundles</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
@@ -40,7 +37,7 @@
<filter>
<type>osgi-bundle</type>
<id>org.eclipse.equinox.servletbridge.extensionbundle</id>
- <removeAll />
+ <removeAll/>
</filter>
</filters>
<dependency-resolution>
diff --git a/bundles/org.eclipse.equinox.io/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.io/META-INF/MANIFEST.MF
index aaed49a..7cbf2b6 100644
--- a/bundles/org.eclipse.equinox.io/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.io/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %bundleName
Bundle-SymbolicName: org.eclipse.equinox.io
-Bundle-Version: 1.0.400.qualifier
+Bundle-Version: 1.0.500.qualifier
Bundle-Vendor: %bundleVendor
Bundle-Activator: org.eclipse.equinox.internal.io.impl.Activator
Bundle-Description: This bundle contains service for creating connections.
diff --git a/bundles/org.eclipse.equinox.io/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.io/forceQualifierUpdate.txt
new file mode 100644
index 0000000..56f1032
--- /dev/null
+++ b/bundles/org.eclipse.equinox.io/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.io/pom.xml b/bundles/org.eclipse.equinox.io/pom.xml
index 56472f6..81ec8b5 100644
--- a/bundles/org.eclipse.equinox.io/pom.xml
+++ b/bundles/org.eclipse.equinox.io/pom.xml
@@ -9,36 +9,16 @@
Contributors:
Igor Fedorenko - 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.bundles</artifactId>
<groupId>org.eclipse.equinox.bundles</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.io</artifactId>
- <version>1.0.400-SNAPSHOT</version>
+ <version>1.0.500-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
-
- <profiles>
- <profile>
- <id>no-bree-libs</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/bundles/org.eclipse.equinox.ip/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.ip/forceQualifierUpdate.txt
new file mode 100644
index 0000000..56f1032
--- /dev/null
+++ b/bundles/org.eclipse.equinox.ip/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.ip/pom.xml b/bundles/org.eclipse.equinox.ip/pom.xml
index 403cf0a..947551c 100644
--- a/bundles/org.eclipse.equinox.ip/pom.xml
+++ b/bundles/org.eclipse.equinox.ip/pom.xml
@@ -9,14 +9,12 @@
Contributors:
Igor Fedorenko - 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.bundles</artifactId>
<groupId>org.eclipse.equinox.bundles</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.jsp.jasper.registry/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.jsp.jasper.registry/forceQualifierUpdate.txt
new file mode 100644
index 0000000..56f1032
--- /dev/null
+++ b/bundles/org.eclipse.equinox.jsp.jasper.registry/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.jsp.jasper.registry/pom.xml b/bundles/org.eclipse.equinox.jsp.jasper.registry/pom.xml
index 0b50247..6043bba 100644
--- a/bundles/org.eclipse.equinox.jsp.jasper.registry/pom.xml
+++ b/bundles/org.eclipse.equinox.jsp.jasper.registry/pom.xml
@@ -9,14 +9,12 @@
Contributors:
Igor Fedorenko - 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.bundles</artifactId>
<groupId>org.eclipse.equinox.bundles</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.jsp.jasper/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.jsp.jasper/forceQualifierUpdate.txt
new file mode 100644
index 0000000..56f1032
--- /dev/null
+++ b/bundles/org.eclipse.equinox.jsp.jasper/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.jsp.jasper/pom.xml b/bundles/org.eclipse.equinox.jsp.jasper/pom.xml
index 2e1f999..40b7915 100644
--- a/bundles/org.eclipse.equinox.jsp.jasper/pom.xml
+++ b/bundles/org.eclipse.equinox.jsp.jasper/pom.xml
@@ -9,14 +9,12 @@
Contributors:
Igor Fedorenko - 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.bundles</artifactId>
<groupId>org.eclipse.equinox.bundles</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.log.test/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.log.test/forceQualifierUpdate.txt
new file mode 100644
index 0000000..56f1032
--- /dev/null
+++ b/bundles/org.eclipse.equinox.log.test/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.log.test/pom.xml b/bundles/org.eclipse.equinox.log.test/pom.xml
index f1152d7..04b3f81 100644
--- a/bundles/org.eclipse.equinox.log.test/pom.xml
+++ b/bundles/org.eclipse.equinox.log.test/pom.xml
@@ -9,14 +9,12 @@
Contributors:
Igor Fedorenko - 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.bundles</artifactId>
<groupId>org.eclipse.equinox.bundles</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.log/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.log/forceQualifierUpdate.txt
new file mode 100644
index 0000000..56f1032
--- /dev/null
+++ b/bundles/org.eclipse.equinox.log/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.log/pom.xml b/bundles/org.eclipse.equinox.log/pom.xml
index 28e7c03..0acb38b 100644
--- a/bundles/org.eclipse.equinox.log/pom.xml
+++ b/bundles/org.eclipse.equinox.log/pom.xml
@@ -9,14 +9,12 @@
Contributors:
Igor Fedorenko - 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.bundles</artifactId>
<groupId>org.eclipse.equinox.bundles</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.metatype/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.metatype/forceQualifierUpdate.txt
new file mode 100644
index 0000000..56f1032
--- /dev/null
+++ b/bundles/org.eclipse.equinox.metatype/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.metatype/pom.xml b/bundles/org.eclipse.equinox.metatype/pom.xml
index 468ad00..0d08804 100644
--- a/bundles/org.eclipse.equinox.metatype/pom.xml
+++ b/bundles/org.eclipse.equinox.metatype/pom.xml
@@ -9,15 +9,12 @@
Contributors:
Igor Fedorenko - 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.bundles</artifactId>
<groupId>org.eclipse.equinox.bundles</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.preferences/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.preferences/forceQualifierUpdate.txt
new file mode 100644
index 0000000..56f1032
--- /dev/null
+++ b/bundles/org.eclipse.equinox.preferences/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.preferences/pom.xml b/bundles/org.eclipse.equinox.preferences/pom.xml
index 07fa5ff..8a1881c 100644
--- a/bundles/org.eclipse.equinox.preferences/pom.xml
+++ b/bundles/org.eclipse.equinox.preferences/pom.xml
@@ -9,15 +9,12 @@
Contributors:
Igor Fedorenko - 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.bundles</artifactId>
<groupId>org.eclipse.equinox.bundles</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.region.tests/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.region.tests/forceQualifierUpdate.txt
new file mode 100644
index 0000000..56f1032
--- /dev/null
+++ b/bundles/org.eclipse.equinox.region.tests/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.region.tests/pom.xml b/bundles/org.eclipse.equinox.region.tests/pom.xml
index 77b7510..d519c6b 100644
--- a/bundles/org.eclipse.equinox.region.tests/pom.xml
+++ b/bundles/org.eclipse.equinox.region.tests/pom.xml
@@ -9,14 +9,12 @@
Contributors:
Igor Fedorenko - 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.bundles</artifactId>
<groupId>org.eclipse.equinox.bundles</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.region/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.region/forceQualifierUpdate.txt
new file mode 100644
index 0000000..56f1032
--- /dev/null
+++ b/bundles/org.eclipse.equinox.region/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.region/pom.xml b/bundles/org.eclipse.equinox.region/pom.xml
index 328edcd..70485db 100644
--- a/bundles/org.eclipse.equinox.region/pom.xml
+++ b/bundles/org.eclipse.equinox.region/pom.xml
@@ -9,14 +9,12 @@
Contributors:
Igor Fedorenko - 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.bundles</artifactId>
<groupId>org.eclipse.equinox.bundles</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.registry/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.registry/forceQualifierUpdate.txt
new file mode 100644
index 0000000..56f1032
--- /dev/null
+++ b/bundles/org.eclipse.equinox.registry/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.registry/pom.xml b/bundles/org.eclipse.equinox.registry/pom.xml
index 9fd7d61..d9454a8 100644
--- a/bundles/org.eclipse.equinox.registry/pom.xml
+++ b/bundles/org.eclipse.equinox.registry/pom.xml
@@ -9,14 +9,12 @@
Contributors:
Igor Fedorenko - 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.bundles</artifactId>
<groupId>org.eclipse.equinox.bundles</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.security.macosx/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.security.macosx/forceQualifierUpdate.txt
new file mode 100644
index 0000000..56f1032
--- /dev/null
+++ b/bundles/org.eclipse.equinox.security.macosx/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.security.macosx/pom.xml b/bundles/org.eclipse.equinox.security.macosx/pom.xml
index f41755e..d456302 100644
--- a/bundles/org.eclipse.equinox.security.macosx/pom.xml
+++ b/bundles/org.eclipse.equinox.security.macosx/pom.xml
@@ -9,15 +9,12 @@
Contributors:
Igor Fedorenko - 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.bundles</artifactId>
<groupId>org.eclipse.equinox.bundles</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.security.tests/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.security.tests/forceQualifierUpdate.txt
new file mode 100644
index 0000000..56f1032
--- /dev/null
+++ b/bundles/org.eclipse.equinox.security.tests/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.security.tests/pom.xml b/bundles/org.eclipse.equinox.security.tests/pom.xml
index 0f19ecd..c0f2b48 100644
--- a/bundles/org.eclipse.equinox.security.tests/pom.xml
+++ b/bundles/org.eclipse.equinox.security.tests/pom.xml
@@ -9,14 +9,12 @@
Contributors:
Igor Fedorenko - 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.bundles</artifactId>
<groupId>org.eclipse.equinox.bundles</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.security.ui/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.security.ui/forceQualifierUpdate.txt
new file mode 100644
index 0000000..56f1032
--- /dev/null
+++ b/bundles/org.eclipse.equinox.security.ui/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.security.ui/pom.xml b/bundles/org.eclipse.equinox.security.ui/pom.xml
index 318e0b0..64442fa 100644
--- a/bundles/org.eclipse.equinox.security.ui/pom.xml
+++ b/bundles/org.eclipse.equinox.security.ui/pom.xml
@@ -9,16 +9,13 @@
Contributors:
Igor Fedorenko - 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.bundles</artifactId>
<groupId>org.eclipse.equinox.bundles</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
diff --git a/bundles/org.eclipse.equinox.security.win32.x86/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.security.win32.x86/forceQualifierUpdate.txt
new file mode 100644
index 0000000..56f1032
--- /dev/null
+++ b/bundles/org.eclipse.equinox.security.win32.x86/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.security.win32.x86/pom.xml b/bundles/org.eclipse.equinox.security.win32.x86/pom.xml
index 0120697..603e697 100644
--- a/bundles/org.eclipse.equinox.security.win32.x86/pom.xml
+++ b/bundles/org.eclipse.equinox.security.win32.x86/pom.xml
@@ -9,14 +9,12 @@
Contributors:
Igor Fedorenko - 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.bundles</artifactId>
<groupId>org.eclipse.equinox.bundles</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.security.win32.x86_64/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.security.win32.x86_64/forceQualifierUpdate.txt
new file mode 100644
index 0000000..56f1032
--- /dev/null
+++ b/bundles/org.eclipse.equinox.security.win32.x86_64/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.security.win32.x86_64/pom.xml b/bundles/org.eclipse.equinox.security.win32.x86_64/pom.xml
index 42de8a9..5136aab 100644
--- a/bundles/org.eclipse.equinox.security.win32.x86_64/pom.xml
+++ b/bundles/org.eclipse.equinox.security.win32.x86_64/pom.xml
@@ -9,15 +9,12 @@
Contributors:
Igor Fedorenko - 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.bundles</artifactId>
<groupId>org.eclipse.equinox.bundles</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.security/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.security/forceQualifierUpdate.txt
new file mode 100644
index 0000000..56f1032
--- /dev/null
+++ b/bundles/org.eclipse.equinox.security/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.security/pom.xml b/bundles/org.eclipse.equinox.security/pom.xml
index 9762fe7..7496129 100644
--- a/bundles/org.eclipse.equinox.security/pom.xml
+++ b/bundles/org.eclipse.equinox.security/pom.xml
@@ -9,15 +9,12 @@
Contributors:
Igor Fedorenko - 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.bundles</artifactId>
<groupId>org.eclipse.equinox.bundles</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.servletbridge.extensionbundle/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.servletbridge.extensionbundle/forceQualifierUpdate.txt
new file mode 100644
index 0000000..56f1032
--- /dev/null
+++ b/bundles/org.eclipse.equinox.servletbridge.extensionbundle/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.servletbridge.extensionbundle/pom.xml b/bundles/org.eclipse.equinox.servletbridge.extensionbundle/pom.xml
index 74c2611..ce71771 100644
--- a/bundles/org.eclipse.equinox.servletbridge.extensionbundle/pom.xml
+++ b/bundles/org.eclipse.equinox.servletbridge.extensionbundle/pom.xml
@@ -9,14 +9,12 @@
Contributors:
Igor Fedorenko - 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.bundles</artifactId>
<groupId>org.eclipse.equinox.bundles</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.servletbridge.template/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.servletbridge.template/forceQualifierUpdate.txt
new file mode 100644
index 0000000..56f1032
--- /dev/null
+++ b/bundles/org.eclipse.equinox.servletbridge.template/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.servletbridge.template/pom.xml b/bundles/org.eclipse.equinox.servletbridge.template/pom.xml
index 8b12a94..50944d7 100644
--- a/bundles/org.eclipse.equinox.servletbridge.template/pom.xml
+++ b/bundles/org.eclipse.equinox.servletbridge.template/pom.xml
@@ -9,14 +9,12 @@
Contributors:
Igor Fedorenko - 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.bundles</artifactId>
<groupId>org.eclipse.equinox.bundles</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.servletbridge/.classpath b/bundles/org.eclipse.equinox.servletbridge/.classpath
index ce0c7a5..6f3b481 100644
--- a/bundles/org.eclipse.equinox.servletbridge/.classpath
+++ b/bundles/org.eclipse.equinox.servletbridge/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/CDC-1.0%Foundation-1.0"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/CDC-1.1%Foundation-1.1"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/bundles/org.eclipse.equinox.servletbridge/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.equinox.servletbridge/.settings/org.eclipse.jdt.core.prefs
index f31f250..1ba978e 100644
--- a/bundles/org.eclipse.equinox.servletbridge/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.equinox.servletbridge/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,3 @@
-#Tue Aug 21 11:27:47 CDT 2007
eclipse.preferences.version=1
org.eclipse.jdt.core.builder.cleanOutputFolder=clean
org.eclipse.jdt.core.builder.duplicateResourceTask=warning
@@ -144,7 +143,12 @@
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
diff --git a/bundles/org.eclipse.equinox.servletbridge/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.servletbridge/META-INF/MANIFEST.MF
index b19c9b6..84a2fec 100644
--- a/bundles/org.eclipse.equinox.servletbridge/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.servletbridge/META-INF/MANIFEST.MF
@@ -3,10 +3,10 @@
Bundle-Name: %bundleName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.equinox.servletbridge;singleton:=true
-Bundle-Version: 1.2.200.qualifier
+Bundle-Version: 1.2.300.qualifier
Bundle-Localization: plugin
Import-Package: javax.servlet;version="2.3.0",
javax.servlet.http;version="2.3.0"
Export-Package: org.eclipse.equinox.servletbridge;version="1.1.0"
-Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,
- J2SE-1.3
+Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,
+ J2SE-1.4
diff --git a/bundles/org.eclipse.equinox.servletbridge/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.servletbridge/forceQualifierUpdate.txt
new file mode 100644
index 0000000..56f1032
--- /dev/null
+++ b/bundles/org.eclipse.equinox.servletbridge/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.servletbridge/pom.xml b/bundles/org.eclipse.equinox.servletbridge/pom.xml
index fd2237e..969047a 100644
--- a/bundles/org.eclipse.equinox.servletbridge/pom.xml
+++ b/bundles/org.eclipse.equinox.servletbridge/pom.xml
@@ -9,18 +9,16 @@
Contributors:
Igor Fedorenko - 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.bundles</artifactId>
<groupId>org.eclipse.equinox.bundles</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.servletbridge</artifactId>
- <version>1.2.200-SNAPSHOT</version>
+ <version>1.2.300-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.servletbridge/src/org/eclipse/equinox/servletbridge/CloseableURLClassLoader.java b/bundles/org.eclipse.equinox.servletbridge/src/org/eclipse/equinox/servletbridge/CloseableURLClassLoader.java
index f29efbf..03bd8f9 100644
--- a/bundles/org.eclipse.equinox.servletbridge/src/org/eclipse/equinox/servletbridge/CloseableURLClassLoader.java
+++ b/bundles/org.eclipse.equinox.servletbridge/src/org/eclipse/equinox/servletbridge/CloseableURLClassLoader.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2009 IBM Corporation and others.
+ * Copyright (c) 2008, 2013 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -35,6 +35,8 @@
static final String DOT_CLASS = ".class"; //$NON-NLS-1$
static final String BANG_SLASH = "!/"; //$NON-NLS-1$
static final String JAR = "jar"; //$NON-NLS-1$
+ private static final String UNC_PREFIX = "//"; //$NON-NLS-1$
+ private static final String SCHEME_FILE = "file"; //$NON-NLS-1$
// @GuardedBy("loaders")
final ArrayList loaders = new ArrayList(); // package private to avoid synthetic access.
@@ -174,16 +176,54 @@
}
// @GuardedBy("loaders")
- private void safeAddLoader(URL url) {
- String path = url.getPath();
- File file = new File(path);
- if (file.exists()) {
- try {
- loaders.add(new CloseableJarFileLoader(file, verifyJars));
- } catch (IOException e) {
- // ignore
+ private boolean safeAddLoader(URL url) {
+ //assume all illegal characters have been properly encoded, so use URI class to unencode
+ try {
+ File file = new File(toURI(url));
+ if (file.exists()) {
+ try {
+ loaders.add(new CloseableJarFileLoader(file, verifyJars));
+ return true;
+ } catch (IOException e) {
+ // ignore
+ }
}
+ } catch (URISyntaxException e1) {
+ // ignore
}
+
+ return false;
+ }
+
+ private static URI toURI(URL url) throws URISyntaxException {
+ if (!SCHEME_FILE.equals(url.getProtocol())) {
+ throw new IllegalArgumentException("bad prototcol: " + url.getProtocol()); //$NON-NLS-1$
+ }
+ //URL behaves differently across platforms so for file: URLs we parse from string form
+ String pathString = url.toExternalForm().substring(5);
+ //ensure there is a leading slash to handle common malformed URLs such as file:c:/tmp
+ if (pathString.indexOf('/') != 0)
+ pathString = '/' + pathString;
+ else if (pathString.startsWith(UNC_PREFIX) && !pathString.startsWith(UNC_PREFIX, 2)) {
+ //URL encodes UNC path with two slashes, but URI uses four (see bug 207103)
+ pathString = ensureUNCPath(pathString);
+ }
+ return new URI(SCHEME_FILE, null, pathString, null);
+ }
+
+ /**
+ * Ensures the given path string starts with exactly four leading slashes.
+ */
+ private static String ensureUNCPath(String path) {
+ int len = path.length();
+ StringBuffer result = new StringBuffer(len);
+ for (int i = 0; i < 4; i++) {
+ // if we have hit the first non-slash character, add another leading slash
+ if (i >= len || result.length() > 0 || path.charAt(i) != '/')
+ result.append('/');
+ }
+ result.append(path);
+ return result.toString();
}
private static URL[] excludeFileJarURLS(URL[] urls) {
@@ -370,8 +410,8 @@
if (closed)
throw new IllegalStateException("Cannot add url. CloseableURLClassLoader is closed."); //$NON-NLS-1$
loaderURLs.add(url);
- safeAddLoader(url);
- return;
+ if (safeAddLoader(url))
+ return;
}
}
super.addURL(url);
diff --git a/bundles/org.eclipse.equinox.slf4j.stub/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.slf4j.stub/forceQualifierUpdate.txt
new file mode 100644
index 0000000..56f1032
--- /dev/null
+++ b/bundles/org.eclipse.equinox.slf4j.stub/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.slf4j.stub/pom.xml b/bundles/org.eclipse.equinox.slf4j.stub/pom.xml
index 8a62b22..41ec1be 100644
--- a/bundles/org.eclipse.equinox.slf4j.stub/pom.xml
+++ b/bundles/org.eclipse.equinox.slf4j.stub/pom.xml
@@ -9,14 +9,12 @@
Contributors:
Igor Fedorenko - 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.bundles</artifactId>
<groupId>org.eclipse.equinox.bundles</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.transforms.hook/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.transforms.hook/forceQualifierUpdate.txt
new file mode 100644
index 0000000..56f1032
--- /dev/null
+++ b/bundles/org.eclipse.equinox.transforms.hook/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.transforms.hook/pom.xml b/bundles/org.eclipse.equinox.transforms.hook/pom.xml
index 519c7e9..fd40237 100644
--- a/bundles/org.eclipse.equinox.transforms.hook/pom.xml
+++ b/bundles/org.eclipse.equinox.transforms.hook/pom.xml
@@ -9,14 +9,12 @@
Contributors:
Igor Fedorenko - 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.bundles</artifactId>
<groupId>org.eclipse.equinox.bundles</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.transforms.xslt/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.transforms.xslt/forceQualifierUpdate.txt
new file mode 100644
index 0000000..56f1032
--- /dev/null
+++ b/bundles/org.eclipse.equinox.transforms.xslt/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.transforms.xslt/pom.xml b/bundles/org.eclipse.equinox.transforms.xslt/pom.xml
index 1139ab5..043a39e 100644
--- a/bundles/org.eclipse.equinox.transforms.xslt/pom.xml
+++ b/bundles/org.eclipse.equinox.transforms.xslt/pom.xml
@@ -9,14 +9,12 @@
Contributors:
Igor Fedorenko - 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.bundles</artifactId>
<groupId>org.eclipse.equinox.bundles</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.useradmin/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.useradmin/forceQualifierUpdate.txt
new file mode 100644
index 0000000..56f1032
--- /dev/null
+++ b/bundles/org.eclipse.equinox.useradmin/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.useradmin/pom.xml b/bundles/org.eclipse.equinox.useradmin/pom.xml
index 4744677..2b4de0c 100644
--- a/bundles/org.eclipse.equinox.useradmin/pom.xml
+++ b/bundles/org.eclipse.equinox.useradmin/pom.xml
@@ -9,14 +9,12 @@
Contributors:
Igor Fedorenko - 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.bundles</artifactId>
<groupId>org.eclipse.equinox.bundles</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.util/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.util/META-INF/MANIFEST.MF
index ee4af46..d53efb4 100644
--- a/bundles/org.eclipse.equinox.util/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.util/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.equinox.util
Bundle-Name: %bundleName
-Bundle-Version: 1.0.400.qualifier
+Bundle-Version: 1.0.500.qualifier
Bundle-Vendor: %bundleVendor
Bundle-Activator: org.eclipse.equinox.internal.util.UtilActivator
Bundle-Description: The Equinox Util Bundle contains services to facilitate bundle developers in their programming, and to lighten resource usage at runtime.
diff --git a/bundles/org.eclipse.equinox.util/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.util/forceQualifierUpdate.txt
new file mode 100644
index 0000000..56f1032
--- /dev/null
+++ b/bundles/org.eclipse.equinox.util/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.util/pom.xml b/bundles/org.eclipse.equinox.util/pom.xml
index 5015b80..8e7c4c6 100644
--- a/bundles/org.eclipse.equinox.util/pom.xml
+++ b/bundles/org.eclipse.equinox.util/pom.xml
@@ -9,36 +9,16 @@
Contributors:
Igor Fedorenko - 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.bundles</artifactId>
<groupId>org.eclipse.equinox.bundles</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.util</artifactId>
- <version>1.0.400-SNAPSHOT</version>
+ <version>1.0.500-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
-
- <profiles>
- <profile>
- <id>no-bree-libs</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/bundles/org.eclipse.equinox.weaving.aspectj/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.weaving.aspectj/forceQualifierUpdate.txt
new file mode 100644
index 0000000..56f1032
--- /dev/null
+++ b/bundles/org.eclipse.equinox.weaving.aspectj/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.weaving.aspectj/pom.xml b/bundles/org.eclipse.equinox.weaving.aspectj/pom.xml
index b607818..dcaea9b 100644
--- a/bundles/org.eclipse.equinox.weaving.aspectj/pom.xml
+++ b/bundles/org.eclipse.equinox.weaving.aspectj/pom.xml
@@ -9,14 +9,12 @@
Contributors:
Igor Fedorenko - 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.bundles</artifactId>
<groupId>org.eclipse.equinox.bundles</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.weaving.caching.j9/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.weaving.caching.j9/forceQualifierUpdate.txt
new file mode 100644
index 0000000..56f1032
--- /dev/null
+++ b/bundles/org.eclipse.equinox.weaving.caching.j9/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.weaving.caching.j9/pom.xml b/bundles/org.eclipse.equinox.weaving.caching.j9/pom.xml
index 6590dab..de7983b 100644
--- a/bundles/org.eclipse.equinox.weaving.caching.j9/pom.xml
+++ b/bundles/org.eclipse.equinox.weaving.caching.j9/pom.xml
@@ -9,15 +9,12 @@
Contributors:
Igor Fedorenko - 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.bundles</artifactId>
<groupId>org.eclipse.equinox.bundles</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.weaving.caching/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.weaving.caching/META-INF/MANIFEST.MF
index addd7cf..ba98f0e 100644
--- a/bundles/org.eclipse.equinox.weaving.caching/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.weaving.caching/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.equinox.weaving.caching
-Bundle-Version: 1.0.200.qualifier
+Bundle-Version: 1.0.300.qualifier
Bundle-Name: Standard Caching Service for Equinox Aspects (Incubation)
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Activator: org.eclipse.equinox.weaving.internal.caching.Activator
diff --git a/bundles/org.eclipse.equinox.weaving.caching/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.weaving.caching/forceQualifierUpdate.txt
new file mode 100644
index 0000000..56f1032
--- /dev/null
+++ b/bundles/org.eclipse.equinox.weaving.caching/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.weaving.caching/pom.xml b/bundles/org.eclipse.equinox.weaving.caching/pom.xml
index 0c240b7..1ae123d 100644
--- a/bundles/org.eclipse.equinox.weaving.caching/pom.xml
+++ b/bundles/org.eclipse.equinox.weaving.caching/pom.xml
@@ -9,20 +9,17 @@
Contributors:
Igor Fedorenko - 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.bundles</artifactId>
<groupId>org.eclipse.equinox.bundles</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.weaving.caching</artifactId>
- <version>1.0.200-SNAPSHOT</version>
+ <version>1.0.300-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>
diff --git a/bundles/org.eclipse.equinox.weaving.caching/src/org/eclipse/equinox/weaving/internal/caching/Activator.java b/bundles/org.eclipse.equinox.weaving.caching/src/org/eclipse/equinox/weaving/internal/caching/Activator.java
index bec6966..7e2ee94 100644
--- a/bundles/org.eclipse.equinox.weaving.caching/src/org/eclipse/equinox/weaving/internal/caching/Activator.java
+++ b/bundles/org.eclipse.equinox.weaving.caching/src/org/eclipse/equinox/weaving/internal/caching/Activator.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2010 Heiko Seeberger and others.
+ * Copyright (c) 2008, 2013 Heiko Seeberger and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -64,8 +64,10 @@
* @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
*/
public void stop(final BundleContext context) {
- cachingServiceFactory.stop();
- cachingServiceFactoryRegistration.unregister();
+ if (cachingServiceFactoryRegistration != null) {
+ cachingServiceFactory.stop();
+ cachingServiceFactoryRegistration.unregister();
+ }
if (Log.isDebugEnabled()) {
Log.debug("Shut down and unregistered SingletonCachingService."); //$NON-NLS-1$
}
diff --git a/bundles/org.eclipse.equinox.weaving.hook/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.weaving.hook/forceQualifierUpdate.txt
new file mode 100644
index 0000000..56f1032
--- /dev/null
+++ b/bundles/org.eclipse.equinox.weaving.hook/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.weaving.hook/pom.xml b/bundles/org.eclipse.equinox.weaving.hook/pom.xml
index 9b7a0b3..ab5a3af 100644
--- a/bundles/org.eclipse.equinox.weaving.hook/pom.xml
+++ b/bundles/org.eclipse.equinox.weaving.hook/pom.xml
@@ -9,14 +9,12 @@
Contributors:
Igor Fedorenko - 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.bundles</artifactId>
<groupId>org.eclipse.equinox.bundles</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/bundles/org.eclipse.equinox.wireadmin/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.wireadmin/forceQualifierUpdate.txt
new file mode 100644
index 0000000..56f1032
--- /dev/null
+++ b/bundles/org.eclipse.equinox.wireadmin/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.wireadmin/pom.xml b/bundles/org.eclipse.equinox.wireadmin/pom.xml
index 83afd5c..4347c93 100644
--- a/bundles/org.eclipse.equinox.wireadmin/pom.xml
+++ b/bundles/org.eclipse.equinox.wireadmin/pom.xml
@@ -9,14 +9,12 @@
Contributors:
Igor Fedorenko - 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.bundles</artifactId>
<groupId>org.eclipse.equinox.bundles</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox</groupId>
diff --git a/features/org.eclipse.equinox.compendium.sdk/forceQualifierUpdate.txt b/features/org.eclipse.equinox.compendium.sdk/forceQualifierUpdate.txt
new file mode 100644
index 0000000..56f1032
--- /dev/null
+++ b/features/org.eclipse.equinox.compendium.sdk/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/features/org.eclipse.equinox.compendium.sdk/pom.xml b/features/org.eclipse.equinox.compendium.sdk/pom.xml
index 9834077..6d3a607 100644
--- a/features/org.eclipse.equinox.compendium.sdk/pom.xml
+++ b/features/org.eclipse.equinox.compendium.sdk/pom.xml
@@ -9,14 +9,12 @@
Contributors:
Igor Fedorenko - 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.bundles</artifactId>
<groupId>org.eclipse.equinox.bundles</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox.feature</groupId>
diff --git a/features/org.eclipse.equinox.core.feature/forceQualifierUpdate.txt b/features/org.eclipse.equinox.core.feature/forceQualifierUpdate.txt
new file mode 100644
index 0000000..56f1032
--- /dev/null
+++ b/features/org.eclipse.equinox.core.feature/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/features/org.eclipse.equinox.core.feature/pom.xml b/features/org.eclipse.equinox.core.feature/pom.xml
index cf9f679..4b4e561 100644
--- a/features/org.eclipse.equinox.core.feature/pom.xml
+++ b/features/org.eclipse.equinox.core.feature/pom.xml
@@ -9,15 +9,12 @@
Contributors:
Igor Fedorenko - 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.bundles</artifactId>
<groupId>org.eclipse.equinox.bundles</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox.feature</groupId>
diff --git a/features/org.eclipse.equinox.sdk/forceQualifierUpdate.txt b/features/org.eclipse.equinox.sdk/forceQualifierUpdate.txt
new file mode 100644
index 0000000..56f1032
--- /dev/null
+++ b/features/org.eclipse.equinox.sdk/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/features/org.eclipse.equinox.sdk/pom.xml b/features/org.eclipse.equinox.sdk/pom.xml
index 855d297..03ad34f 100644
--- a/features/org.eclipse.equinox.sdk/pom.xml
+++ b/features/org.eclipse.equinox.sdk/pom.xml
@@ -9,14 +9,12 @@
Contributors:
Igor Fedorenko - 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.bundles</artifactId>
<groupId>org.eclipse.equinox.bundles</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox.feature</groupId>
diff --git a/features/org.eclipse.equinox.server.core/forceQualifierUpdate.txt b/features/org.eclipse.equinox.server.core/forceQualifierUpdate.txt
new file mode 100644
index 0000000..56f1032
--- /dev/null
+++ b/features/org.eclipse.equinox.server.core/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/features/org.eclipse.equinox.server.core/pom.xml b/features/org.eclipse.equinox.server.core/pom.xml
index 25ef247..2f43421 100644
--- a/features/org.eclipse.equinox.server.core/pom.xml
+++ b/features/org.eclipse.equinox.server.core/pom.xml
@@ -9,14 +9,12 @@
Contributors:
Igor Fedorenko - 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.bundles</artifactId>
<groupId>org.eclipse.equinox.bundles</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox.feature</groupId>
diff --git a/features/org.eclipse.equinox.server.jetty/forceQualifierUpdate.txt b/features/org.eclipse.equinox.server.jetty/forceQualifierUpdate.txt
new file mode 100644
index 0000000..56f1032
--- /dev/null
+++ b/features/org.eclipse.equinox.server.jetty/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/features/org.eclipse.equinox.server.jetty/pom.xml b/features/org.eclipse.equinox.server.jetty/pom.xml
index f7461ef..2d6d1ec 100644
--- a/features/org.eclipse.equinox.server.jetty/pom.xml
+++ b/features/org.eclipse.equinox.server.jetty/pom.xml
@@ -9,14 +9,12 @@
Contributors:
Igor Fedorenko - 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.bundles</artifactId>
<groupId>org.eclipse.equinox.bundles</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox.feature</groupId>
diff --git a/features/org.eclipse.equinox.server.p2/forceQualifierUpdate.txt b/features/org.eclipse.equinox.server.p2/forceQualifierUpdate.txt
new file mode 100644
index 0000000..56f1032
--- /dev/null
+++ b/features/org.eclipse.equinox.server.p2/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/features/org.eclipse.equinox.server.p2/pom.xml b/features/org.eclipse.equinox.server.p2/pom.xml
index 4fb0de5..b8cbc18 100644
--- a/features/org.eclipse.equinox.server.p2/pom.xml
+++ b/features/org.eclipse.equinox.server.p2/pom.xml
@@ -9,14 +9,12 @@
Contributors:
Igor Fedorenko - 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.bundles</artifactId>
<groupId>org.eclipse.equinox.bundles</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox.feature</groupId>
diff --git a/features/org.eclipse.equinox.server.servletbridge/forceQualifierUpdate.txt b/features/org.eclipse.equinox.server.servletbridge/forceQualifierUpdate.txt
new file mode 100644
index 0000000..56f1032
--- /dev/null
+++ b/features/org.eclipse.equinox.server.servletbridge/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/features/org.eclipse.equinox.server.servletbridge/pom.xml b/features/org.eclipse.equinox.server.servletbridge/pom.xml
index c078c60..4a450d2 100644
--- a/features/org.eclipse.equinox.server.servletbridge/pom.xml
+++ b/features/org.eclipse.equinox.server.servletbridge/pom.xml
@@ -9,14 +9,12 @@
Contributors:
Igor Fedorenko - 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.bundles</artifactId>
<groupId>org.eclipse.equinox.bundles</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox.feature</groupId>
diff --git a/features/org.eclipse.equinox.server.simple/forceQualifierUpdate.txt b/features/org.eclipse.equinox.server.simple/forceQualifierUpdate.txt
new file mode 100644
index 0000000..56f1032
--- /dev/null
+++ b/features/org.eclipse.equinox.server.simple/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/features/org.eclipse.equinox.server.simple/pom.xml b/features/org.eclipse.equinox.server.simple/pom.xml
index 6643f6a..3e5afd6 100644
--- a/features/org.eclipse.equinox.server.simple/pom.xml
+++ b/features/org.eclipse.equinox.server.simple/pom.xml
@@ -9,14 +9,12 @@
Contributors:
Igor Fedorenko - 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.bundles</artifactId>
<groupId>org.eclipse.equinox.bundles</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox.feature</groupId>
diff --git a/features/org.eclipse.equinox.serverside.sdk/feature.xml b/features/org.eclipse.equinox.serverside.sdk/feature.xml
index 4c05650..32c0716 100644
--- a/features/org.eclipse.equinox.serverside.sdk/feature.xml
+++ b/features/org.eclipse.equinox.serverside.sdk/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.equinox.serverside.sdk"
label="%featureName"
- version="3.8.0.qualifier"
+ version="3.9.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="1.0.0.qualifier">
@@ -31,10 +31,6 @@
id="org.eclipse.equinox.server.p2"
version="0.0.0"/>
- <includes
- id="org.eclipse.equinox.server.servletbridge"
- version="0.0.0"/>
-
<plugin
id="javax.servlet"
download-size="0"
@@ -146,93 +142,91 @@
install-size="0"
version="0.0.0"
unpack="false"/>
+
<plugin
id="org.apache.jasper.glassfish"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
+
<plugin
id="org.apache.jasper.glassfish.source"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
-
- <plugin
+
+ <plugin
id="org.eclipse.jetty.continuation"
download-size="0"
install-size="0"
version="0.0.0"
- unpack="false"/>
-
- <plugin
+ unpack="false"/>
+
+ <plugin
id="org.eclipse.jetty.continuation.source"
download-size="0"
install-size="0"
version="0.0.0"
- unpack="false"/>
-
- <plugin
+ unpack="false"/>
+
+ <plugin
id="org.eclipse.jetty.http"
download-size="0"
install-size="0"
version="0.0.0"
- unpack="false"/>
+ unpack="false"/>
- <plugin
+ <plugin
id="org.eclipse.jetty.http.source"
download-size="0"
install-size="0"
version="0.0.0"
- unpack="false"/>
+ unpack="false"/>
-
- <plugin
+ <plugin
id="org.eclipse.jetty.io"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
- <plugin
+ <plugin
id="org.eclipse.jetty.io.source"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
-
- <plugin
+ <plugin
id="org.eclipse.jetty.security"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
- <plugin
+ <plugin
id="org.eclipse.jetty.security.source"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
-
- <plugin
+ <plugin
id="org.eclipse.jetty.server"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
- <plugin
+ <plugin
id="org.eclipse.jetty.server.source"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
-
<plugin
id="org.eclipse.jetty.servlet"
download-size="0"
@@ -240,7 +234,7 @@
version="0.0.0"
unpack="false"/>
- <plugin
+ <plugin
id="org.eclipse.jetty.servlet.source"
download-size="0"
install-size="0"
@@ -289,12 +283,4 @@
version="0.0.0"
unpack="false"/>
- <plugin
- id="org.eclipse.equinox.servletbridge.extensionbundle"
- download-size="0"
- install-size="0"
- version="0.0.0"
- fragment="true"
- unpack="false"/>
-
-</feature>
\ No newline at end of file
+</feature>
diff --git a/features/org.eclipse.equinox.serverside.sdk/forceQualifierUpdate.txt b/features/org.eclipse.equinox.serverside.sdk/forceQualifierUpdate.txt
new file mode 100644
index 0000000..56f1032
--- /dev/null
+++ b/features/org.eclipse.equinox.serverside.sdk/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/features/org.eclipse.equinox.serverside.sdk/pom.xml b/features/org.eclipse.equinox.serverside.sdk/pom.xml
index 5f7cbdc..c92ccc0 100644
--- a/features/org.eclipse.equinox.serverside.sdk/pom.xml
+++ b/features/org.eclipse.equinox.serverside.sdk/pom.xml
@@ -9,18 +9,16 @@
Contributors:
Igor Fedorenko - 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.bundles</artifactId>
<groupId>org.eclipse.equinox.bundles</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox.feature</groupId>
<artifactId>org.eclipse.equinox.serverside.sdk</artifactId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>3.9.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.equinox.starterkit.product.feature/forceQualifierUpdate.txt b/features/org.eclipse.equinox.starterkit.product.feature/forceQualifierUpdate.txt
new file mode 100644
index 0000000..56f1032
--- /dev/null
+++ b/features/org.eclipse.equinox.starterkit.product.feature/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/features/org.eclipse.equinox.starterkit.product.feature/pom.xml b/features/org.eclipse.equinox.starterkit.product.feature/pom.xml
index 82b0062..661fd6c 100644
--- a/features/org.eclipse.equinox.starterkit.product.feature/pom.xml
+++ b/features/org.eclipse.equinox.starterkit.product.feature/pom.xml
@@ -9,15 +9,12 @@
Contributors:
Igor Fedorenko - 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.bundles</artifactId>
<groupId>org.eclipse.equinox.bundles</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox.feature</groupId>
diff --git a/features/org.eclipse.equinox.weaving.sdk/forceQualifierUpdate.txt b/features/org.eclipse.equinox.weaving.sdk/forceQualifierUpdate.txt
new file mode 100644
index 0000000..56f1032
--- /dev/null
+++ b/features/org.eclipse.equinox.weaving.sdk/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# To force a version qualifier update add the bug here
+Bug 403352 - Update all parent versions to match our build stream
diff --git a/features/org.eclipse.equinox.weaving.sdk/pom.xml b/features/org.eclipse.equinox.weaving.sdk/pom.xml
index 6636142..c843b0c 100644
--- a/features/org.eclipse.equinox.weaving.sdk/pom.xml
+++ b/features/org.eclipse.equinox.weaving.sdk/pom.xml
@@ -9,14 +9,12 @@
Contributors:
Igor Fedorenko - 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>rt.equinox.bundles</artifactId>
<groupId>org.eclipse.equinox.bundles</groupId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.equinox.feature</groupId>
diff --git a/pom.xml b/pom.xml
index 03e8694..e4f076a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,28 +9,38 @@
Contributors:
Igor Fedorenko - 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.eclipse</groupId>
<artifactId>eclipse-platform-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<relativePath>../eclipse-platform-parent</relativePath>
</parent>
<groupId>org.eclipse.equinox.bundles</groupId>
<artifactId>rt.equinox.bundles</artifactId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
<tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/equinox/rt.equinox.bundles.git</tycho.scmUrl>
</properties>
+ <repositories>
+ <repository>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <id>eclipse-hosted</id>
+ <url>https://repo.eclipse.org/content/repositories/eclipse/</url>
+ </repository>
+ </repositories>
+
<modules>
<module>bundles/org.eclipse.equinox.security.ui</module>
<module>features/org.eclipse.equinox.compendium.sdk</module>
@@ -39,7 +49,11 @@
<module>features/org.eclipse.equinox.server.core</module>
<module>features/org.eclipse.equinox.server.jetty</module>
<module>features/org.eclipse.equinox.server.p2</module>
+
+<!-- https://bugs.eclipse.org/bugs/show_bug.cgi?id=348045
<module>features/org.eclipse.equinox.server.servletbridge</module>
+-->
+
<module>features/org.eclipse.equinox.server.simple</module>
<module>features/org.eclipse.equinox.serverside.sdk</module>
<module>features/org.eclipse.equinox.starterkit.product.feature</module>
@@ -98,7 +112,11 @@
<module>bundles/org.eclipse.equinox.metatype</module>
<module>bundles/org.eclipse.equinox.region</module>
<module>bundles/org.eclipse.equinox.servletbridge</module>
+
+<!-- https://bugs.eclipse.org/bugs/show_bug.cgi?id=348045
<module>bundles/org.eclipse.equinox.servletbridge.extensionbundle</module>
+-->
+
<module>bundles/org.eclipse.equinox.servletbridge.template</module>
<module>bundles/org.eclipse.equinox.slf4j.stub</module>
<module>bundles/org.eclipse.equinox.transforms.hook</module>