diff options
31 files changed, 201 insertions, 201 deletions
diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index ed58fdbd08..4699eac61c 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -2,9 +2,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 0.12.0.qualifier +Bundle-Version: 1.0.0.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Import-Package: org.apache.tools.ant Bundle-Localization: plugin Bundle-Vendor: %Provider-Name -Export-Package: org.eclipse.jgit.ant.tasks;version="0.12.0" +Export-Package: org.eclipse.jgit.ant.tasks;version="1.0.0" diff --git a/org.eclipse.jgit.console/META-INF/MANIFEST.MF b/org.eclipse.jgit.console/META-INF/MANIFEST.MF index c6ad01ba66..84b632201a 100644 --- a/org.eclipse.jgit.console/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.console/META-INF/MANIFEST.MF @@ -3,12 +3,12 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.console -Bundle-Version: 0.12.1 +Bundle-Version: 1.0.0.qualifier Bundle-Vendor: %provider_name Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Export-Package: org.eclipse.jgit.console;version="0.12.1" -Import-Package: org.eclipse.jgit.errors;version="[0.12.1,0.13.0)", - org.eclipse.jgit.nls;version="[0.12.1,0.13.0)", - org.eclipse.jgit.transport;version="[0.12.1,0.13.0)", - org.eclipse.jgit.util;version="[0.12.1,0.13.0)" +Export-Package: org.eclipse.jgit.console;version="1.0.0" +Import-Package: org.eclipse.jgit.errors;version="[1.0.0,1.1.0)", + org.eclipse.jgit.nls;version="[1.0.0,1.1.0)", + org.eclipse.jgit.transport;version="[1.0.0,1.1.0)", + org.eclipse.jgit.util;version="[1.0.0,1.1.0)" Require-Bundle: com.jcraft.jsch;bundle-version="[0.1.37,0.2.0)" diff --git a/org.eclipse.jgit.console/pom.xml b/org.eclipse.jgit.console/pom.xml index 12bb1717e1..5209c34fcf 100644 --- a/org.eclipse.jgit.console/pom.xml +++ b/org.eclipse.jgit.console/pom.xml @@ -52,7 +52,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>0.12.1</version> + <version>1.0.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.console</artifactId> diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index 7319be58d8..2b4a51be6e 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -2,23 +2,23 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 0.12.1 +Bundle-Version: 1.0.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name Export-Package: - org.eclipse.jgit.http.server;version="0.12.1", - org.eclipse.jgit.http.server.glue;version="0.12.1", - org.eclipse.jgit.http.server.resolver;version="0.12.1" + org.eclipse.jgit.http.server;version="1.0.0", + org.eclipse.jgit.http.server.glue;version="1.0.0", + org.eclipse.jgit.http.server.resolver;version="1.0.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Import-Package: javax.servlet;version="[2.5.0,3.0.0)", javax.servlet.http;version="[2.5.0,3.0.0)", - org.eclipse.jgit.errors;version="[0.12.1,0.13.0)", - org.eclipse.jgit.lib;version="[0.12.1,0.13.0)", - org.eclipse.jgit.nls;version="[0.12.1,0.13.0)", - org.eclipse.jgit.revwalk;version="[0.12.1,0.13.0)", - org.eclipse.jgit.storage.file;version="[0.12.1,0.13.0)", - org.eclipse.jgit.transport;version="[0.12.1,0.13.0)", - org.eclipse.jgit.transport.resolver;version="[0.12.1,0.13.0)", - org.eclipse.jgit.util;version="[0.12.1,0.13.0)", - org.eclipse.jgit.util.io;version="[0.12.1,0.13.0)" + org.eclipse.jgit.errors;version="[1.0.0,1.1.0)", + org.eclipse.jgit.lib;version="[1.0.0,1.1.0)", + org.eclipse.jgit.nls;version="[1.0.0,1.1.0)", + org.eclipse.jgit.revwalk;version="[1.0.0,1.1.0)", + org.eclipse.jgit.storage.file;version="[1.0.0,1.1.0)", + org.eclipse.jgit.transport;version="[1.0.0,1.1.0)", + org.eclipse.jgit.transport.resolver;version="[1.0.0,1.1.0)", + org.eclipse.jgit.util;version="[1.0.0,1.1.0)", + org.eclipse.jgit.util.io;version="[1.0.0,1.1.0)" diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index 31adc649f6..45224322cc 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -52,7 +52,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>0.12.1</version> + <version>1.0.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.http.server</artifactId> diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index a87d85a791..4491df672a 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.http.test -Bundle-Version: 0.12.1 +Bundle-Version: 1.0.0.qualifier Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 @@ -21,19 +21,19 @@ Import-Package: javax.servlet;version="[2.5.0,3.0.0)", org.eclipse.jetty.util.component;version="[7.1.0,8.0.0)", org.eclipse.jetty.util.log;version="[7.1.0,8.0.0)", org.eclipse.jetty.util.thread;version="[7.1.0,8.0.0)", - org.eclipse.jgit;version="[0.12.1,0.13.0)", - org.eclipse.jgit.errors;version="[0.12.1,0.13.0)", - org.eclipse.jgit.http.server;version="[0.12.1,0.13.0)", - org.eclipse.jgit.http.server.glue;version="[0.12.1,0.13.0)", - org.eclipse.jgit.http.server.resolver;version="[0.12.1,0.13.0)", - org.eclipse.jgit.junit;version="[0.12.1,0.13.0)", - org.eclipse.jgit.lib;version="[0.12.1,0.13.0)", - org.eclipse.jgit.nls;version="[0.12.1,0.13.0)", - org.eclipse.jgit.revwalk;version="[0.12.1,0.13.0)", - org.eclipse.jgit.storage.file;version="[0.12.1,0.13.0)", - org.eclipse.jgit.transport;version="[0.12.1,0.13.0)", - org.eclipse.jgit.transport.resolver;version="[0.12.1,0.13.0)", - org.eclipse.jgit.util;version="[0.12.1,0.13.0)", - org.eclipse.jgit.junit.http;version="[0.12.1,0.13.0)", + org.eclipse.jgit;version="[1.0.0,1.1.0)", + org.eclipse.jgit.errors;version="[1.0.0,1.1.0)", + org.eclipse.jgit.http.server;version="[1.0.0,1.1.0)", + org.eclipse.jgit.http.server.glue;version="[1.0.0,1.1.0)", + org.eclipse.jgit.http.server.resolver;version="[1.0.0,1.1.0)", + org.eclipse.jgit.junit;version="[1.0.0,1.1.0)", + org.eclipse.jgit.lib;version="[1.0.0,1.1.0)", + org.eclipse.jgit.nls;version="[1.0.0,1.1.0)", + org.eclipse.jgit.revwalk;version="[1.0.0,1.1.0)", + org.eclipse.jgit.storage.file;version="[1.0.0,1.1.0)", + org.eclipse.jgit.transport;version="[1.0.0,1.1.0)", + org.eclipse.jgit.transport.resolver;version="[1.0.0,1.1.0)", + org.eclipse.jgit.util;version="[1.0.0,1.1.0)", + org.eclipse.jgit.junit.http;version="[1.0.0,1.1.0)", org.junit;version="[4.0.0,5.0.0)", org.hamcrest.core;version="[1.1.0,2.0.0)" diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 76a9c9851e..c20dbd9202 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -51,7 +51,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>0.12.1</version> + <version>1.0.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.http.test</artifactId> diff --git a/org.eclipse.jgit.iplog/META-INF/MANIFEST.MF b/org.eclipse.jgit.iplog/META-INF/MANIFEST.MF index e8bef860db..4d7438bd60 100644 --- a/org.eclipse.jgit.iplog/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.iplog/META-INF/MANIFEST.MF @@ -2,22 +2,22 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.iplog -Bundle-Version: 0.12.1 +Bundle-Version: 1.0.0.qualifier Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Import-Package: org.eclipse.jgit.diff;version="[0.12.1,0.13.0)", - org.eclipse.jgit.dircache;version="[0.12.1,0.13.0)", - org.eclipse.jgit.errors;version="[0.12.1,0.13.0)", - org.eclipse.jgit.lib;version="[0.12.1,0.13.0)", - org.eclipse.jgit.nls;version="[0.12.1,0.13.0)", - org.eclipse.jgit.revplot;version="[0.12.1,0.13.0)", - org.eclipse.jgit.revwalk;version="[0.12.1,0.13.0)", - org.eclipse.jgit.revwalk.filter;version="[0.12.1,0.13.0)", - org.eclipse.jgit.storage.file;version="[0.12.1,0.13.0)", - org.eclipse.jgit.transport;version="[0.12.1,0.13.0)", - org.eclipse.jgit.treewalk;version="[0.12.1,0.13.0)", - org.eclipse.jgit.treewalk.filter;version="[0.12.1,0.13.0)", - org.eclipse.jgit.util;version="[0.12.1,0.13.0)" -Export-Package: org.eclipse.jgit.iplog;version="0.12.1" +Import-Package: org.eclipse.jgit.diff;version="[1.0.0,1.1.0)", + org.eclipse.jgit.dircache;version="[1.0.0,1.1.0)", + org.eclipse.jgit.errors;version="[1.0.0,1.1.0)", + org.eclipse.jgit.lib;version="[1.0.0,1.1.0)", + org.eclipse.jgit.nls;version="[1.0.0,1.1.0)", + org.eclipse.jgit.revplot;version="[1.0.0,1.1.0)", + org.eclipse.jgit.revwalk;version="[1.0.0,1.1.0)", + org.eclipse.jgit.revwalk.filter;version="[1.0.0,1.1.0)", + org.eclipse.jgit.storage.file;version="[1.0.0,1.1.0)", + org.eclipse.jgit.transport;version="[1.0.0,1.1.0)", + org.eclipse.jgit.treewalk;version="[1.0.0,1.1.0)", + org.eclipse.jgit.treewalk.filter;version="[1.0.0,1.1.0)", + org.eclipse.jgit.util;version="[1.0.0,1.1.0)" +Export-Package: org.eclipse.jgit.iplog;version="1.0.0" diff --git a/org.eclipse.jgit.iplog/pom.xml b/org.eclipse.jgit.iplog/pom.xml index 57cc49bd9d..06f9a7d056 100644 --- a/org.eclipse.jgit.iplog/pom.xml +++ b/org.eclipse.jgit.iplog/pom.xml @@ -51,7 +51,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>0.12.1</version> + <version>1.0.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.iplog</artifactId> diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index cb8799fb5a..5c2d5d0b7d 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.junit.http -Bundle-Version: 0.12.1 +Bundle-Version: 1.0.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy @@ -22,14 +22,14 @@ Import-Package: javax.servlet;version="[2.5.0,3.0.0)", org.eclipse.jetty.util.component;version="[7.1.0,8.0.0)", org.eclipse.jetty.util.log;version="[7.1.0,8.0.0)", org.eclipse.jetty.util.thread;version="[7.1.0,8.0.0)", - org.eclipse.jgit.errors;version="[0.12.1,0.13.0)", - org.eclipse.jgit.http.server;version="[0.12.1,0.13.0)", - org.eclipse.jgit.http.server.resolver;version="[0.12.1,0.13.0)", - org.eclipse.jgit.junit;version="[0.12.1,0.13.0)", - org.eclipse.jgit.lib;version="[0.12.1,0.13.0)", - org.eclipse.jgit.revwalk;version="[0.12.1,0.13.0)", - org.eclipse.jgit.storage.file;version="[0.12.1,0.13.0)", - org.eclipse.jgit.transport;version="[0.12.1,0.13.0)", - org.eclipse.jgit.transport.resolver;version="[0.12.1,0.13.0)", + org.eclipse.jgit.errors;version="[1.0.0,1.1.0)", + org.eclipse.jgit.http.server;version="[1.0.0,1.1.0)", + org.eclipse.jgit.http.server.resolver;version="[1.0.0,1.1.0)", + org.eclipse.jgit.junit;version="[1.0.0,1.1.0)", + org.eclipse.jgit.lib;version="[1.0.0,1.1.0)", + org.eclipse.jgit.revwalk;version="[1.0.0,1.1.0)", + org.eclipse.jgit.storage.file;version="[1.0.0,1.1.0)", + org.eclipse.jgit.transport;version="[1.0.0,1.1.0)", + org.eclipse.jgit.transport.resolver;version="[1.0.0,1.1.0)", org.junit;version="[4.0.0,5.0.0)" -Export-Package: org.eclipse.jgit.junit.http;version="0.12.1" +Export-Package: org.eclipse.jgit.junit.http;version="1.0.0" diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index df2f0519c8..79c55e21ea 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -50,7 +50,7 @@ <parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>0.12.1</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.junit.http</artifactId>
diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index 5be33f35f6..ae0c488fdb 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -2,28 +2,28 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 0.12.1 +Bundle-Version: 1.0.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Import-Package: org.eclipse.jgit.diff;version="[0.12.1,0.13.0)", - org.eclipse.jgit.dircache;version="[0.12.1,0.13.0)", - org.eclipse.jgit.errors;version="[0.12.1,0.13.0)", - org.eclipse.jgit.fnmatch;version="[0.12.1,0.13.0)", - org.eclipse.jgit.lib;version="[0.12.1,0.13.0)", - org.eclipse.jgit.merge;version="[0.12.1,0.13.0)", - org.eclipse.jgit.patch;version="[0.12.1,0.13.0)", - org.eclipse.jgit.revplot;version="[0.12.1,0.13.0)", - org.eclipse.jgit.revwalk;version="[0.12.1,0.13.0)", - org.eclipse.jgit.revwalk.filter;version="[0.12.1,0.13.0)", - org.eclipse.jgit.storage.file;version="[0.12.1,0.13.0)", - org.eclipse.jgit.storage.pack;version="[0.12.1,0.13.0)", - org.eclipse.jgit.transport;version="[0.12.1,0.13.0)", - org.eclipse.jgit.treewalk;version="[0.12.1,0.13.0)", - org.eclipse.jgit.treewalk.filter;version="[0.12.1,0.13.0)", - org.eclipse.jgit.util;version="[0.12.1,0.13.0)", - org.eclipse.jgit.util.io;version="[0.12.1,0.13.0)", +Import-Package: org.eclipse.jgit.diff;version="[1.0.0,1.1.0)", + org.eclipse.jgit.dircache;version="[1.0.0,1.1.0)", + org.eclipse.jgit.errors;version="[1.0.0,1.1.0)", + org.eclipse.jgit.fnmatch;version="[1.0.0,1.1.0)", + org.eclipse.jgit.lib;version="[1.0.0,1.1.0)", + org.eclipse.jgit.merge;version="[1.0.0,1.1.0)", + org.eclipse.jgit.patch;version="[1.0.0,1.1.0)", + org.eclipse.jgit.revplot;version="[1.0.0,1.1.0)", + org.eclipse.jgit.revwalk;version="[1.0.0,1.1.0)", + org.eclipse.jgit.revwalk.filter;version="[1.0.0,1.1.0)", + org.eclipse.jgit.storage.file;version="[1.0.0,1.1.0)", + org.eclipse.jgit.storage.pack;version="[1.0.0,1.1.0)", + org.eclipse.jgit.transport;version="[1.0.0,1.1.0)", + org.eclipse.jgit.treewalk;version="[1.0.0,1.1.0)", + org.eclipse.jgit.treewalk.filter;version="[1.0.0,1.1.0)", + org.eclipse.jgit.util;version="[1.0.0,1.1.0)", + org.eclipse.jgit.util.io;version="[1.0.0,1.1.0)", org.junit;version="[4.0.0,5.0.0)" -Export-Package: org.eclipse.jgit.junit;version="0.12.1" +Export-Package: org.eclipse.jgit.junit;version="1.0.0" Require-Bundle: com.jcraft.jsch;bundle-version="[0.1.37,0.2.0)" diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index 91883fff06..d21b52921e 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -52,7 +52,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>0.12.1</version> + <version>1.0.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.junit</artifactId> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml index 8e6ebbb648..e1e4d8ed1b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.jgit" label="%featureName" - version="0.12.1" + version="1.0.0.qualifier" provider-name="%providerName"> <description url="http://www.eclipse.org/jgit/"> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml index 885a985c61..979f173dd4 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -50,7 +50,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>jgit.tycho.parent</artifactId> - <version>0.12.1</version> + <version>1.0.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.feature</artifactId> @@ -62,7 +62,7 @@ <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit</artifactId> - <version>0.12.1</version> + <version>1.0.0-SNAPSHOT</version> </dependency> </dependencies> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml index 61b5050c87..d86202b2c4 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml @@ -2,7 +2,7 @@ <feature
id="org.eclipse.jgit.junit"
label="%featureName"
- version="0.12.1"
+ version="1.0.0.qualifier"
provider-name="%providerName">
<description url="http://www.eclipse.org/jgit/">
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml index 95eff9288a..a38a80d0a2 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml @@ -50,7 +50,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>jgit.tycho.parent</artifactId> - <version>0.12.1</version> + <version>1.0.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.junit.feature</artifactId> @@ -62,17 +62,17 @@ <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.junit</artifactId> - <version>0.12.1</version> + <version>1.0.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.junit.http</artifactId> - <version>0.12.1</version> + <version>1.0.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.http.server</artifactId> - <version>0.12.1</version> + <version>1.0.0-SNAPSHOT</version> </dependency> </dependencies> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml index 9a64d427ff..010652ab7a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.jgit.source" label="%featureName" - version="0.12.1" + version="1.0.0.qualifier" provider-name="%providerName"> <description url="http://www.eclipse.org/jgit/"> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml index 11c719c4ca..0d5ec1bc36 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml @@ -50,7 +50,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>jgit.tycho.parent</artifactId> - <version>0.12.1</version> + <version>1.0.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.source.feature</artifactId> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/pom.xml index 9d06811a40..e7d111d846 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/pom.xml @@ -50,7 +50,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>jgit.tycho.parent</artifactId> - <version>0.12.1</version> + <version>1.0.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.updatesite</artifactId> @@ -58,28 +58,28 @@ <name>Eclipse JGit Plugin Update Site (Incubation)</name> <!-- see http://issues.sonatype.org/browse/TYCHO-313 --> - <version>0.12.1</version> + <version>1.0.0-SNAPSHOT</version> <dependencies> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit</artifactId> - <version>0.12.1</version> + <version>1.0.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.junit</artifactId> - <version>0.12.1</version> + <version>1.0.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.junit.http</artifactId> - <version>0.12.1</version> + <version>1.0.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit.http.server</artifactId> - <version>0.12.1</version> + <version>1.0.0-SNAPSHOT</version> </dependency> </dependencies> diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 892de7d563..a684cfc8cf 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -53,7 +53,7 @@ <groupId>org.eclipse.jgit</groupId> <artifactId>jgit.tycho.parent</artifactId> - <version>0.12.1</version> + <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>JGit Tycho Parent (Incubation)</name> @@ -83,7 +83,7 @@ <dependency> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit</artifactId> - <version>0.12.1</version> + <version>1.0.0-SNAPSHOT</version> <classifier>sources</classifier> </dependency> </dependencies> diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index d88dade39c..63617fb09c 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -2,35 +2,35 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 0.12.1 +Bundle-Version: 1.0.0.qualifier Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Import-Package: org.eclipse.jgit.api;version="[0.12.1,0.13.0)", - org.eclipse.jgit.api.errors;version="[0.12.1,0.13.0)", - org.eclipse.jgit.awtui;version="[0.12.1,0.13.0)", - org.eclipse.jgit.diff;version="[0.12.1,0.13.0)", - org.eclipse.jgit.dircache;version="[0.12.1,0.13.0)", - org.eclipse.jgit.errors;version="[0.12.1,0.13.0)", - org.eclipse.jgit.iplog;version="[0.12.1,0.13.0)", - org.eclipse.jgit.lib;version="[0.12.1,0.13.0)", - org.eclipse.jgit.merge;version="0.12.1", - org.eclipse.jgit.nls;version="[0.12.1,0.13.0)", - org.eclipse.jgit.notes;version="[0.12.1,0.13.0)", - org.eclipse.jgit.revplot;version="[0.12.1,0.13.0)", - org.eclipse.jgit.revwalk;version="[0.12.1,0.13.0)", - org.eclipse.jgit.revwalk.filter;version="[0.12.1,0.13.0)", - org.eclipse.jgit.storage.file;version="[0.12.1,0.13.0)", - org.eclipse.jgit.storage.pack;version="[0.12.1,0.13.0)", - org.eclipse.jgit.transport;version="[0.12.1,0.13.0)", - org.eclipse.jgit.transport.resolver;version="[0.12.1,0.13.0)", - org.eclipse.jgit.treewalk;version="[0.12.1,0.13.0)", - org.eclipse.jgit.treewalk.filter;version="[0.12.1,0.13.0)", - org.eclipse.jgit.util;version="[0.12.1,0.13.0)", +Import-Package: org.eclipse.jgit.api;version="[1.0.0,1.1.0)", + org.eclipse.jgit.api.errors;version="[1.0.0,1.1.0)", + org.eclipse.jgit.awtui;version="[1.0.0,1.1.0)", + org.eclipse.jgit.diff;version="[1.0.0,1.1.0)", + org.eclipse.jgit.dircache;version="[1.0.0,1.1.0)", + org.eclipse.jgit.errors;version="[1.0.0,1.1.0)", + org.eclipse.jgit.iplog;version="[1.0.0,1.1.0)", + org.eclipse.jgit.lib;version="[1.0.0,1.1.0)", + org.eclipse.jgit.merge;version="1.0.0", + org.eclipse.jgit.nls;version="[1.0.0,1.1.0)", + org.eclipse.jgit.notes;version="[1.0.0,1.1.0)", + org.eclipse.jgit.revplot;version="[1.0.0,1.1.0)", + org.eclipse.jgit.revwalk;version="[1.0.0,1.1.0)", + org.eclipse.jgit.revwalk.filter;version="[1.0.0,1.1.0)", + org.eclipse.jgit.storage.file;version="[1.0.0,1.1.0)", + org.eclipse.jgit.storage.pack;version="[1.0.0,1.1.0)", + org.eclipse.jgit.transport;version="[1.0.0,1.1.0)", + org.eclipse.jgit.transport.resolver;version="[1.0.0,1.1.0)", + org.eclipse.jgit.treewalk;version="[1.0.0,1.1.0)", + org.eclipse.jgit.treewalk.filter;version="[1.0.0,1.1.0)", + org.eclipse.jgit.util;version="[1.0.0,1.1.0)", org.kohsuke.args4j;version="[2.0.12,2.1.0)", org.kohsuke.args4j.spi;version="[2.0.12,2.1.0)" Bundle-ActivationPolicy: lazy -Export-Package: org.eclipse.jgit.pgm;version="0.12.1"; +Export-Package: org.eclipse.jgit.pgm;version="1.0.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.nls, org.eclipse.jgit.treewalk, diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 1b68de7735..bcbe74cd93 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -50,7 +50,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>0.12.1</version> + <version>1.0.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.pgm</artifactId> diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index 24b392cddb..230e06f87c 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -2,41 +2,41 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 0.12.1 +Bundle-Version: 1.0.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Import-Package: org.eclipse.jgit;version="[0.12.1,0.13.0)", - org.eclipse.jgit.api;version="[0.12.1,0.13.0)", - org.eclipse.jgit.api.errors;version="[0.12.1,0.13.0)", - org.eclipse.jgit.awtui;version="[0.12.1,0.13.0)", - org.eclipse.jgit.console;version="[0.12.1,0.13.0)", - org.eclipse.jgit.diff;version="[0.12.1,0.13.0)", - org.eclipse.jgit.dircache;version="[0.12.1,0.13.0)", - org.eclipse.jgit.errors;version="[0.12.1,0.13.0)", - org.eclipse.jgit.events;version="[0.12.1,0.13.0)", - org.eclipse.jgit.fnmatch;version="[0.12.1,0.13.0)", - org.eclipse.jgit.http.server;version="[0.12.1,0.13.0)", - org.eclipse.jgit.ignore;version="[0.12.1,0.13.0)", - org.eclipse.jgit.iplog;version="[0.12.1,0.13.0)", - org.eclipse.jgit.junit;version="[0.12.1,0.13.0)", - org.eclipse.jgit.lib;version="[0.12.1,0.13.0)", - org.eclipse.jgit.merge;version="[0.12.1,0.13.0)", - org.eclipse.jgit.nls;version="[0.12.1,0.13.0)", - org.eclipse.jgit.notes;version="[0.12.1,0.13.0)", - org.eclipse.jgit.patch;version="[0.12.1,0.13.0)", - org.eclipse.jgit.pgm;version="[0.12.1,0.13.0)", - org.eclipse.jgit.revplot;version="[0.12.1,0.13.0)", - org.eclipse.jgit.revwalk;version="[0.12.1,0.13.0)", - org.eclipse.jgit.revwalk.filter;version="[0.12.1,0.13.0)", - org.eclipse.jgit.storage.file;version="[0.12.1,0.13.0)", - org.eclipse.jgit.storage.pack;version="[0.12.1,0.13.0)", - org.eclipse.jgit.transport;version="[0.12.1,0.13.0)", - org.eclipse.jgit.treewalk;version="[0.12.1,0.13.0)", - org.eclipse.jgit.treewalk.filter;version="[0.12.1,0.13.0)", - org.eclipse.jgit.util;version="[0.12.1,0.13.0)", - org.eclipse.jgit.util.io;version="[0.12.1,0.13.0)", +Import-Package: org.eclipse.jgit;version="[1.0.0,1.1.0)", + org.eclipse.jgit.api;version="[1.0.0,1.1.0)", + org.eclipse.jgit.api.errors;version="[1.0.0,1.1.0)", + org.eclipse.jgit.awtui;version="[1.0.0,1.1.0)", + org.eclipse.jgit.console;version="[1.0.0,1.1.0)", + org.eclipse.jgit.diff;version="[1.0.0,1.1.0)", + org.eclipse.jgit.dircache;version="[1.0.0,1.1.0)", + org.eclipse.jgit.errors;version="[1.0.0,1.1.0)", + org.eclipse.jgit.events;version="[1.0.0,1.1.0)", + org.eclipse.jgit.fnmatch;version="[1.0.0,1.1.0)", + org.eclipse.jgit.http.server;version="[1.0.0,1.1.0)", + org.eclipse.jgit.ignore;version="[1.0.0,1.1.0)", + org.eclipse.jgit.iplog;version="[1.0.0,1.1.0)", + org.eclipse.jgit.junit;version="[1.0.0,1.1.0)", + org.eclipse.jgit.lib;version="[1.0.0,1.1.0)", + org.eclipse.jgit.merge;version="[1.0.0,1.1.0)", + org.eclipse.jgit.nls;version="[1.0.0,1.1.0)", + org.eclipse.jgit.notes;version="[1.0.0,1.1.0)", + org.eclipse.jgit.patch;version="[1.0.0,1.1.0)", + org.eclipse.jgit.pgm;version="[1.0.0,1.1.0)", + org.eclipse.jgit.revplot;version="[1.0.0,1.1.0)", + org.eclipse.jgit.revwalk;version="[1.0.0,1.1.0)", + org.eclipse.jgit.revwalk.filter;version="[1.0.0,1.1.0)", + org.eclipse.jgit.storage.file;version="[1.0.0,1.1.0)", + org.eclipse.jgit.storage.pack;version="[1.0.0,1.1.0)", + org.eclipse.jgit.transport;version="[1.0.0,1.1.0)", + org.eclipse.jgit.treewalk;version="[1.0.0,1.1.0)", + org.eclipse.jgit.treewalk.filter;version="[1.0.0,1.1.0)", + org.eclipse.jgit.util;version="[1.0.0,1.1.0)", + org.eclipse.jgit.util.io;version="[1.0.0,1.1.0)", org.junit;version="[4.0.0,5.0.0)", org.hamcrest.core;version="[1.1.0,2.0.0)" Require-Bundle: com.jcraft.jsch;bundle-version="[0.1.37,0.2.0)" diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index 91b29c8468..d373bd0c91 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -52,7 +52,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>0.12.1</version> + <version>1.0.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.test</artifactId> diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index ec0d2076dd..4d47f8b0ef 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -3,15 +3,15 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 0.12.1 +Bundle-Version: 1.0.0.qualifier Bundle-Vendor: %provider_name Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Export-Package: org.eclipse.jgit.awtui;version="0.12.1" -Import-Package: org.eclipse.jgit.errors;version="[0.12.1,0.13.0)", - org.eclipse.jgit.lib;version="[0.12.1,0.13.0)", - org.eclipse.jgit.nls;version="[0.12.1,0.13.0)", - org.eclipse.jgit.revplot;version="[0.12.1,0.13.0)", - org.eclipse.jgit.revwalk;version="[0.12.1,0.13.0)", - org.eclipse.jgit.transport;version="[0.12.1,0.13.0)", - org.eclipse.jgit.util;version="[0.12.1,0.13.0)" +Export-Package: org.eclipse.jgit.awtui;version="1.0.0" +Import-Package: org.eclipse.jgit.errors;version="[1.0.0,1.1.0)", + org.eclipse.jgit.lib;version="[1.0.0,1.1.0)", + org.eclipse.jgit.nls;version="[1.0.0,1.1.0)", + org.eclipse.jgit.revplot;version="[1.0.0,1.1.0)", + org.eclipse.jgit.revwalk;version="[1.0.0,1.1.0)", + org.eclipse.jgit.transport;version="[1.0.0,1.1.0)", + org.eclipse.jgit.util;version="[1.0.0,1.1.0)" Require-Bundle: com.jcraft.jsch;bundle-version="[0.1.37,0.2.0)" diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index 4f38bd4b6f..29be548446 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -52,7 +52,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>0.12.1</version> + <version>1.0.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.ui</artifactId> diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index b3a8905e18..e2d1a1e0ab 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -2,34 +2,34 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 0.12.1 +Bundle-Version: 1.0.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name -Export-Package: org.eclipse.jgit;version="0.12.1", - org.eclipse.jgit.api;version="0.12.1", - org.eclipse.jgit.api.errors;version="0.12.1", - org.eclipse.jgit.diff;version="0.12.1", - org.eclipse.jgit.dircache;version="0.12.1", - org.eclipse.jgit.errors;version="0.12.1", - org.eclipse.jgit.events;version="0.12.1", - org.eclipse.jgit.fnmatch;version="0.12.1", - org.eclipse.jgit.ignore;version="0.12.1", - org.eclipse.jgit.lib;version="0.12.1", - org.eclipse.jgit.merge;version="0.12.1", - org.eclipse.jgit.nls;version="0.12.1", - org.eclipse.jgit.notes;version="0.12.1", - org.eclipse.jgit.patch;version="0.12.1", - org.eclipse.jgit.revplot;version="0.12.1", - org.eclipse.jgit.revwalk;version="0.12.1", - org.eclipse.jgit.revwalk.filter;version="0.12.1", - org.eclipse.jgit.storage.file;version="0.12.1", - org.eclipse.jgit.storage.pack;version="0.12.1", - org.eclipse.jgit.transport;version="0.12.1", - org.eclipse.jgit.transport.resolver;version="0.12.1", - org.eclipse.jgit.treewalk;version="0.12.1", - org.eclipse.jgit.treewalk.filter;version="0.12.1", - org.eclipse.jgit.util;version="0.12.1", - org.eclipse.jgit.util.io;version="0.12.1" +Export-Package: org.eclipse.jgit;version="1.0.0", + org.eclipse.jgit.api;version="1.0.0", + org.eclipse.jgit.api.errors;version="1.0.0", + org.eclipse.jgit.diff;version="1.0.0", + org.eclipse.jgit.dircache;version="1.0.0", + org.eclipse.jgit.errors;version="1.0.0", + org.eclipse.jgit.events;version="1.0.0", + org.eclipse.jgit.fnmatch;version="1.0.0", + org.eclipse.jgit.ignore;version="1.0.0", + org.eclipse.jgit.lib;version="1.0.0", + org.eclipse.jgit.merge;version="1.0.0", + org.eclipse.jgit.nls;version="1.0.0", + org.eclipse.jgit.notes;version="1.0.0", + org.eclipse.jgit.patch;version="1.0.0", + org.eclipse.jgit.revplot;version="1.0.0", + org.eclipse.jgit.revwalk;version="1.0.0", + org.eclipse.jgit.revwalk.filter;version="1.0.0", + org.eclipse.jgit.storage.file;version="1.0.0", + org.eclipse.jgit.storage.pack;version="1.0.0", + org.eclipse.jgit.transport;version="1.0.0", + org.eclipse.jgit.transport.resolver;version="1.0.0", + org.eclipse.jgit.treewalk;version="1.0.0", + org.eclipse.jgit.treewalk.filter;version="1.0.0", + org.eclipse.jgit.util;version="1.0.0", + org.eclipse.jgit.util.io;version="1.0.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: com.jcraft.jsch;bundle-version="[0.1.37,0.2.0)" diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 6ba95f23ab..a358d1a941 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source;singleton:=true Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 0.12.1 -Eclipse-SourceBundle: org.eclipse.jgit;version="0.12.1";roots="." +Bundle-Version: 1.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit;version="1.0.0";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index 2c2d9a5b52..07a8fa013e 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -53,7 +53,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>0.12.1</version> + <version>1.0.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit</artifactId> @@ -50,7 +50,7 @@ <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> <packaging>pom</packaging> - <version>0.12.1</version> + <version>1.0.0-SNAPSHOT</version> <name>JGit - Parent</name> <url>${jgit-url}</url> |