forked from fabioz/Pydev
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'new_release' into pydev_9_3
- Loading branch information
Showing
64 changed files
with
2,131 additions
and
2,108 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,62 +1,62 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| Copyright (C) 2013, Red Hat, Inc. and others | ||
| All rights reserved. This program and the accompanying materials | ||
| are made available under the terms of the Eclipse Public License v1.0 | ||
| which accompanies this distribution, and is available at | ||
| http://www.eclipse.org/legal/epl-v10.html | ||
| Contributors: | ||
| Red Hat Incorporated - initial implementation | ||
| --> | ||
| <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <parent> | ||
| <groupId>org.python.pydev</groupId> | ||
| <artifactId>features</artifactId> | ||
| <version>9.3.2-SNAPSHOT</version> | ||
| <relativePath>../pom.xml</relativePath> | ||
| </parent> | ||
| <groupId>org.python.pydev</groupId> | ||
| <artifactId>org.python.pydev.feature</artifactId> | ||
| <packaging>eclipse-feature</packaging> | ||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.eclipse.tycho.extras</groupId> | ||
| <artifactId>tycho-source-feature-plugin</artifactId> | ||
| <version>${tycho-extras-version}</version> | ||
| <executions> | ||
| <execution> | ||
| <id>source-feature</id> | ||
| <phase>package</phase> | ||
| <goals> | ||
| <goal>source-feature</goal> | ||
| </goals> | ||
| <configuration> | ||
| <excludes> | ||
| <plugin id="org.python.pydev.help" /> | ||
| </excludes> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.eclipse.tycho</groupId> | ||
| <artifactId>tycho-p2-plugin</artifactId> | ||
| <version>${tycho-version}</version> | ||
| <executions> | ||
| <execution> | ||
| <id>attach-p2-metadata</id> | ||
| <phase>package</phase> | ||
| <goals> | ||
| <goal>p2-metadata</goal> | ||
| </goals> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| </project> | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| Copyright (C) 2013, Red Hat, Inc. and others | ||
| All rights reserved. This program and the accompanying materials | ||
| are made available under the terms of the Eclipse Public License v1.0 | ||
| which accompanies this distribution, and is available at | ||
| http://www.eclipse.org/legal/epl-v10.html | ||
| Contributors: | ||
| Red Hat Incorporated - initial implementation | ||
| --> | ||
| <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <parent> | ||
| <groupId>org.python.pydev</groupId> | ||
| <artifactId>features</artifactId> | ||
| <version>9.3.3-SNAPSHOT</version> | ||
| <relativePath>../pom.xml</relativePath> | ||
| </parent> | ||
| <groupId>org.python.pydev</groupId> | ||
| <artifactId>org.python.pydev.feature</artifactId> | ||
| <packaging>eclipse-feature</packaging> | ||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.eclipse.tycho.extras</groupId> | ||
| <artifactId>tycho-source-feature-plugin</artifactId> | ||
| <version>${tycho-extras-version}</version> | ||
| <executions> | ||
| <execution> | ||
| <id>source-feature</id> | ||
| <phase>package</phase> | ||
| <goals> | ||
| <goal>source-feature</goal> | ||
| </goals> | ||
| <configuration> | ||
| <excludes> | ||
| <plugin id="org.python.pydev.help" /> | ||
| </excludes> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.eclipse.tycho</groupId> | ||
| <artifactId>tycho-p2-plugin</artifactId> | ||
| <version>${tycho-version}</version> | ||
| <executions> | ||
| <execution> | ||
| <id>attach-p2-metadata</id> | ||
| <phase>package</phase> | ||
| <goals> | ||
| <goal>p2-metadata</goal> | ||
| </goals> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| </project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,26 +1,26 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| Copyright (C) 2013, Red Hat, Inc. and others | ||
| All rights reserved. This program and the accompanying materials | ||
| are made available under the terms of the Eclipse Public License v1.0 | ||
| which accompanies this distribution, and is available at | ||
| http://www.eclipse.org/legal/epl-v10.html | ||
| Contributors: | ||
| Red Hat Incorporated - initial implementation | ||
| --> | ||
| <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <parent> | ||
| <groupId>org.python.pydev</groupId> | ||
| <artifactId>features</artifactId> | ||
| <version>9.3.0-SNAPSHOT</version> | ||
| <relativePath>../pom.xml</relativePath> | ||
| </parent> | ||
| <groupId>org.python.pydev</groupId> | ||
| <artifactId>org.python.pydev.mylyn.feature</artifactId> | ||
| <version>0.6.0</version> | ||
| <packaging>eclipse-feature</packaging> | ||
| </project> | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| Copyright (C) 2013, Red Hat, Inc. and others | ||
| All rights reserved. This program and the accompanying materials | ||
| are made available under the terms of the Eclipse Public License v1.0 | ||
| which accompanies this distribution, and is available at | ||
| http://www.eclipse.org/legal/epl-v10.html | ||
| Contributors: | ||
| Red Hat Incorporated - initial implementation | ||
| --> | ||
| <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <parent> | ||
| <groupId>org.python.pydev</groupId> | ||
| <artifactId>features</artifactId> | ||
| <version>9.3.3-SNAPSHOT</version> | ||
| <relativePath>../pom.xml</relativePath> | ||
| </parent> | ||
| <groupId>org.python.pydev</groupId> | ||
| <artifactId>org.python.pydev.mylyn.feature</artifactId> | ||
| <version>0.6.0</version> | ||
| <packaging>eclipse-feature</packaging> | ||
| </project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,71 +1,71 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| Copyright (C) 2013, Red Hat, Inc. and others | ||
| All rights reserved. This program and the accompanying materials | ||
| are made available under the terms of the Eclipse Public License v1.0 | ||
| which accompanies this distribution, and is available at | ||
| http://www.eclipse.org/legal/epl-v10.html | ||
| Contributors: | ||
| Red Hat Incorporated - initial implementation | ||
| --> | ||
|
|
||
| <project xmlns="http://maven.apache.org/POM/4.0.0" | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
|
|
||
| <parent> | ||
| <groupId>org.python.pydev</groupId> | ||
| <artifactId>features</artifactId> | ||
| <version>9.3.2-SNAPSHOT</version> | ||
| <relativePath>../pom.xml</relativePath> | ||
| </parent> | ||
|
|
||
| <artifactId>org.python.pydev.p2-repo</artifactId> | ||
| <packaging>eclipse-repository</packaging> | ||
| <name>Pydev p2 Repository</name> | ||
|
|
||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.eclipse.tycho.extras</groupId> | ||
| <artifactId>tycho-eclipserun-plugin</artifactId> | ||
| <version>${tycho-version}</version> | ||
| <configuration> | ||
| <appArgLine>-consoleLog -application org.eclipse.equinox.p2.repository.repo2runnable -source file:${basedir}/target/repository/ -destination ${basedir}/target/runnable/</appArgLine> | ||
| <dependencies> | ||
| <dependency> | ||
| <artifactId>org.eclipse.equinox.p2.core.feature</artifactId> | ||
| <type>eclipse-feature</type> | ||
| </dependency> | ||
| <dependency> | ||
| <artifactId>org.eclipse.equinox.p2.discovery.feature</artifactId> | ||
| <type>eclipse-feature</type> | ||
| </dependency> | ||
| <dependency> | ||
| <artifactId>org.eclipse.equinox.p2.extras.feature</artifactId> | ||
| <type>eclipse-feature</type> | ||
| </dependency> | ||
| </dependencies> | ||
| <repositories> | ||
| <repository> | ||
| <id>${repository.id}</id> | ||
| <layout>p2</layout> | ||
| <url>${repository.url}</url> | ||
| </repository> | ||
| </repositories> | ||
| </configuration> | ||
| <executions> | ||
| <execution> | ||
| <goals> | ||
| <goal>eclipse-run</goal> | ||
| </goals> | ||
| <phase>package</phase> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| </project> | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| Copyright (C) 2013, Red Hat, Inc. and others | ||
| All rights reserved. This program and the accompanying materials | ||
| are made available under the terms of the Eclipse Public License v1.0 | ||
| which accompanies this distribution, and is available at | ||
| http://www.eclipse.org/legal/epl-v10.html | ||
| Contributors: | ||
| Red Hat Incorporated - initial implementation | ||
| --> | ||
|
|
||
| <project xmlns="http://maven.apache.org/POM/4.0.0" | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
|
|
||
| <parent> | ||
| <groupId>org.python.pydev</groupId> | ||
| <artifactId>features</artifactId> | ||
| <version>9.3.3-SNAPSHOT</version> | ||
| <relativePath>../pom.xml</relativePath> | ||
| </parent> | ||
|
|
||
| <artifactId>org.python.pydev.p2-repo</artifactId> | ||
| <packaging>eclipse-repository</packaging> | ||
| <name>Pydev p2 Repository</name> | ||
|
|
||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.eclipse.tycho.extras</groupId> | ||
| <artifactId>tycho-eclipserun-plugin</artifactId> | ||
| <version>${tycho-version}</version> | ||
| <configuration> | ||
| <appArgLine>-consoleLog -application org.eclipse.equinox.p2.repository.repo2runnable -source file:${basedir}/target/repository/ -destination ${basedir}/target/runnable/</appArgLine> | ||
| <dependencies> | ||
| <dependency> | ||
| <artifactId>org.eclipse.equinox.p2.core.feature</artifactId> | ||
| <type>eclipse-feature</type> | ||
| </dependency> | ||
| <dependency> | ||
| <artifactId>org.eclipse.equinox.p2.discovery.feature</artifactId> | ||
| <type>eclipse-feature</type> | ||
| </dependency> | ||
| <dependency> | ||
| <artifactId>org.eclipse.equinox.p2.extras.feature</artifactId> | ||
| <type>eclipse-feature</type> | ||
| </dependency> | ||
| </dependencies> | ||
| <repositories> | ||
| <repository> | ||
| <id>${repository.id}</id> | ||
| <layout>p2</layout> | ||
| <url>${repository.url}</url> | ||
| </repository> | ||
| </repositories> | ||
| </configuration> | ||
| <executions> | ||
| <execution> | ||
| <goals> | ||
| <goal>eclipse-run</goal> | ||
| </goals> | ||
| <phase>package</phase> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| </project> |
Oops, something went wrong.