Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordj2011-08-08 14:21:57 -0400
committerdj2011-08-08 14:21:57 -0400
commit8c10f21cadeadcca856133fd9002db234b9612b6 (patch)
tree8a07d706b05900aeeb5999f72b6b856bd839a0cc
parent3835f14b44da9967c8858284b6c87937b8b13c6b (diff)
parentaa82f551eda5fbead50fdc00d02368ca9e36809a (diff)
downloadrt.equinox.p2-8c10f21cadeadcca856133fd9002db234b9612b6.tar.gz
rt.equinox.p2-8c10f21cadeadcca856133fd9002db234b9612b6.tar.xz
rt.equinox.p2-8c10f21cadeadcca856133fd9002db234b9612b6.zip
Merge branch 'master' of ssh://git.eclipse.org/gitroot/equinox/rt.equinox.p2 into bug350088v20110808-1657
-rw-r--r--.gitignore1
-rw-r--r--bundles/.gitignore1
-rw-r--r--bundles/ie.wombat.jbdiff.test/pom.xml5
-rw-r--r--bundles/ie.wombat.jbdiff/pom.xml5
-rw-r--r--bundles/org.eclipse.equinox.frameworkadmin.equinox/pom.xml5
-rw-r--r--bundles/org.eclipse.equinox.frameworkadmin.test/pom.xml5
-rw-r--r--bundles/org.eclipse.equinox.frameworkadmin/pom.xml5
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.optimizers/pom.xml5
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.processors/pom.xml5
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.repository/pom.xml5
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/CompositeArtifactRepository.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/Messages.java1
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/MirrorRequest.java21
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/messages.properties1
-rw-r--r--bundles/org.eclipse.equinox.p2.console/pom.xml5
-rw-r--r--bundles/org.eclipse.equinox.p2.core/pom.xml5
-rw-r--r--bundles/org.eclipse.equinox.p2.director.app/ant_tasks/.gitignore1
-rw-r--r--bundles/org.eclipse.equinox.p2.director.app/pom.xml5
-rw-r--r--bundles/org.eclipse.equinox.p2.director/pom.xml5
-rw-r--r--bundles/org.eclipse.equinox.p2.directorywatcher/pom.xml5
-rw-r--r--bundles/org.eclipse.equinox.p2.discovery.compatibility/pom.xml5
-rw-r--r--bundles/org.eclipse.equinox.p2.discovery/pom.xml5
-rw-r--r--bundles/org.eclipse.equinox.p2.engine/pom.xml5
-rw-r--r--bundles/org.eclipse.equinox.p2.extensionlocation/pom.xml5
-rw-r--r--bundles/org.eclipse.equinox.p2.garbagecollector/pom.xml5
-rw-r--r--bundles/org.eclipse.equinox.p2.installer/pom.xml5
-rw-r--r--bundles/org.eclipse.equinox.p2.jarprocessor/lib/.gitignore1
-rw-r--r--bundles/org.eclipse.equinox.p2.jarprocessor/pom.xml5
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata.repository/ant_tasks/.gitignore1
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata.repository/pom.xml8
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata/pom.xml5
-rw-r--r--bundles/org.eclipse.equinox.p2.operations/pom.xml5
-rw-r--r--bundles/org.eclipse.equinox.p2.publisher.eclipse/ant_tasks/.gitignore1
-rw-r--r--bundles/org.eclipse.equinox.p2.publisher.eclipse/pom.xml4
-rw-r--r--bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/messages.properties4
-rw-r--r--bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/messages.properties2
-rw-r--r--bundles/org.eclipse.equinox.p2.publisher/pom.xml5
-rw-r--r--bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/AbstractPublisherApplication.java22
-rw-r--r--bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/Publisher.java13
-rw-r--r--bundles/org.eclipse.equinox.p2.ql/pom.xml5
-rw-r--r--bundles/org.eclipse.equinox.p2.reconciler.dropins/pom.xml5
-rw-r--r--bundles/org.eclipse.equinox.p2.repository.tools/lib/.cvsignore1
-rw-r--r--bundles/org.eclipse.equinox.p2.repository.tools/lib/.gitignore1
-rw-r--r--bundles/org.eclipse.equinox.p2.repository.tools/pom.xml5
-rw-r--r--bundles/org.eclipse.equinox.p2.repository/pom.xml5
-rw-r--r--bundles/org.eclipse.equinox.p2.sar/pom.xml3
-rw-r--r--bundles/org.eclipse.equinox.p2.tests.discovery/pom.xml5
-rw-r--r--bundles/org.eclipse.equinox.p2.tests.optimizers/pom.xml5
-rw-r--r--bundles/org.eclipse.equinox.p2.tests.ui/pom.xml10
-rw-r--r--bundles/org.eclipse.equinox.p2.tests.verifier/pom.xml5
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/pom.xml12
-rw-r--r--bundles/org.eclipse.equinox.p2.testserver/pom.xml3
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.eclipse/pom.xml5
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.natives/pom.xml5
-rw-r--r--bundles/org.eclipse.equinox.p2.transport.ecf/pom.xml5
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.admin.rcp/pom.xml5
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.admin/pom.xml5
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.discovery/pom.xml5
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.importexport/pom.xml5
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.rcp/pom.xml5
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/pom.xml5
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.sdk/pom.xml4
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/pom.xml5
-rw-r--r--bundles/org.eclipse.equinox.p2.updatechecker/pom.xml5
-rw-r--r--bundles/org.eclipse.equinox.p2.updatesite/pom.xml5
-rw-r--r--bundles/org.eclipse.equinox.simpleconfigurator.manipulator/pom.xml5
-rw-r--r--bundles/org.eclipse.equinox.simpleconfigurator/pom.xml5
-rw-r--r--features/org.eclipse.equinox.p2.core.feature/pom.xml5
-rw-r--r--features/org.eclipse.equinox.p2.discovery.feature/pom.xml5
-rw-r--r--features/org.eclipse.equinox.p2.extras.feature/pom.xml5
-rw-r--r--features/org.eclipse.equinox.p2.sdk/pom.xml5
-rw-r--r--features/org.eclipse.equinox.p2.user.ui/pom.xml4
-rw-r--r--org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent/pom.xml17
73 files changed, 225 insertions, 154 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..2f7896d1d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+target/
diff --git a/bundles/.gitignore b/bundles/.gitignore
new file mode 100644
index 000000000..e660fd93d
--- /dev/null
+++ b/bundles/.gitignore
@@ -0,0 +1 @@
+bin/
diff --git a/bundles/ie.wombat.jbdiff.test/pom.xml b/bundles/ie.wombat.jbdiff.test/pom.xml
index 2671b1898..e99f45f19 100644
--- a/bundles/ie.wombat.jbdiff.test/pom.xml
+++ b/bundles/ie.wombat.jbdiff.test/pom.xml
@@ -5,10 +5,11 @@
<parent>
<artifactId>org.eclipse.equinox.p2-parent</artifactId>
<groupId>org.eclipse</groupId>
- <version>0.0.1-SNAPSHOT</version><relativePath>../org.eclipse.equinox.p2-parent</relativePath>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent</relativePath>
</parent>
<groupId>org.eclipse</groupId>
<artifactId>ie.wombat.jbdiff.test</artifactId>
- <version>0.1.0.qualifier</version>
+ <version>0.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/ie.wombat.jbdiff/pom.xml b/bundles/ie.wombat.jbdiff/pom.xml
index 37e283127..6b14d05c9 100644
--- a/bundles/ie.wombat.jbdiff/pom.xml
+++ b/bundles/ie.wombat.jbdiff/pom.xml
@@ -5,10 +5,11 @@
<parent>
<artifactId>org.eclipse.equinox.p2-parent</artifactId>
<groupId>org.eclipse</groupId>
- <version>0.0.1-SNAPSHOT</version><relativePath>../org.eclipse.equinox.p2-parent</relativePath>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent</relativePath>
</parent>
<groupId>org.eclipse</groupId>
<artifactId>ie.wombat.jbdiff</artifactId>
- <version>0.1.0.qualifier</version>
+ <version>0.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.frameworkadmin.equinox/pom.xml b/bundles/org.eclipse.equinox.frameworkadmin.equinox/pom.xml
index b8cb5b78e..b71cce1fa 100644
--- a/bundles/org.eclipse.equinox.frameworkadmin.equinox/pom.xml
+++ b/bundles/org.eclipse.equinox.frameworkadmin.equinox/pom.xml
@@ -5,10 +5,11 @@
<parent>
<artifactId>org.eclipse.equinox.p2-parent</artifactId>
<groupId>org.eclipse</groupId>
- <version>0.0.1-SNAPSHOT</version><relativePath>../org.eclipse.equinox.p2-parent</relativePath>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent</relativePath>
</parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.frameworkadmin.equinox</artifactId>
- <version>1.0.300.qualifier</version>
+ <version>1.0.300-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.frameworkadmin.test/pom.xml b/bundles/org.eclipse.equinox.frameworkadmin.test/pom.xml
index c9f08d58a..859cdd687 100644
--- a/bundles/org.eclipse.equinox.frameworkadmin.test/pom.xml
+++ b/bundles/org.eclipse.equinox.frameworkadmin.test/pom.xml
@@ -5,10 +5,11 @@
<parent>
<artifactId>org.eclipse.equinox.p2-parent</artifactId>
<groupId>org.eclipse</groupId>
- <version>0.0.1-SNAPSHOT</version><relativePath>../org.eclipse.equinox.p2-parent</relativePath>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent</relativePath>
</parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.frameworkadmin.test</artifactId>
- <version>1.1.0.qualifier</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.frameworkadmin/pom.xml b/bundles/org.eclipse.equinox.frameworkadmin/pom.xml
index 239c24f76..b7771f242 100644
--- a/bundles/org.eclipse.equinox.frameworkadmin/pom.xml
+++ b/bundles/org.eclipse.equinox.frameworkadmin/pom.xml
@@ -5,10 +5,11 @@
<parent>
<artifactId>org.eclipse.equinox.p2-parent</artifactId>
<groupId>org.eclipse</groupId>
- <version>0.0.1-SNAPSHOT</version><relativePath>../org.eclipse.equinox.p2-parent</relativePath>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent</relativePath>
</parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.frameworkadmin</artifactId>
- <version>2.0.0.qualifier</version>
+ <version>2.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.p2.artifact.optimizers/pom.xml b/bundles/org.eclipse.equinox.p2.artifact.optimizers/pom.xml
index 0b2199eb5..55189f446 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.optimizers/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.artifact.optimizers/pom.xml
@@ -5,10 +5,11 @@
<parent>
<artifactId>org.eclipse.equinox.p2-parent</artifactId>
<groupId>org.eclipse</groupId>
- <version>0.0.1-SNAPSHOT</version><relativePath>../org.eclipse.equinox.p2-parent</relativePath>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent</relativePath>
</parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.p2.artifact.optimizers</artifactId>
- <version>1.0.0.qualifier</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.p2.artifact.processors/pom.xml b/bundles/org.eclipse.equinox.p2.artifact.processors/pom.xml
index 9fe5da1de..2d35d8a71 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.processors/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.artifact.processors/pom.xml
@@ -5,10 +5,11 @@
<parent>
<artifactId>org.eclipse.equinox.p2-parent</artifactId>
<groupId>org.eclipse</groupId>
- <version>0.0.1-SNAPSHOT</version><relativePath>../org.eclipse.equinox.p2-parent</relativePath>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent</relativePath>
</parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.p2.artifact.processors</artifactId>
- <version>1.0.100.qualifier</version>
+ <version>1.0.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/pom.xml b/bundles/org.eclipse.equinox.p2.artifact.repository/pom.xml
index c21afaa4e..6737d5a7f 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.repository/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.artifact.repository/pom.xml
@@ -5,10 +5,11 @@
<parent>
<artifactId>org.eclipse.equinox.p2-parent</artifactId>
<groupId>org.eclipse</groupId>
- <version>0.0.1-SNAPSHOT</version><relativePath>../org.eclipse.equinox.p2-parent</relativePath>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent</relativePath>
</parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.p2.artifact.repository</artifactId>
- <version>1.1.100.qualifier</version>
+ <version>1.1.200-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/CompositeArtifactRepository.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/CompositeArtifactRepository.java
index 68dbd1df1..87cf474b5 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/CompositeArtifactRepository.java
+++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/CompositeArtifactRepository.java
@@ -378,7 +378,7 @@ public class CompositeArtifactRepository extends AbstractArtifactRepository impl
current.setBad(true);
// If more children are available, set retry
if (childIterator.hasNext())
- return new MultiStatus(Activator.ID, CODE_RETRY, new IStatus[] {status}, NLS.bind(Messages.retryRequest, current.repo.getLocation(), descriptor.getArtifactKey()), null);
+ return new MultiStatus(Activator.ID, CODE_RETRY, new IStatus[] {status}, NLS.bind(Messages.retryRequest, descriptor.getArtifactKey(), current.repo.getLocation()), null);
// Nothing that can be done, pass child's failure on
resetChildFailures();
return status;
diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/Messages.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/Messages.java
index da8c1f788..eae97fc3a 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/Messages.java
+++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/Messages.java
@@ -52,6 +52,7 @@ public class Messages extends NLS {
public static String MirrorLog_Exception_Occurred;
public static String MirrorRequest_multipleDownloadProblems;
+ public static String MirrorRequest_transferFailed;
public static String exception_unableToCreateParentDir;
diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/MirrorRequest.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/MirrorRequest.java
index 873c3efd4..b0daef205 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/MirrorRequest.java
+++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/MirrorRequest.java
@@ -179,7 +179,8 @@ public class MirrorRequest extends ArtifactRequest {
* @return the status of the transfer operation
*/
protected IStatus transfer(IArtifactDescriptor destinationDescriptor, IArtifactDescriptor sourceDescriptor, IProgressMonitor monitor) {
- IStatus status = Status.OK_STATUS;
+ MultiStatus allResults = new MultiStatus(Activator.ID, 0, NLS.bind(Messages.MirrorRequest_transferFailed, sourceDescriptor), null);
+ IStatus lastResult = Status.OK_STATUS;
// go until we get one (OK), there are no more mirrors to consider or the operation is cancelled.
// Put a hard limit of MAX_RETRY_REQUEST so we don't end up in an infinite loop.
// Really, if you've tried MAX_RETRY_REQUEST times without success, it's time to give up
@@ -188,11 +189,16 @@ public class MirrorRequest extends ArtifactRequest {
int counter = 0;
do {
- status = transferSingle(destinationDescriptor, sourceDescriptor, monitor);
- } while (status.getSeverity() == IStatus.ERROR && status.getCode() == IArtifactRepository.CODE_RETRY && counter++ < MAX_RETRY_REQUEST);
- if (status.isOK())
+ lastResult = transferSingle(destinationDescriptor, sourceDescriptor, monitor);
+ allResults.add(lastResult);
+ } while (lastResult.getSeverity() == IStatus.ERROR && lastResult.getCode() == IArtifactRepository.CODE_RETRY && counter++ < MAX_RETRY_REQUEST);
+ if (lastResult.isOK()) {
collectStats(sourceDescriptor, monitor);
- return status;
+ return lastResult;
+ } else if (allResults.getChildren().length <= 1) {
+ return lastResult;
+ }
+ return allResults;
}
/**
@@ -247,11 +253,6 @@ public class MirrorRequest extends ArtifactRequest {
return new MultiStatus(Activator.ID, status.getCode(), new IStatus[] {status}, NLS.bind(Messages.error_closing_stream, getArtifactKey(), target.getLocation()), e);
return new Status(IStatus.ERROR, Activator.ID, NLS.bind(Messages.error_closing_stream, getArtifactKey(), target.getLocation()), e);
}
- if (status != null && status.getSeverity() == IStatus.ERROR) {
- IStatus root = extractRootCause(status);
- if (root != null && FileNotFoundException.class == root.getException().getClass())
- return new Status(IStatus.ERROR, Activator.ID, status.getCode(), NLS.bind(Messages.artifact_not_found, getArtifactKey()), root.getException());
- }
}
return status;
}
diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/messages.properties b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/messages.properties
index 9622be281..68453f70a 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/messages.properties
+++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/messages.properties
@@ -44,6 +44,7 @@ exception_noComparators = No Artifact Comparators are available.
MirrorLog_Console_Log=Logging to the console instead.
MirrorLog_Exception_Occurred=An exception occurred while writing to the log:
MirrorRequest_multipleDownloadProblems=Multiple problems occurred while downloading.
+MirrorRequest_transferFailed=Failed to transfer artifact {0}.
exception_unsupportedAddToComposite = Cannot add descriptors to a composite repository.
exception_unsupportedGetOutputStream=Cannot write artifacts to a composite repository.
diff --git a/bundles/org.eclipse.equinox.p2.console/pom.xml b/bundles/org.eclipse.equinox.p2.console/pom.xml
index c8e949b1d..578f7475c 100644
--- a/bundles/org.eclipse.equinox.p2.console/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.console/pom.xml
@@ -5,10 +5,11 @@
<parent>
<artifactId>org.eclipse.equinox.p2-parent</artifactId>
<groupId>org.eclipse</groupId>
- <version>0.0.1-SNAPSHOT</version><relativePath>../org.eclipse.equinox.p2-parent</relativePath>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent</relativePath>
</parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.p2.console</artifactId>
- <version>1.0.300.qualifier</version>
+ <version>1.0.300-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.p2.core/pom.xml b/bundles/org.eclipse.equinox.p2.core/pom.xml
index 1135dcf35..a98bfe8ab 100644
--- a/bundles/org.eclipse.equinox.p2.core/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.core/pom.xml
@@ -5,10 +5,11 @@
<parent>
<artifactId>org.eclipse.equinox.p2-parent</artifactId>
<groupId>org.eclipse</groupId>
- <version>0.0.1-SNAPSHOT</version><relativePath>../org.eclipse.equinox.p2-parent</relativePath>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent</relativePath>
</parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.p2.core</artifactId>
- <version>2.1.0.qualifier</version>
+ <version>2.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.p2.director.app/ant_tasks/.gitignore b/bundles/org.eclipse.equinox.p2.director.app/ant_tasks/.gitignore
deleted file mode 100644
index b0d43232f..000000000
--- a/bundles/org.eclipse.equinox.p2.director.app/ant_tasks/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/director-ant.jar
diff --git a/bundles/org.eclipse.equinox.p2.director.app/pom.xml b/bundles/org.eclipse.equinox.p2.director.app/pom.xml
index aaa8792da..84745cb04 100644
--- a/bundles/org.eclipse.equinox.p2.director.app/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.director.app/pom.xml
@@ -5,10 +5,11 @@
<parent>
<artifactId>org.eclipse.equinox.p2-parent</artifactId>
<groupId>org.eclipse</groupId>
- <version>0.0.1-SNAPSHOT</version><relativePath>../org.eclipse.equinox.p2-parent</relativePath>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent</relativePath>
</parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.p2.director.app</artifactId>
- <version>1.0.300.qualifier</version>
+ <version>1.0.300-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.p2.director/pom.xml b/bundles/org.eclipse.equinox.p2.director/pom.xml
index f9a289b15..815cf67a2 100644
--- a/bundles/org.eclipse.equinox.p2.director/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.director/pom.xml
@@ -5,10 +5,11 @@
<parent>
<artifactId>org.eclipse.equinox.p2-parent</artifactId>
<groupId>org.eclipse</groupId>
- <version>0.0.1-SNAPSHOT</version><relativePath>../org.eclipse.equinox.p2-parent</relativePath>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent</relativePath>
</parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.p2.director</artifactId>
- <version>2.1.0.qualifier</version>
+ <version>2.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.p2.directorywatcher/pom.xml b/bundles/org.eclipse.equinox.p2.directorywatcher/pom.xml
index 602e8d4be..e7742bb9e 100644
--- a/bundles/org.eclipse.equinox.p2.directorywatcher/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.directorywatcher/pom.xml
@@ -5,10 +5,11 @@
<parent>
<artifactId>org.eclipse.equinox.p2-parent</artifactId>
<groupId>org.eclipse</groupId>
- <version>0.0.1-SNAPSHOT</version><relativePath>../org.eclipse.equinox.p2-parent</relativePath>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent</relativePath>
</parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.p2.directorywatcher</artifactId>
- <version>1.0.300.qualifier</version>
+ <version>1.0.300-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.p2.discovery.compatibility/pom.xml b/bundles/org.eclipse.equinox.p2.discovery.compatibility/pom.xml
index fa2482274..f188b245c 100644
--- a/bundles/org.eclipse.equinox.p2.discovery.compatibility/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.discovery.compatibility/pom.xml
@@ -5,10 +5,11 @@
<parent>
<artifactId>org.eclipse.equinox.p2-parent</artifactId>
<groupId>org.eclipse</groupId>
- <version>0.0.1-SNAPSHOT</version><relativePath>../org.eclipse.equinox.p2-parent</relativePath>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent</relativePath>
</parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.p2.discovery.compatiblity</artifactId>
- <version>1.0.1.qualifier</version>
+ <version>1.0.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.p2.discovery/pom.xml b/bundles/org.eclipse.equinox.p2.discovery/pom.xml
index f0221f39b..0f6f35c6e 100644
--- a/bundles/org.eclipse.equinox.p2.discovery/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.discovery/pom.xml
@@ -5,10 +5,11 @@
<parent>
<artifactId>org.eclipse.equinox.p2-parent</artifactId>
<groupId>org.eclipse</groupId>
- <version>0.0.1-SNAPSHOT</version><relativePath>../org.eclipse.equinox.p2-parent</relativePath>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent</relativePath>
</parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.p2.discovery</artifactId>
- <version>1.0.100.qualifier</version>
+ <version>1.0.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.p2.engine/pom.xml b/bundles/org.eclipse.equinox.p2.engine/pom.xml
index a51bfb5d2..59f7f9f2f 100644
--- a/bundles/org.eclipse.equinox.p2.engine/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.engine/pom.xml
@@ -5,10 +5,11 @@
<parent>
<artifactId>org.eclipse.equinox.p2-parent</artifactId>
<groupId>org.eclipse</groupId>
- <version>0.0.1-SNAPSHOT</version><relativePath>../org.eclipse.equinox.p2-parent</relativePath>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent</relativePath>
</parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.p2.engine</artifactId>
- <version>2.1.0.qualifier</version>
+ <version>2.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.p2.extensionlocation/pom.xml b/bundles/org.eclipse.equinox.p2.extensionlocation/pom.xml
index 2f15d23f5..a084e4162 100644
--- a/bundles/org.eclipse.equinox.p2.extensionlocation/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.extensionlocation/pom.xml
@@ -5,10 +5,11 @@
<parent>
<artifactId>org.eclipse.equinox.p2-parent</artifactId>
<groupId>org.eclipse</groupId>
- <version>0.0.1-SNAPSHOT</version><relativePath>../org.eclipse.equinox.p2-parent</relativePath>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent</relativePath>
</parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.p2.extensionlocation</artifactId>
- <version>1.2.100.qualifier</version>
+ <version>1.2.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.p2.garbagecollector/pom.xml b/bundles/org.eclipse.equinox.p2.garbagecollector/pom.xml
index 468b523fe..7ddde7b77 100644
--- a/bundles/org.eclipse.equinox.p2.garbagecollector/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.garbagecollector/pom.xml
@@ -5,10 +5,11 @@
<parent>
<artifactId>org.eclipse.equinox.p2-parent</artifactId>
<groupId>org.eclipse</groupId>
- <version>0.0.1-SNAPSHOT</version><relativePath>../org.eclipse.equinox.p2-parent</relativePath>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent</relativePath>
</parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.p2.garbagecollector</artifactId>
- <version>1.0.200.qualifier</version>
+ <version>1.0.200-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.p2.installer/pom.xml b/bundles/org.eclipse.equinox.p2.installer/pom.xml
index aff45ec7c..176964ab4 100644
--- a/bundles/org.eclipse.equinox.p2.installer/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.installer/pom.xml
@@ -5,10 +5,11 @@
<parent>
<artifactId>org.eclipse.equinox.p2-parent</artifactId>
<groupId>org.eclipse</groupId>
- <version>0.0.1-SNAPSHOT</version><relativePath>../org.eclipse.equinox.p2-parent</relativePath>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent</relativePath>
</parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.p2.installer</artifactId>
- <version>1.0.300.qualifier</version>
+ <version>1.0.300-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.p2.jarprocessor/lib/.gitignore b/bundles/org.eclipse.equinox.p2.jarprocessor/lib/.gitignore
deleted file mode 100644
index a70158832..000000000
--- a/bundles/org.eclipse.equinox.p2.jarprocessor/lib/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/jarprocessor-ant.jar
diff --git a/bundles/org.eclipse.equinox.p2.jarprocessor/pom.xml b/bundles/org.eclipse.equinox.p2.jarprocessor/pom.xml
index 2443cf420..3c3d615ad 100644
--- a/bundles/org.eclipse.equinox.p2.jarprocessor/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.jarprocessor/pom.xml
@@ -5,10 +5,11 @@
<parent>
<artifactId>org.eclipse.equinox.p2-parent</artifactId>
<groupId>org.eclipse</groupId>
- <version>0.0.1-SNAPSHOT</version><relativePath>../org.eclipse.equinox.p2-parent</relativePath>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent</relativePath>
</parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.p2.jarprocessor</artifactId>
- <version>1.0.200.qualifier</version>
+ <version>1.0.200-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.p2.metadata.repository/ant_tasks/.gitignore b/bundles/org.eclipse.equinox.p2.metadata.repository/ant_tasks/.gitignore
deleted file mode 100644
index e8ad2d138..000000000
--- a/bundles/org.eclipse.equinox.p2.metadata.repository/ant_tasks/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/metadataRepository-ant.jar
diff --git a/bundles/org.eclipse.equinox.p2.metadata.repository/pom.xml b/bundles/org.eclipse.equinox.p2.metadata.repository/pom.xml
index 5533aaecc..5e0d165ed 100644
--- a/bundles/org.eclipse.equinox.p2.metadata.repository/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.metadata.repository/pom.xml
@@ -7,17 +7,17 @@
<artifactId>org.eclipse.equinox.p2-parent</artifactId>
<groupId>org.eclipse</groupId>
<version>0.0.1-SNAPSHOT</version>
- <relativePath>../org.eclipse.equinox.p2-parent</relativePath>
+ <relativePath>../../org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent</relativePath>
</parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.p2.metadata.repository</artifactId>
- <version>1.2.0.qualifier</version>
+ <version>1.2.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>
<plugins>
<plugin>
- <groupId>org.sonatype.tycho</groupId>
- <artifactId>maven-osgi-compiler-plugin</artifactId>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-compiler-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
<extraClasspathElements>
diff --git a/bundles/org.eclipse.equinox.p2.metadata/pom.xml b/bundles/org.eclipse.equinox.p2.metadata/pom.xml
index 133753926..cd7520012 100644
--- a/bundles/org.eclipse.equinox.p2.metadata/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.metadata/pom.xml
@@ -5,10 +5,11 @@
<parent>
<artifactId>org.eclipse.equinox.p2-parent</artifactId>
<groupId>org.eclipse</groupId>
- <version>0.0.1-SNAPSHOT</version><relativePath>../org.eclipse.equinox.p2-parent</relativePath>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent</relativePath>
</parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.p2.metadata</artifactId>
- <version>2.1.0.qualifier</version>
+ <version>2.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.p2.operations/pom.xml b/bundles/org.eclipse.equinox.p2.operations/pom.xml
index 5277c335a..6044fe144 100644
--- a/bundles/org.eclipse.equinox.p2.operations/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.operations/pom.xml
@@ -5,10 +5,11 @@
<parent>
<artifactId>org.eclipse.equinox.p2-parent</artifactId>
<groupId>org.eclipse</groupId>
- <version>0.0.1-SNAPSHOT</version><relativePath>../org.eclipse.equinox.p2-parent</relativePath>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent</relativePath>
</parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.p2.operations</artifactId>
- <version>2.1.0.qualifier</version>
+ <version>2.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.p2.publisher.eclipse/ant_tasks/.gitignore b/bundles/org.eclipse.equinox.p2.publisher.eclipse/ant_tasks/.gitignore
deleted file mode 100644
index baa99b721..000000000
--- a/bundles/org.eclipse.equinox.p2.publisher.eclipse/ant_tasks/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/pdepublishing-ant.jar
diff --git a/bundles/org.eclipse.equinox.p2.publisher.eclipse/pom.xml b/bundles/org.eclipse.equinox.p2.publisher.eclipse/pom.xml
index 3e8cfa798..27a3cf147 100644
--- a/bundles/org.eclipse.equinox.p2.publisher.eclipse/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.publisher.eclipse/pom.xml
@@ -7,11 +7,11 @@
<artifactId>org.eclipse.equinox.p2-parent</artifactId>
<groupId>org.eclipse</groupId>
<version>0.0.1-SNAPSHOT</version>
- <relativePath>../org.eclipse.equinox.p2-parent</relativePath>
+ <relativePath>../../org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent</relativePath>
</parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.p2.publisher.eclipse</artifactId>
- <version>1.0.0.qualifier</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/messages.properties b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/messages.properties
index b6dff804a..bd388de84 100644
--- a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/messages.properties
+++ b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/messages.properties
@@ -21,5 +21,5 @@ exception_invalidProductContentType=Provided value \"{0}\" for product content t
feature_parse_invalidIdOrVersion= Invalid ID \"{0}\" or version \"{1}\" encountered.
feature_parse_emptyRequires = Error parsing feature: \"require\" must include at least one \"import\" element.
-featuresInProductFileIgnored=The product specifies features although useFeatures is false. These features are ignored.
-bundlesInProductFileIgnored=The product specifies bundles although useFeatures is true. These bundles are ignored.
+featuresInProductFileIgnored=The features specified in the product definition are ignored; verify the value of the 'type' or 'useFeatures' attribute.
+bundlesInProductFileIgnored=The bundles specified in the product definition are ignored; verify the value of the 'type' or 'useFeatures' attribute.
diff --git a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/messages.properties b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/messages.properties
deleted file mode 100644
index e3c5bf783..000000000
--- a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/messages.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-bundlesInProductFileIgnored=The value of "useFeatures" attribute in .product file is "true" so any bundles and fragments specified in your product are ignored.
-featuresInProductFileIgnored=The value of "useFeatures" attribute in .product file is either "false" or the attribute is missing so any features specified in your product are ignored.
diff --git a/bundles/org.eclipse.equinox.p2.publisher/pom.xml b/bundles/org.eclipse.equinox.p2.publisher/pom.xml
index 7b068e9a5..c68dfc11c 100644
--- a/bundles/org.eclipse.equinox.p2.publisher/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.publisher/pom.xml
@@ -5,10 +5,11 @@
<parent>
<artifactId>org.eclipse.equinox.p2-parent</artifactId>
<groupId>org.eclipse</groupId>
- <version>0.0.1-SNAPSHOT</version><relativePath>../org.eclipse.equinox.p2-parent</relativePath>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent</relativePath>
</parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.p2.publisher</artifactId>
- <version>1.2.0.qualifier</version>
+ <version>1.2.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/AbstractPublisherApplication.java b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/AbstractPublisherApplication.java
index 6e3385e33..6a52f070d 100644
--- a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/AbstractPublisherApplication.java
+++ b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/AbstractPublisherApplication.java
@@ -283,19 +283,21 @@ public abstract class AbstractPublisherApplication implements IApplication {
IStatus result = publisher.publish(actions, new NullProgressMonitor());
long after = System.currentTimeMillis();
- if (result.isOK()) {
+ if (!result.isOK()) {
+ // TODO: improve the string representation of the result
+ System.out.println(result);
+ Throwable th = result.getException();
+ if (th != null) {
+ System.out.println();
+ System.out.println(NLS.bind(Messages.message_resultException, null));
+ th.printStackTrace(System.out);
+ System.out.println();
+ }
+ }
+ if (!result.matches(IStatus.ERROR | IStatus.CANCEL)) {
System.out.println(NLS.bind(Messages.message_generationCompleted, String.valueOf((after - before) / 1000)));
return IApplication.EXIT_OK;
}
- // TODO: improve the string representation of the result
- System.out.println(result);
- Throwable th = result.getException();
- if (th != null) {
- System.out.println();
- System.out.println(NLS.bind(Messages.message_resultException, null));
- th.printStackTrace(System.out);
- System.out.println();
- }
} catch (ProvisionException e) {
status = e.getStatus();
if (status.getSeverity() == IStatus.ERROR && status.getMessage() != null) {
diff --git a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/Publisher.java b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/Publisher.java
index 49eeb0cab..76df6080f 100644
--- a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/Publisher.java
+++ b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/Publisher.java
@@ -229,7 +229,7 @@ public class Publisher {
IStatus finalStatus = null;
if (info.getArtifactRepository() != null) {
finalStatus = info.getArtifactRepository().executeBatch(artifactProcess, sub);
- if (finalStatus.isOK())
+ if (!finalStatus.matches(IStatus.ERROR | IStatus.CANCEL))
// If the batch process didn't report any errors, then
// Use the status from our actions
finalStatus = artifactProcess.getStatus();
@@ -240,17 +240,24 @@ public class Publisher {
if (Tracing.DEBUG_PUBLISHING)
Tracing.debug("Publishing complete. Result=" + finalStatus); //$NON-NLS-1$
+
+ // if there were no errors, publish all the ius.
+ if (finalStatus.isOK() || finalStatus.matches(IStatus.INFO | IStatus.WARNING))
+ savePublishedIUs();
+
if (!finalStatus.isOK())
return finalStatus;
+ return Status.OK_STATUS;
} finally {
sub.done();
}
- // if there were no errors, publish all the ius.
+ }
+
+ protected void savePublishedIUs() {
IMetadataRepository metadataRepository = info.getMetadataRepository();
if (metadataRepository != null) {
Collection<IInstallableUnit> ius = results.getIUs(null, null);
metadataRepository.addInstallableUnits(ius);
}
- return Status.OK_STATUS;
}
}
diff --git a/bundles/org.eclipse.equinox.p2.ql/pom.xml b/bundles/org.eclipse.equinox.p2.ql/pom.xml
index af8396b14..5f1c24efc 100644
--- a/bundles/org.eclipse.equinox.p2.ql/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.ql/pom.xml
@@ -5,10 +5,11 @@
<parent>
<artifactId>org.eclipse.equinox.p2-parent</artifactId>
<groupId>org.eclipse</groupId>
- <version>0.0.1-SNAPSHOT</version><relativePath>../org.eclipse.equinox.p2-parent</relativePath>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent</relativePath>
</parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.p2.ql</artifactId>
- <version>2.0.100.qualifier</version>
+ <version>2.0.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.p2.reconciler.dropins/pom.xml b/bundles/org.eclipse.equinox.p2.reconciler.dropins/pom.xml
index c8de1f7de..ab9c41bc3 100644
--- a/bundles/org.eclipse.equinox.p2.reconciler.dropins/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.reconciler.dropins/pom.xml
@@ -5,10 +5,11 @@
<parent>
<artifactId>org.eclipse.equinox.p2-parent</artifactId>
<groupId>org.eclipse</groupId>
- <version>0.0.1-SNAPSHOT</version><relativePath>../org.eclipse.equinox.p2-parent</relativePath>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent</relativePath>
</parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.p2.reconciler.dropins</artifactId>
- <version>1.1.100.qualifier</version>
+ <version>1.1.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.p2.repository.tools/lib/.cvsignore b/bundles/org.eclipse.equinox.p2.repository.tools/lib/.cvsignore
deleted file mode 100644
index 577f03f81..000000000
--- a/bundles/org.eclipse.equinox.p2.repository.tools/lib/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-repository-tools-ant.jar
diff --git a/bundles/org.eclipse.equinox.p2.repository.tools/lib/.gitignore b/bundles/org.eclipse.equinox.p2.repository.tools/lib/.gitignore
deleted file mode 100644
index cadb6ae01..000000000
--- a/bundles/org.eclipse.equinox.p2.repository.tools/lib/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/repository-tools-ant.jar
diff --git a/bundles/org.eclipse.equinox.p2.repository.tools/pom.xml b/bundles/org.eclipse.equinox.p2.repository.tools/pom.xml
index a18645175..aee714568 100644
--- a/bundles/org.eclipse.equinox.p2.repository.tools/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.repository.tools/pom.xml
@@ -5,10 +5,11 @@
<parent>
<artifactId>org.eclipse.equinox.p2-parent</artifactId>
<groupId>org.eclipse</groupId>
- <version>0.0.1-SNAPSHOT</version><relativePath>../org.eclipse.equinox.p2-parent</relativePath>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent</relativePath>
</parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.p2.repository.tools</artifactId>
- <version>2.0.100.qualifier</version>
+ <version>2.0.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.p2.repository/pom.xml b/bundles/org.eclipse.equinox.p2.repository/pom.xml
index df8ce6caf..bb8b06c9a 100644
--- a/bundles/org.eclipse.equinox.p2.repository/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.repository/pom.xml
@@ -5,10 +5,11 @@
<parent>
<artifactId>org.eclipse.equinox.p2-parent</artifactId>
<groupId>org.eclipse</groupId>
- <version>0.0.1-SNAPSHOT</version><relativePath>../org.eclipse.equinox.p2-parent</relativePath>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent</relativePath>
</parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.p2.repository</artifactId>
- <version>2.1.0.qualifier</version>
+ <version>2.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.p2.sar/pom.xml b/bundles/org.eclipse.equinox.p2.sar/pom.xml
index af9562d6d..9ac3a8bcc 100644
--- a/bundles/org.eclipse.equinox.p2.sar/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.sar/pom.xml
@@ -5,7 +5,8 @@
<parent>
<artifactId>org.eclipse.equinox.p2-parent</artifactId>
<groupId>org.eclipse</groupId>
- <version>0.0.1-SNAPSHOT</version><relativePath>../org.eclipse.equinox.p2-parent</relativePath>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent</relativePath>
</parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.p2.sar</artifactId>
diff --git a/bundles/org.eclipse.equinox.p2.tests.discovery/pom.xml b/bundles/org.eclipse.equinox.p2.tests.discovery/pom.xml
index 01db2a5e6..91b7edf43 100644
--- a/bundles/org.eclipse.equinox.p2.tests.discovery/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.tests.discovery/pom.xml
@@ -5,10 +5,11 @@
<parent>
<artifactId>org.eclipse.equinox.p2-parent</artifactId>
<groupId>org.eclipse</groupId>
- <version>0.0.1-SNAPSHOT</version><relativePath>../org.eclipse.equinox.p2-parent</relativePath>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent</relativePath>
</parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.p2.tests.discovery</artifactId>
- <version>1.0.0.qualifier</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.p2.tests.optimizers/pom.xml b/bundles/org.eclipse.equinox.p2.tests.optimizers/pom.xml
index 9e0f200d9..4f59a9e32 100644
--- a/bundles/org.eclipse.equinox.p2.tests.optimizers/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.tests.optimizers/pom.xml
@@ -5,10 +5,11 @@
<parent>
<artifactId>org.eclipse.equinox.p2-parent</artifactId>
<groupId>org.eclipse</groupId>
- <version>0.0.1-SNAPSHOT</version><relativePath>../org.eclipse.equinox.p2-parent</relativePath>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent</relativePath>
</parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.p2.tests.optimizers</artifactId>
- <version>1.0.100.qualifier</version>
+ <version>1.0.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.p2.tests.ui/pom.xml b/bundles/org.eclipse.equinox.p2.tests.ui/pom.xml
index bb522f18e..1f683d9e7 100644
--- a/bundles/org.eclipse.equinox.p2.tests.ui/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.tests.ui/pom.xml
@@ -3,22 +3,24 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
+
<parent>
<artifactId>org.eclipse.equinox.p2-parent</artifactId>
<groupId>org.eclipse</groupId>
<version>0.0.1-SNAPSHOT</version>
- <relativePath>../org.eclipse.equinox.p2-parent</relativePath>
+ <relativePath>../../org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent</relativePath>
</parent>
+
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.p2.tests.ui</artifactId>
- <version>1.0.100.qualifier</version>
+ <version>1.0.100-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
<plugins>
<plugin>
- <groupId>org.sonatype.tycho</groupId>
- <artifactId>maven-osgi-test-plugin</artifactId>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
<testSuite>org.eclipse.equinox.p2.tests.ui</testSuite>
diff --git a/bundles/org.eclipse.equinox.p2.tests.verifier/pom.xml b/bundles/org.eclipse.equinox.p2.tests.verifier/pom.xml
index 4c2fdd0e2..bcafe57d8 100644
--- a/bundles/org.eclipse.equinox.p2.tests.verifier/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.tests.verifier/pom.xml
@@ -5,10 +5,11 @@
<parent>
<artifactId>org.eclipse.equinox.p2-parent</artifactId>
<groupId>org.eclipse</groupId>
- <version>0.0.1-SNAPSHOT</version><relativePath>../org.eclipse.equinox.p2-parent</relativePath>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent</relativePath>
</parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.p2.tests.verifier</artifactId>
- <version>1.0.100.qualifier</version>
+ <version>1.0.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.p2.tests/pom.xml b/bundles/org.eclipse.equinox.p2.tests/pom.xml
index 8e90ff9df..bf3f6d3c2 100644
--- a/bundles/org.eclipse.equinox.p2.tests/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.tests/pom.xml
@@ -3,22 +3,24 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>org.eclipse.equinox.p2-parent</artifactId>
<groupId>org.eclipse</groupId>
+ <artifactId>org.eclipse.equinox.p2-parent</artifactId>
<version>0.0.1-SNAPSHOT</version>
- <relativePath>../org.eclipse.equinox.p2-parent</relativePath>
+ <relativePath>../../org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent</relativePath>
</parent>
+
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.p2.tests</artifactId>
- <version>1.3.0.qualifier</version>
+ <version>1.3.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
<plugins>
<plugin>
- <groupId>org.sonatype.tycho</groupId>
- <artifactId>maven-osgi-test-plugin</artifactId>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-plugin</artifactId>
<configuration>
<testSuite>org.eclipse.equinox.p2.tests</testSuite>
<testClass>org.eclipse.equinox.p2.tests.AutomatedTests</testClass>
diff --git a/bundles/org.eclipse.equinox.p2.testserver/pom.xml b/bundles/org.eclipse.equinox.p2.testserver/pom.xml
index 2b76eed8b..4675d61d7 100644
--- a/bundles/org.eclipse.equinox.p2.testserver/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.testserver/pom.xml
@@ -5,7 +5,8 @@
<parent>
<artifactId>org.eclipse.equinox.p2-parent</artifactId>
<groupId>org.eclipse</groupId>
- <version>0.0.1-SNAPSHOT</version><relativePath>../org.eclipse.equinox.p2-parent</relativePath>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent</relativePath>
</parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.p2.testserver</artifactId>
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/pom.xml b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/pom.xml
index a16ea9b8c..5cc0a368e 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/pom.xml
@@ -5,10 +5,11 @@
<parent>
<artifactId>org.eclipse.equinox.p2-parent</artifactId>
<groupId>org.eclipse</groupId>
- <version>0.0.1-SNAPSHOT</version><relativePath>../org.eclipse.equinox.p2-parent</relativePath>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent</relativePath>
</parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.p2.touchpoint.eclipse</artifactId>
- <version>2.1.0.qualifier</version>
+ <version>2.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.natives/pom.xml b/bundles/org.eclipse.equinox.p2.touchpoint.natives/pom.xml
index 32cc7c5fe..a9e439165 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.natives/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.natives/pom.xml
@@ -5,10 +5,11 @@
<parent>
<artifactId>org.eclipse.equinox.p2-parent</artifactId>
<groupId>org.eclipse</groupId>
- <version>0.0.1-SNAPSHOT</version><relativePath>../org.eclipse.equinox.p2-parent</relativePath>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent</relativePath>
</parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.p2.touchpoint.natives</artifactId>
- <version>1.0.300.qualifier</version>
+ <version>1.0.300-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.p2.transport.ecf/pom.xml b/bundles/org.eclipse.equinox.p2.transport.ecf/pom.xml
index 8325c35a4..b62b178e2 100644
--- a/bundles/org.eclipse.equinox.p2.transport.ecf/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.transport.ecf/pom.xml
@@ -5,10 +5,11 @@
<parent>
<artifactId>org.eclipse.equinox.p2-parent</artifactId>
<groupId>org.eclipse</groupId>
- <version>0.0.1-SNAPSHOT</version><relativePath>../org.eclipse.equinox.p2-parent</relativePath>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent</relativePath>
</parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.p2.transport.ecf</artifactId>
- <version>1.0.0.qualifier</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin.rcp/pom.xml b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/pom.xml
index 9252d7a5b..33f90eadd 100644
--- a/bundles/org.eclipse.equinox.p2.ui.admin.rcp/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.ui.admin.rcp/pom.xml
@@ -5,10 +5,11 @@
<parent>
<artifactId>org.eclipse.equinox.p2-parent</artifactId>
<groupId>org.eclipse</groupId>
- <version>0.0.1-SNAPSHOT</version><relativePath>../org.eclipse.equinox.p2-parent</relativePath>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent</relativePath>
</parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.p2.ui.admin.rcp</artifactId>
- <version>1.0.200.qualifier</version>
+ <version>1.0.200-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/pom.xml b/bundles/org.eclipse.equinox.p2.ui.admin/pom.xml
index 68cd981f3..f120bb747 100644
--- a/bundles/org.eclipse.equinox.p2.ui.admin/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.ui.admin/pom.xml
@@ -5,10 +5,11 @@
<parent>
<artifactId>org.eclipse.equinox.p2-parent</artifactId>
<groupId>org.eclipse</groupId>
- <version>0.0.1-SNAPSHOT</version><relativePath>../org.eclipse.equinox.p2-parent</relativePath>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent</relativePath>
</parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.p2.ui.admin</artifactId>
- <version>1.0.100.qualifier</version>
+ <version>1.0.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.p2.ui.discovery/pom.xml b/bundles/org.eclipse.equinox.p2.ui.discovery/pom.xml
index 303802560..8f2c8b774 100644
--- a/bundles/org.eclipse.equinox.p2.ui.discovery/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.ui.discovery/pom.xml
@@ -5,10 +5,11 @@
<parent>
<artifactId>org.eclipse.equinox.p2-parent</artifactId>
<groupId>org.eclipse</groupId>
- <version>0.0.1-SNAPSHOT</version><relativePath>../org.eclipse.equinox.p2-parent</relativePath>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent</relativePath>
</parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.p2.ui.discovery</artifactId>
- <version>1.0.0.qualifier</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.p2.ui.importexport/pom.xml b/bundles/org.eclipse.equinox.p2.ui.importexport/pom.xml
index 2b09fd748..cd738cb32 100644
--- a/bundles/org.eclipse.equinox.p2.ui.importexport/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.ui.importexport/pom.xml
@@ -5,10 +5,11 @@
<parent>
<artifactId>org.eclipse.equinox.p2-parent</artifactId>
<groupId>org.eclipse</groupId>
- <version>0.0.1-SNAPSHOT</version><relativePath>../org.eclipse.equinox.p2-parent</relativePath>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent</relativePath>
</parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.p2.ui.importexport</artifactId>
- <version>1.0.1.qualifier</version>
+ <version>1.0.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.p2.ui.rcp/pom.xml b/bundles/org.eclipse.equinox.p2.ui.rcp/pom.xml
index 8eeff82ba..2bdb355b2 100644
--- a/bundles/org.eclipse.equinox.p2.ui.rcp/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.ui.rcp/pom.xml
@@ -5,10 +5,11 @@
<parent>
<artifactId>org.eclipse.equinox.p2-parent</artifactId>
<groupId>org.eclipse</groupId>
- <version>0.0.1-SNAPSHOT</version><relativePath>../org.eclipse.equinox.p2-parent</relativePath>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent</relativePath>
</parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.p2.ui.rcp</artifactId>
- <version>1.0.0.qualifier</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/pom.xml b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/pom.xml
index 9bc5d8131..3976c8927 100644
--- a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/pom.xml
@@ -5,10 +5,11 @@
<parent>
<artifactId>org.eclipse.equinox.p2-parent</artifactId>
<groupId>org.eclipse</groupId>
- <version>0.0.1-SNAPSHOT</version><relativePath>../org.eclipse.equinox.p2-parent</relativePath>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent</relativePath>
</parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.p2.ui.sdk.scheduler</artifactId>
- <version>1.0.100.qualifier</version>
+ <version>1.0.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk/pom.xml b/bundles/org.eclipse.equinox.p2.ui.sdk/pom.xml
index f782c0d0c..d00a1e133 100644
--- a/bundles/org.eclipse.equinox.p2.ui.sdk/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.ui.sdk/pom.xml
@@ -7,10 +7,10 @@
<artifactId>org.eclipse.equinox.p2-parent</artifactId>
<groupId>org.eclipse</groupId>
<version>0.0.1-SNAPSHOT</version>
- <relativePath>../org.eclipse.equinox.p2-parent</relativePath>
+ <relativePath>../../org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent</relativePath>
</parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.p2.ui.sdk</artifactId>
- <version>1.0.200.qualifier</version>
+ <version>1.0.200-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.p2.ui/pom.xml b/bundles/org.eclipse.equinox.p2.ui/pom.xml
index dc127afdc..498dbf544 100644
--- a/bundles/org.eclipse.equinox.p2.ui/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.ui/pom.xml
@@ -5,10 +5,11 @@
<parent>
<artifactId>org.eclipse.equinox.p2-parent</artifactId>
<groupId>org.eclipse</groupId>
- <version>0.0.1-SNAPSHOT</version><relativePath>../org.eclipse.equinox.p2-parent</relativePath>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent</relativePath>
</parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.p2.ui</artifactId>
- <version>2.1.0.qualifier</version>
+ <version>2.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.p2.updatechecker/pom.xml b/bundles/org.eclipse.equinox.p2.updatechecker/pom.xml
index 69b052792..80c799480 100644
--- a/bundles/org.eclipse.equinox.p2.updatechecker/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.updatechecker/pom.xml
@@ -5,10 +5,11 @@
<parent>
<artifactId>org.eclipse.equinox.p2-parent</artifactId>
<groupId>org.eclipse</groupId>
- <version>0.0.1-SNAPSHOT</version><relativePath>../org.eclipse.equinox.p2-parent</relativePath>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent</relativePath>
</parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.p2.updatechecker</artifactId>
- <version>1.1.200.qualifier</version>
+ <version>1.1.200-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.p2.updatesite/pom.xml b/bundles/org.eclipse.equinox.p2.updatesite/pom.xml
index 465e97f7a..3ef1e79e0 100644
--- a/bundles/org.eclipse.equinox.p2.updatesite/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.updatesite/pom.xml
@@ -5,10 +5,11 @@
<parent>
<artifactId>org.eclipse.equinox.p2-parent</artifactId>
<groupId>org.eclipse</groupId>
- <version>0.0.1-SNAPSHOT</version><relativePath>../org.eclipse.equinox.p2-parent</relativePath>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent</relativePath>
</parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.p2.updatesite</artifactId>
- <version>1.0.300.qualifier</version>
+ <version>1.0.300-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/pom.xml b/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/pom.xml
index b52d1de71..92977f99c 100644
--- a/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/pom.xml
+++ b/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/pom.xml
@@ -5,10 +5,11 @@
<parent>
<artifactId>org.eclipse.equinox.p2-parent</artifactId>
<groupId>org.eclipse</groupId>
- <version>0.0.1-SNAPSHOT</version><relativePath>../org.eclipse.equinox.p2-parent</relativePath>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent</relativePath>
</parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.simpleconfigurator.manipulator</artifactId>
- <version>2.0.0.qualifier</version>
+ <version>2.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.simpleconfigurator/pom.xml b/bundles/org.eclipse.equinox.simpleconfigurator/pom.xml
index bef764a22..0b91db6f9 100644
--- a/bundles/org.eclipse.equinox.simpleconfigurator/pom.xml
+++ b/bundles/org.eclipse.equinox.simpleconfigurator/pom.xml
@@ -5,10 +5,11 @@
<parent>
<artifactId>org.eclipse.equinox.p2-parent</artifactId>
<groupId>org.eclipse</groupId>
- <version>0.0.1-SNAPSHOT</version><relativePath>../org.eclipse.equinox.p2-parent</relativePath>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent</relativePath>
</parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.simpleconfigurator</artifactId>
- <version>1.0.200.qualifier</version>
+ <version>1.0.200-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/features/org.eclipse.equinox.p2.core.feature/pom.xml b/features/org.eclipse.equinox.p2.core.feature/pom.xml
index 77581179e..1a5423524 100644
--- a/features/org.eclipse.equinox.p2.core.feature/pom.xml
+++ b/features/org.eclipse.equinox.p2.core.feature/pom.xml
@@ -5,10 +5,11 @@
<parent>
<artifactId>org.eclipse.equinox.p2-parent</artifactId>
<groupId>org.eclipse</groupId>
- <version>0.0.1-SNAPSHOT</version><relativePath>../org.eclipse.equinox.p2-parent</relativePath>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent</relativePath>
</parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.p2.core.feature</artifactId>
- <version>1.0.0.qualifier</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.equinox.p2.discovery.feature/pom.xml b/features/org.eclipse.equinox.p2.discovery.feature/pom.xml
index 6e247e4b0..183483a41 100644
--- a/features/org.eclipse.equinox.p2.discovery.feature/pom.xml
+++ b/features/org.eclipse.equinox.p2.discovery.feature/pom.xml
@@ -5,10 +5,11 @@
<parent>
<artifactId>org.eclipse.equinox.p2-parent</artifactId>
<groupId>org.eclipse</groupId>
- <version>0.0.1-SNAPSHOT</version><relativePath>../org.eclipse.equinox.p2-parent</relativePath>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent</relativePath>
</parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.p2.discovery.feature</artifactId>
- <version>1.0.100.qualifier</version>
+ <version>1.0.100-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.equinox.p2.extras.feature/pom.xml b/features/org.eclipse.equinox.p2.extras.feature/pom.xml
index 02e40cb71..8f4ee976b 100644
--- a/features/org.eclipse.equinox.p2.extras.feature/pom.xml
+++ b/features/org.eclipse.equinox.p2.extras.feature/pom.xml
@@ -5,10 +5,11 @@
<parent>
<artifactId>org.eclipse.equinox.p2-parent</artifactId>
<groupId>org.eclipse</groupId>
- <version>0.0.1-SNAPSHOT</version><relativePath>../org.eclipse.equinox.p2-parent</relativePath>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent</relativePath>
</parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.p2.extras.feature</artifactId>
- <version>1.0.0.qualifier</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.equinox.p2.sdk/pom.xml b/features/org.eclipse.equinox.p2.sdk/pom.xml
index d53b10f0e..bc11a3430 100644
--- a/features/org.eclipse.equinox.p2.sdk/pom.xml
+++ b/features/org.eclipse.equinox.p2.sdk/pom.xml
@@ -5,10 +5,11 @@
<parent>
<artifactId>org.eclipse.equinox.p2-parent</artifactId>
<groupId>org.eclipse</groupId>
- <version>0.0.1-SNAPSHOT</version><relativePath>../org.eclipse.equinox.p2-parent</relativePath>
+ <version>0.0.1-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent</relativePath>
</parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.p2.sdk</artifactId>
- <version>1.0.0.qualifier</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.equinox.p2.user.ui/pom.xml b/features/org.eclipse.equinox.p2.user.ui/pom.xml
index bfd9f370d..ebfdeb802 100644
--- a/features/org.eclipse.equinox.p2.user.ui/pom.xml
+++ b/features/org.eclipse.equinox.p2.user.ui/pom.xml
@@ -7,11 +7,11 @@
<artifactId>org.eclipse.equinox.p2-parent</artifactId>
<groupId>org.eclipse</groupId>
<version>0.0.1-SNAPSHOT</version>
- <relativePath>../org.eclipse.equinox.p2-parent</relativePath>
+ <relativePath>../../org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent</relativePath>
</parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.equinox.p2.user.ui</artifactId>
- <version>2.0.0.qualifier</version>
+ <version>2.0.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent/pom.xml b/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent/pom.xml
index 663aaf856..481853d91 100644
--- a/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent/pom.xml
+++ b/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent/pom.xml
@@ -7,7 +7,7 @@
<packaging>pom</packaging>
<properties>
- <tycho-version>0.8.0</tycho-version>
+ <tycho-version>0.12.0</tycho-version>
</properties>
<repositories>
<repository>
@@ -25,14 +25,14 @@
<build>
<plugins>
<plugin>
- <groupId>org.sonatype.tycho</groupId>
+ <groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-maven-plugin</artifactId>
<version>${tycho-version}</version>
<extensions>true</extensions>
</plugin>
<plugin>
- <groupId>org.sonatype.tycho</groupId>
+ <groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<version>${tycho-version}</version>
<configuration>
@@ -66,6 +66,17 @@
</environments>
</configuration>
</plugin>
+
+ <!-- workaround for bug 353505 - need to repeat compiler source and target levels in POM -->
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-compiler-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <source>1.5</source>
+ <target>jsr14</target>
+ </configuration>
+ </plugin>
</plugins>
</build>

Back to the top