update build to Eclipse Tycho 0.16
Signed-off-by: Florian Thienel <florian@thienel.org>
diff --git a/org.eclipse.vex.core.tests/.classpath b/org.eclipse.vex.core.tests/.classpath
index 2d1a430..a955886 100644
--- a/org.eclipse.vex.core.tests/.classpath
+++ b/org.eclipse.vex.core.tests/.classpath
@@ -2,6 +2,6 @@
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="src" path="src/"/>
+ <classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/org.eclipse.vex.core.tests/.gitignore b/org.eclipse.vex.core.tests/.gitignore
index fe07c27..193255b 100644
--- a/org.eclipse.vex.core.tests/.gitignore
+++ b/org.eclipse.vex.core.tests/.gitignore
@@ -1,2 +1,2 @@
bin
-/target
+target
diff --git a/org.eclipse.vex.core.tests/.project b/org.eclipse.vex.core.tests/.project
index 91dc4f9..6720abe 100644
--- a/org.eclipse.vex.core.tests/.project
+++ b/org.eclipse.vex.core.tests/.project
@@ -20,8 +20,14 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
diff --git a/org.eclipse.vex.core.tests/.settings/org.eclipse.core.resources.prefs b/org.eclipse.vex.core.tests/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..3d916f2
--- /dev/null
+++ b/org.eclipse.vex.core.tests/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=Cp1252
diff --git a/org.eclipse.vex.core.tests/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.vex.core.tests/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..14b697b
--- /dev/null
+++ b/org.eclipse.vex.core.tests/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.vex.core.tests/pom.xml b/org.eclipse.vex.core.tests/pom.xml
index 0de55c2..c19ceff 100644
--- a/org.eclipse.vex.core.tests/pom.xml
+++ b/org.eclipse.vex.core.tests/pom.xml
@@ -4,7 +4,6 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>org.eclipse.vex.core.tests</artifactId>
<packaging>eclipse-test-plugin</packaging>
- <version>1.1.0-SNAPSHOT</version>
<name>Vex Core Tests</name>
<parent>
@@ -14,41 +13,4 @@
<relativePath>../org.eclipse.vex.releng/pom.xml</relativePath>
</parent>
- <build>
- <plugins>
- <plugin>
- <groupId>org.sonatype.tycho</groupId>
- <artifactId>maven-osgi-test-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <useUIHarness>true</useUIHarness>
- <testSuite>org.eclipse.vex.core.tests</testSuite>
- <testClass>org.eclipse.vex.core.tests.VEXCoreTestSuite</testClass>
- <dependencies>
- <dependency>
- <type>p2-installable-unit</type>
- <artifactId>org.eclipse.sdk.ide</artifactId>
- <version>0.0.0</version>
- </dependency>
- <dependency>
- <type>p2-installable-unit</type>
- <artifactId>org.eclipse.wst.xml.ui</artifactId>
- <version>0.0.0</version>
- </dependency>
- <dependency>
- <type>p2-installable-unit</type>
- <artifactId>org.eclipse.wst.xsd.ui</artifactId>
- <version>0.0.0</version>
- </dependency>
- <dependency>
- <type>p2-installable-unit</type>
- <artifactId>org.eclipse.wst.dtd.ui</artifactId>
- <version>0.0.0</version>
- </dependency>
- </dependencies>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/org.eclipse.vex.core/.classpath b/org.eclipse.vex.core/.classpath
index 2d1a430..a955886 100644
--- a/org.eclipse.vex.core/.classpath
+++ b/org.eclipse.vex.core/.classpath
@@ -2,6 +2,6 @@
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="src" path="src/"/>
+ <classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/org.eclipse.vex.core/.gitignore b/org.eclipse.vex.core/.gitignore
index fe07c27..193255b 100644
--- a/org.eclipse.vex.core/.gitignore
+++ b/org.eclipse.vex.core/.gitignore
@@ -1,2 +1,2 @@
bin
-/target
+target
diff --git a/org.eclipse.vex.core/.project b/org.eclipse.vex.core/.project
index a841134..60a39a3 100644
--- a/org.eclipse.vex.core/.project
+++ b/org.eclipse.vex.core/.project
@@ -20,8 +20,14 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
diff --git a/org.eclipse.vex.core/.settings/org.eclipse.core.resources.prefs b/org.eclipse.vex.core/.settings/org.eclipse.core.resources.prefs
index 3a4d5b4..3d916f2 100644
--- a/org.eclipse.vex.core/.settings/org.eclipse.core.resources.prefs
+++ b/org.eclipse.vex.core/.settings/org.eclipse.core.resources.prefs
@@ -1,3 +1,2 @@
-#Fri Feb 25 19:52:05 CET 2011
eclipse.preferences.version=1
-encoding/<project>=UTF-8
+encoding/<project>=Cp1252
diff --git a/org.eclipse.vex.core/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.vex.core/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..14b697b
--- /dev/null
+++ b/org.eclipse.vex.core/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.vex.core/build.properties b/org.eclipse.vex.core/build.properties
index e84a2f7..c9b94a1 100644
--- a/org.eclipse.vex.core/build.properties
+++ b/org.eclipse.vex.core/build.properties
@@ -1,10 +1,5 @@
+source.. = src/
+output.. = bin/
bin.includes = plugin.properties,\
META-INF/,\
- .,\
- lib/
-src.includes = lib/
-source.. = src/
-der = .
-bin.excludes = lib/.cvsignore
-src.excludes = lib/.cvsignore
-output.. = bin/
+ .
diff --git a/org.eclipse.vex.core/pom.xml b/org.eclipse.vex.core/pom.xml
index d341ff2..95b671c 100644
--- a/org.eclipse.vex.core/pom.xml
+++ b/org.eclipse.vex.core/pom.xml
@@ -4,7 +4,6 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>org.eclipse.vex.core</artifactId>
<packaging>eclipse-plugin</packaging>
- <version>1.1.0-SNAPSHOT</version>
<name>Vex Core</name>
<parent>
@@ -14,43 +13,4 @@
<relativePath>../org.eclipse.vex.releng/pom.xml</relativePath>
</parent>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <findbugsXmlOutput>true</findbugsXmlOutput>
- <failOnError>false</failOnError>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <configuration>
- <sourceEncoding>utf-8</sourceEncoding>
- <minimumTokens>100</minimumTokens>
- <targetJdk>1.5</targetJdk>
- <format>xml</format>
- <failOnViolation>false</failOnViolation>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>cpd-check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/org.eclipse.vex.dita/.classpath b/org.eclipse.vex.dita/.classpath
index c835067..7145989 100644
--- a/org.eclipse.vex.dita/.classpath
+++ b/org.eclipse.vex.dita/.classpath
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src_does_not_exist/"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/org.eclipse.vex.dita/.gitignore b/org.eclipse.vex.dita/.gitignore
index ea8c4bf..6dff79c 100644
--- a/org.eclipse.vex.dita/.gitignore
+++ b/org.eclipse.vex.dita/.gitignore
@@ -1 +1,3 @@
-/target
+target
+
+src_does_not_exist
diff --git a/org.eclipse.vex.dita/.project b/org.eclipse.vex.dita/.project
index 970918c..b5fb921 100644
--- a/org.eclipse.vex.dita/.project
+++ b/org.eclipse.vex.dita/.project
@@ -6,6 +6,11 @@
</projects>
<buildSpec>
<buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
@@ -15,8 +20,15 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
diff --git a/org.eclipse.vex.dita/.settings/org.eclipse.core.resources.prefs b/org.eclipse.vex.dita/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..3d916f2
--- /dev/null
+++ b/org.eclipse.vex.dita/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=Cp1252
diff --git a/org.eclipse.vex.dita/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.vex.dita/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..14b697b
--- /dev/null
+++ b/org.eclipse.vex.dita/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.vex.dita/build.properties b/org.eclipse.vex.dita/build.properties
index e6870c0..8fc433c 100644
--- a/org.eclipse.vex.dita/build.properties
+++ b/org.eclipse.vex.dita/build.properties
@@ -1,7 +1,7 @@
+source.. = src_does_not_exist/
bin.includes = plugin.xml,\
dita11/,\
plugin.properties,\
META-INF/,\
css/,\
dita11/
-source.. = src_does_not_exist/
diff --git a/org.eclipse.vex.dita/pom.xml b/org.eclipse.vex.dita/pom.xml
index 6c3904f..fc88c45 100644
--- a/org.eclipse.vex.dita/pom.xml
+++ b/org.eclipse.vex.dita/pom.xml
@@ -4,7 +4,6 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>org.eclipse.vex.dita</artifactId>
<packaging>eclipse-plugin</packaging>
- <version>1.1.0-SNAPSHOT</version>
<name>Vex DITA Support</name>
<parent>
@@ -14,43 +13,4 @@
<relativePath>../org.eclipse.vex.releng/pom.xml</relativePath>
</parent>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <findbugsXmlOutput>true</findbugsXmlOutput>
- <failOnError>false</failOnError>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <configuration>
- <sourceEncoding>utf-8</sourceEncoding>
- <minimumTokens>100</minimumTokens>
- <targetJdk>1.5</targetJdk>
- <format>xml</format>
- <failOnViolation>false</failOnViolation>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>cpd-check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/org.eclipse.vex.docbook/.classpath b/org.eclipse.vex.docbook/.classpath
index 472ee29..a955886 100644
--- a/org.eclipse.vex.docbook/.classpath
+++ b/org.eclipse.vex.docbook/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src/"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/org.eclipse.vex.docbook/.gitignore b/org.eclipse.vex.docbook/.gitignore
index fe07c27..193255b 100644
--- a/org.eclipse.vex.docbook/.gitignore
+++ b/org.eclipse.vex.docbook/.gitignore
@@ -1,2 +1,2 @@
bin
-/target
+target
diff --git a/org.eclipse.vex.docbook/.project b/org.eclipse.vex.docbook/.project
index e95555b..eb3e72d 100644
--- a/org.eclipse.vex.docbook/.project
+++ b/org.eclipse.vex.docbook/.project
@@ -20,8 +20,14 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
diff --git a/org.eclipse.vex.docbook/.settings/org.eclipse.core.resources.prefs b/org.eclipse.vex.docbook/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..3d916f2
--- /dev/null
+++ b/org.eclipse.vex.docbook/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=Cp1252
diff --git a/org.eclipse.vex.docbook/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.vex.docbook/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..14b697b
--- /dev/null
+++ b/org.eclipse.vex.docbook/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.vex.docbook/build.properties b/org.eclipse.vex.docbook/build.properties
index 17df738..2565473 100644
--- a/org.eclipse.vex.docbook/build.properties
+++ b/org.eclipse.vex.docbook/build.properties
@@ -5,9 +5,9 @@
META-INF/,\
4.5/,\
5.0/
-
src.includes = styles/,\
- 4.5/
+ 4.5/,\
+ 5.0/
source.. = src/
jars.compile.order = .
diff --git a/org.eclipse.vex.docbook/pom.xml b/org.eclipse.vex.docbook/pom.xml
index 5f67c7a..adf15b5 100644
--- a/org.eclipse.vex.docbook/pom.xml
+++ b/org.eclipse.vex.docbook/pom.xml
@@ -4,7 +4,6 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>org.eclipse.vex.docbook</artifactId>
<packaging>eclipse-plugin</packaging>
- <version>1.1.0-SNAPSHOT</version>
<name>Vex DocBook Support</name>
<parent>
@@ -14,43 +13,4 @@
<relativePath>../org.eclipse.vex.releng/pom.xml</relativePath>
</parent>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <findbugsXmlOutput>true</findbugsXmlOutput>
- <failOnError>false</failOnError>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <configuration>
- <sourceEncoding>utf-8</sourceEncoding>
- <minimumTokens>100</minimumTokens>
- <targetJdk>1.5</targetJdk>
- <format>xml</format>
- <failOnViolation>false</failOnViolation>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>cpd-check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/org.eclipse.vex.documentation/.classpath b/org.eclipse.vex.documentation/.classpath
new file mode 100644
index 0000000..d51d279
--- /dev/null
+++ b/org.eclipse.vex.documentation/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src_does_not_exist/"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/org.eclipse.vex.documentation/.gitignore b/org.eclipse.vex.documentation/.gitignore
index 9095d63..66b0fca 100644
--- a/org.eclipse.vex.documentation/.gitignore
+++ b/org.eclipse.vex.documentation/.gitignore
@@ -1,2 +1,4 @@
-/help
-/target
+help
+
+target
+/src_does_not_exist
diff --git a/org.eclipse.vex.documentation/.project b/org.eclipse.vex.documentation/.project
index 14b1280..143cf7f 100644
--- a/org.eclipse.vex.documentation/.project
+++ b/org.eclipse.vex.documentation/.project
@@ -6,6 +6,11 @@
</projects>
<buildSpec>
<buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
@@ -15,8 +20,15 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
diff --git a/org.eclipse.vex.documentation/.settings/org.eclipse.core.resources.prefs b/org.eclipse.vex.documentation/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..3d916f2
--- /dev/null
+++ b/org.eclipse.vex.documentation/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=Cp1252
diff --git a/org.eclipse.vex.documentation/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.vex.documentation/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..14b697b
--- /dev/null
+++ b/org.eclipse.vex.documentation/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.vex.documentation/pom.xml b/org.eclipse.vex.documentation/pom.xml
index 08981b0..d841fcc 100644
--- a/org.eclipse.vex.documentation/pom.xml
+++ b/org.eclipse.vex.documentation/pom.xml
@@ -4,7 +4,6 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>org.eclipse.vex.documentation</artifactId>
<packaging>eclipse-plugin</packaging>
- <version>1.1.0-SNAPSHOT</version>
<name>Vex Documentation</name>
<parent>
@@ -15,32 +14,23 @@
</parent>
<build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.4</version>
- </plugin>
- </plugins>
- </pluginManagement>
-
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>1.7</version>
<executions>
<execution>
<id>mylyn-wiki-text</id>
<phase>generate-sources</phase>
- <goals>
- <goal>run</goal>
- </goals>
<configuration>
<tasks>
<ant antfile="buildHelp.xml" inheritRefs="true" />
</tasks>
</configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
</execution>
</executions>
</plugin>
diff --git a/org.eclipse.vex.feature/.gitignore b/org.eclipse.vex.feature/.gitignore
index ea8c4bf..eb5a316 100644
--- a/org.eclipse.vex.feature/.gitignore
+++ b/org.eclipse.vex.feature/.gitignore
@@ -1 +1 @@
-/target
+target
diff --git a/org.eclipse.vex.feature/.project b/org.eclipse.vex.feature/.project
index d5d8948..54a4e01 100644
--- a/org.eclipse.vex.feature/.project
+++ b/org.eclipse.vex.feature/.project
@@ -10,8 +10,14 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.FeatureNature</nature>
</natures>
</projectDescription>
diff --git a/org.eclipse.vex.feature/.settings/org.eclipse.core.resources.prefs b/org.eclipse.vex.feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..3d916f2
--- /dev/null
+++ b/org.eclipse.vex.feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=Cp1252
diff --git a/org.eclipse.vex.feature/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.vex.feature/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..14b697b
--- /dev/null
+++ b/org.eclipse.vex.feature/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.vex.feature/build.properties b/org.eclipse.vex.feature/build.properties
index c47d205..7faaac8 100644
--- a/org.eclipse.vex.feature/build.properties
+++ b/org.eclipse.vex.feature/build.properties
@@ -1,11 +1,8 @@
bin.includes = feature.xml,\
- lgpl.txt,\
feature.properties,\
- feature_fr.properties,\
license.html,\
epl-v10.html
-src.includes = lgpl.txt,\
- feature.xml,\
+src.includes = feature.xml,\
feature.properties,\
epl-v10.html,\
license.html
diff --git a/org.eclipse.vex.feature/pom.xml b/org.eclipse.vex.feature/pom.xml
index c83fb74..2df6f6d 100644
--- a/org.eclipse.vex.feature/pom.xml
+++ b/org.eclipse.vex.feature/pom.xml
@@ -4,7 +4,6 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>org.eclipse.vex.feature</artifactId>
<packaging>eclipse-feature</packaging>
- <version>1.1.0-SNAPSHOT</version>
<name>Vex Feature</name>
<parent>
diff --git a/org.eclipse.vex.projectplan/.classpath b/org.eclipse.vex.projectplan/.classpath
new file mode 100644
index 0000000..a955886
--- /dev/null
+++ b/org.eclipse.vex.projectplan/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src/"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/org.eclipse.vex.projectplan/.project b/org.eclipse.vex.projectplan/.project
index 0fd3034..fa707da 100644
--- a/org.eclipse.vex.projectplan/.project
+++ b/org.eclipse.vex.projectplan/.project
@@ -6,6 +6,11 @@
</projects>
<buildSpec>
<buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
@@ -15,8 +20,15 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
diff --git a/org.eclipse.vex.projectplan/.settings/org.eclipse.core.resources.prefs b/org.eclipse.vex.projectplan/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..3d916f2
--- /dev/null
+++ b/org.eclipse.vex.projectplan/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=Cp1252
diff --git a/org.eclipse.vex.projectplan/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.vex.projectplan/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..44217f8
--- /dev/null
+++ b/org.eclipse.vex.projectplan/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/org.eclipse.vex.projectplan/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.vex.projectplan/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..14b697b
--- /dev/null
+++ b/org.eclipse.vex.projectplan/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.vex.projectplan/pom.xml b/org.eclipse.vex.projectplan/pom.xml
index 1c4ea8b..b55d5f6 100644
--- a/org.eclipse.vex.projectplan/pom.xml
+++ b/org.eclipse.vex.projectplan/pom.xml
@@ -4,7 +4,6 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>org.eclipse.vex.projectplan</artifactId>
<packaging>eclipse-plugin</packaging>
- <version>1.1.0-SNAPSHOT</version>
<name>The Eclipse Project Plan Plug-in</name>
<parent>
@@ -14,43 +13,4 @@
<relativePath>../org.eclipse.vex.releng/pom.xml</relativePath>
</parent>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <findbugsXmlOutput>true</findbugsXmlOutput>
- <failOnError>false</failOnError>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <configuration>
- <sourceEncoding>utf-8</sourceEncoding>
- <minimumTokens>100</minimumTokens>
- <targetJdk>1.5</targetJdk>
- <format>xml</format>
- <failOnViolation>false</failOnViolation>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>cpd-check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/org.eclipse.vex.releng/.project b/org.eclipse.vex.releng/.project
index c83f1c0..2d6bc85 100644
--- a/org.eclipse.vex.releng/.project
+++ b/org.eclipse.vex.releng/.project
@@ -5,7 +5,13 @@
<projects>
</projects>
<buildSpec>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
</projectDescription>
diff --git a/org.eclipse.vex.releng/.settings/org.eclipse.core.resources.prefs b/org.eclipse.vex.releng/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..3d916f2
--- /dev/null
+++ b/org.eclipse.vex.releng/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=Cp1252
diff --git a/org.eclipse.vex.releng/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.vex.releng/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..14b697b
--- /dev/null
+++ b/org.eclipse.vex.releng/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.vex.releng/pom.xml b/org.eclipse.vex.releng/pom.xml
index 2576ae8..c264ced 100644
--- a/org.eclipse.vex.releng/pom.xml
+++ b/org.eclipse.vex.releng/pom.xml
@@ -8,25 +8,69 @@
<version>1.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <parent>
- <artifactId>org.eclipse.vex-parent</artifactId>
- <groupId>org.eclipse.vex</groupId>
- <version>1.1.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <pluginRepositories>
- <pluginRepository>
- <id>snapshots</id>
- <url>http://snapshots.repository.codehaus.org/</url>
- <releases><enabled>false</enabled></releases>
- </pluginRepository>
- </pluginRepositories>
-
<properties>
- <tycho-version>0.10.0</tycho-version>
+ <tycho-version>0.16.0</tycho-version>
+ <project.build.sourceEncoding>Cp1252</project.build.sourceEncoding>
</properties>
+ <repositories>
+ <repository>
+ <id>indigo</id>
+ <url>http://download.eclipse.org/releases/indigo/</url>
+ <layout>p2</layout>
+ </repository>
+ <repository>
+ <id>orbit</id>
+ <url>http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository</url>
+ <layout>p2</layout>
+ </repository>
+ <!--
+ <repository>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <id>vex-milestones</id>
+ <url>http://download.eclipse.org/vex/milestones</url>
+ <layout>default</layout>
+ </repository>
+ <repository>
+ <id>vex-releases</id>
+ <url>http://download.eclipse.org/vex/releases</url>
+ <layout>default</layout>
+ </repository>
+ -->
+ </repositories>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-maven-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <extensions>true</extensions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <environments>
+ <environment>
+ <os>win32</os>
+ <ws>win32</ws>
+ <arch>x86</arch>
+ </environment>
+ </environments>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-versions-plugin</artifactId>
+ <version>${tycho-version}</version>
+ </plugin>
+ </plugins>
+ </build>
+
<modules>
<module>../org.eclipse.vex</module>
<module>../org.eclipse.vex.core</module>
@@ -43,84 +87,20 @@
<module>../org.eclipse.vex.ui.tests</module>
</modules>
- <build>
- <plugins>
- <plugin>
- <groupId>org.sonatype.tycho</groupId>
- <artifactId>tycho-maven-plugin</artifactId>
- <version>${tycho-version}</version>
- <extensions>true</extensions>
- </plugin>
- <plugin>
- <groupId>org.sonatype.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <resolver>p2</resolver>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.sonatype.tycho</groupId>
- <artifactId>maven-osgi-source-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <encoding>UTF-8</encoding>
- </configuration>
- <executions>
- <execution>
- <id>attach-source</id>
- <goals>
- <goal>plugin-source</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.sonatype.tycho</groupId>
- <artifactId>maven-osgi-compiler-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <encoding>UTF-8</encoding>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.sonatype.tycho</groupId>
- <artifactId>maven-osgi-packaging-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <archiveSite>true</archiveSite>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.4.1</version>
- <configuration>
- <encoding>UTF-8</encoding>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>2.5</version>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- <repositories>
- <repository>
- <id>indigo</id>
- <url>http://download.eclipse.org/releases/indigo/</url>
- <layout>p2</layout>
- </repository>
- <repository>
- <id>orbit</id>
- <url>http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository</url>
- <layout>p2</layout>
- </repository>
- </repositories>
+ <mailingLists>
+ <mailingList>
+ <name>Vex Mailing List</name>
+ <post>mylyn-vex-dev@eclipse.org</post>
+ <subscribe>https://dev.eclipse.org/mailman/listinfo/mylyn-vex-dev</subscribe>
+ <unsubscribe>https://dev.eclipse.org/mailman/listinfo/mylyn-vex-dev</unsubscribe>
+ <archive>http://dev.eclipse.org/mhonarc/lists/mylyn-vex-dev</archive>
+ </mailingList>
+ </mailingLists>
+ <issueManagement>
+ <url>https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced;classification=Mylyn;product=Mylyn%20Docs%20Vex</url>
+ <system>Bugzilla</system>
+ </issueManagement>
+
+ <name>Vex Releng</name>
</project>
diff --git a/org.eclipse.vex.repository/.gitignore b/org.eclipse.vex.repository/.gitignore
index ea8c4bf..eb5a316 100644
--- a/org.eclipse.vex.repository/.gitignore
+++ b/org.eclipse.vex.repository/.gitignore
@@ -1 +1 @@
-/target
+target
diff --git a/org.eclipse.vex.repository/.project b/org.eclipse.vex.repository/.project
index 342cecb..d1f2188 100644
--- a/org.eclipse.vex.repository/.project
+++ b/org.eclipse.vex.repository/.project
@@ -10,8 +10,14 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.UpdateSiteNature</nature>
</natures>
</projectDescription>
diff --git a/org.eclipse.vex.repository/.settings/org.eclipse.core.resources.prefs b/org.eclipse.vex.repository/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..3d916f2
--- /dev/null
+++ b/org.eclipse.vex.repository/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=Cp1252
diff --git a/org.eclipse.vex.repository/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.vex.repository/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..14b697b
--- /dev/null
+++ b/org.eclipse.vex.repository/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.vex.repository/site.xml b/org.eclipse.vex.repository/category.xml
similarity index 100%
rename from org.eclipse.vex.repository/site.xml
rename to org.eclipse.vex.repository/category.xml
diff --git a/org.eclipse.vex.repository/pom.xml b/org.eclipse.vex.repository/pom.xml
index cba3ea2..93d95f0 100644
--- a/org.eclipse.vex.repository/pom.xml
+++ b/org.eclipse.vex.repository/pom.xml
@@ -2,10 +2,9 @@
<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>
- <groupId>org.eclipse.vex</groupId>
- <artifactId>org.eclipse.vex.repository</artifactId>
- <packaging>eclipse-update-site</packaging>
- <name>Vex Update Site</name>
+ <artifactId>org.eclipse.vex.repository</artifactId>
+ <packaging>eclipse-repository</packaging>
+ <name>Vex Update Site</name>
<parent>
<artifactId>org.eclipse.vex-releng</artifactId>
diff --git a/org.eclipse.vex.sdk.feature/.gitignore b/org.eclipse.vex.sdk.feature/.gitignore
index ea8c4bf..eb5a316 100644
--- a/org.eclipse.vex.sdk.feature/.gitignore
+++ b/org.eclipse.vex.sdk.feature/.gitignore
@@ -1 +1 @@
-/target
+target
diff --git a/org.eclipse.vex.sdk.feature/.project b/org.eclipse.vex.sdk.feature/.project
index b366899..dfd7735 100644
--- a/org.eclipse.vex.sdk.feature/.project
+++ b/org.eclipse.vex.sdk.feature/.project
@@ -10,8 +10,14 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.FeatureNature</nature>
</natures>
</projectDescription>
diff --git a/org.eclipse.vex.sdk.feature/.settings/org.eclipse.core.resources.prefs b/org.eclipse.vex.sdk.feature/.settings/org.eclipse.core.resources.prefs
index 3750df1..3d916f2 100644
--- a/org.eclipse.vex.sdk.feature/.settings/org.eclipse.core.resources.prefs
+++ b/org.eclipse.vex.sdk.feature/.settings/org.eclipse.core.resources.prefs
@@ -1,3 +1,2 @@
-#Sun Dec 16 16:57:57 EST 2007
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
+eclipse.preferences.version=1
+encoding/<project>=Cp1252
diff --git a/org.eclipse.vex.sdk.feature/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.vex.sdk.feature/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..14b697b
--- /dev/null
+++ b/org.eclipse.vex.sdk.feature/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.vex.sdk.feature/pom.xml b/org.eclipse.vex.sdk.feature/pom.xml
index 5aede7e..a7d5bbd 100644
--- a/org.eclipse.vex.sdk.feature/pom.xml
+++ b/org.eclipse.vex.sdk.feature/pom.xml
@@ -4,7 +4,6 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>org.eclipse.vex.sdk.feature</artifactId>
<packaging>eclipse-feature</packaging>
- <version>1.1.0-SNAPSHOT</version>
<name>Vex SDK Feature</name>
<parent>
diff --git a/org.eclipse.vex.ui.tests/.classpath b/org.eclipse.vex.ui.tests/.classpath
index 64c5e31..a955886 100644
--- a/org.eclipse.vex.ui.tests/.classpath
+++ b/org.eclipse.vex.ui.tests/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src/"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/org.eclipse.vex.ui.tests/.gitignore b/org.eclipse.vex.ui.tests/.gitignore
index fe07c27..193255b 100644
--- a/org.eclipse.vex.ui.tests/.gitignore
+++ b/org.eclipse.vex.ui.tests/.gitignore
@@ -1,2 +1,2 @@
bin
-/target
+target
diff --git a/org.eclipse.vex.ui.tests/.project b/org.eclipse.vex.ui.tests/.project
index 79b35ee..3f7f071 100644
--- a/org.eclipse.vex.ui.tests/.project
+++ b/org.eclipse.vex.ui.tests/.project
@@ -20,8 +20,14 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
diff --git a/org.eclipse.vex.ui.tests/.settings/org.eclipse.core.resources.prefs b/org.eclipse.vex.ui.tests/.settings/org.eclipse.core.resources.prefs
index 9241652..3d916f2 100644
--- a/org.eclipse.vex.ui.tests/.settings/org.eclipse.core.resources.prefs
+++ b/org.eclipse.vex.ui.tests/.settings/org.eclipse.core.resources.prefs
@@ -1,3 +1,2 @@
-#Sun Nov 01 00:52:51 GMT 2009
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
+eclipse.preferences.version=1
+encoding/<project>=Cp1252
diff --git a/org.eclipse.vex.ui.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.vex.ui.tests/.settings/org.eclipse.jdt.core.prefs
index e32a8bc..656ddb2 100644
--- a/org.eclipse.vex.ui.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.vex.ui.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,5 @@
eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
org.eclipse.jdt.core.compiler.compliance=1.5
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
diff --git a/org.eclipse.vex.ui.tests/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.vex.ui.tests/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..14b697b
--- /dev/null
+++ b/org.eclipse.vex.ui.tests/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.vex.ui.tests/pom.xml b/org.eclipse.vex.ui.tests/pom.xml
index d25de66..59bb2d2 100644
--- a/org.eclipse.vex.ui.tests/pom.xml
+++ b/org.eclipse.vex.ui.tests/pom.xml
@@ -4,7 +4,6 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>org.eclipse.vex.ui.tests</artifactId>
<packaging>eclipse-test-plugin</packaging>
- <version>1.1.0-SNAPSHOT</version>
<name>Vex UI Tests</name>
<parent>
@@ -14,19 +13,4 @@
<relativePath>../org.eclipse.vex.releng/pom.xml</relativePath>
</parent>
- <build>
- <plugins>
- <plugin>
- <groupId>org.sonatype.tycho</groupId>
- <artifactId>maven-osgi-test-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <useUIHarness>true</useUIHarness>
- <testSuite>org.eclipse.vex.ui.tests</testSuite>
- <testClass>org.eclipse.vex.ui.tests.VexUiTestSuite</testClass>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/org.eclipse.vex.ui/.classpath b/org.eclipse.vex.ui/.classpath
index 472ee29..a955886 100644
--- a/org.eclipse.vex.ui/.classpath
+++ b/org.eclipse.vex.ui/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src/"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/org.eclipse.vex.ui/.gitignore b/org.eclipse.vex.ui/.gitignore
index fe07c27..193255b 100644
--- a/org.eclipse.vex.ui/.gitignore
+++ b/org.eclipse.vex.ui/.gitignore
@@ -1,2 +1,2 @@
bin
-/target
+target
diff --git a/org.eclipse.vex.ui/.project b/org.eclipse.vex.ui/.project
index bacac73..adce898 100644
--- a/org.eclipse.vex.ui/.project
+++ b/org.eclipse.vex.ui/.project
@@ -20,8 +20,14 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
diff --git a/org.eclipse.vex.ui/.settings/org.eclipse.core.resources.prefs b/org.eclipse.vex.ui/.settings/org.eclipse.core.resources.prefs
index 25c8a24..3d916f2 100644
--- a/org.eclipse.vex.ui/.settings/org.eclipse.core.resources.prefs
+++ b/org.eclipse.vex.ui/.settings/org.eclipse.core.resources.prefs
@@ -1,3 +1,2 @@
-#Sun Nov 01 00:52:35 GMT 2009
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
+eclipse.preferences.version=1
+encoding/<project>=Cp1252
diff --git a/org.eclipse.vex.ui/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.vex.ui/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..14b697b
--- /dev/null
+++ b/org.eclipse.vex.ui/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.vex.ui/build.properties b/org.eclipse.vex.ui/build.properties
index ef23051..1f3a122 100644
--- a/org.eclipse.vex.ui/build.properties
+++ b/org.eclipse.vex.ui/build.properties
@@ -1,5 +1,4 @@
bin.includes = plugin.xml,\
- *.gif,\
.,\
plugin_fr.properties,\
plugin.properties,\
diff --git a/org.eclipse.vex.ui/pom.xml b/org.eclipse.vex.ui/pom.xml
index fe93ebf..25bd70a 100644
--- a/org.eclipse.vex.ui/pom.xml
+++ b/org.eclipse.vex.ui/pom.xml
@@ -4,7 +4,6 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>org.eclipse.vex.ui</artifactId>
<packaging>eclipse-plugin</packaging>
- <version>1.1.0-SNAPSHOT</version>
<name>Vex UI</name>
<parent>
@@ -14,43 +13,4 @@
<relativePath>../org.eclipse.vex.releng/pom.xml</relativePath>
</parent>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <findbugsXmlOutput>true</findbugsXmlOutput>
- <failOnError>false</failOnError>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <configuration>
- <sourceEncoding>utf-8</sourceEncoding>
- <minimumTokens>100</minimumTokens>
- <targetJdk>1.5</targetJdk>
- <format>xml</format>
- <failOnViolation>false</failOnViolation>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>cpd-check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/org.eclipse.vex.xhtml/.classpath b/org.eclipse.vex.xhtml/.classpath
index 472ee29..a955886 100644
--- a/org.eclipse.vex.xhtml/.classpath
+++ b/org.eclipse.vex.xhtml/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src/"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/org.eclipse.vex.xhtml/.gitignore b/org.eclipse.vex.xhtml/.gitignore
index fe07c27..193255b 100644
--- a/org.eclipse.vex.xhtml/.gitignore
+++ b/org.eclipse.vex.xhtml/.gitignore
@@ -1,2 +1,2 @@
bin
-/target
+target
diff --git a/org.eclipse.vex.xhtml/.project b/org.eclipse.vex.xhtml/.project
index b579381..d2aee3f 100644
--- a/org.eclipse.vex.xhtml/.project
+++ b/org.eclipse.vex.xhtml/.project
@@ -20,8 +20,14 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
diff --git a/org.eclipse.vex.xhtml/.settings/org.eclipse.core.resources.prefs b/org.eclipse.vex.xhtml/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..3d916f2
--- /dev/null
+++ b/org.eclipse.vex.xhtml/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=Cp1252
diff --git a/org.eclipse.vex.xhtml/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.vex.xhtml/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..14b697b
--- /dev/null
+++ b/org.eclipse.vex.xhtml/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.vex.xhtml/pom.xml b/org.eclipse.vex.xhtml/pom.xml
index 98341f0..a3e8c1f 100644
--- a/org.eclipse.vex.xhtml/pom.xml
+++ b/org.eclipse.vex.xhtml/pom.xml
@@ -4,7 +4,6 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>org.eclipse.vex.xhtml</artifactId>
<packaging>eclipse-plugin</packaging>
- <version>1.1.0-SNAPSHOT</version>
<name>Vex XHTML Support</name>
<parent>
@@ -14,43 +13,4 @@
<relativePath>../org.eclipse.vex.releng/pom.xml</relativePath>
</parent>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <findbugsXmlOutput>true</findbugsXmlOutput>
- <failOnError>false</failOnError>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <configuration>
- <sourceEncoding>utf-8</sourceEncoding>
- <minimumTokens>100</minimumTokens>
- <targetJdk>1.5</targetJdk>
- <format>xml</format>
- <failOnViolation>false</failOnViolation>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>cpd-check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/org.eclipse.vex/.classpath b/org.eclipse.vex/.classpath
new file mode 100644
index 0000000..d51d279
--- /dev/null
+++ b/org.eclipse.vex/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src_does_not_exist/"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/org.eclipse.vex/.gitignore b/org.eclipse.vex/.gitignore
index ea8c4bf..eb5a316 100644
--- a/org.eclipse.vex/.gitignore
+++ b/org.eclipse.vex/.gitignore
@@ -1 +1 @@
-/target
+target
diff --git a/org.eclipse.vex/.project b/org.eclipse.vex/.project
index bc7b1ce..07f2827 100644
--- a/org.eclipse.vex/.project
+++ b/org.eclipse.vex/.project
@@ -6,6 +6,11 @@
</projects>
<buildSpec>
<buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
@@ -15,8 +20,15 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
diff --git a/org.eclipse.vex/.settings/org.eclipse.core.resources.prefs b/org.eclipse.vex/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..3d916f2
--- /dev/null
+++ b/org.eclipse.vex/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=Cp1252
diff --git a/org.eclipse.vex/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.vex/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..14b697b
--- /dev/null
+++ b/org.eclipse.vex/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.vex/pom.xml b/org.eclipse.vex/pom.xml
index ec556a8..0789e26 100644
--- a/org.eclipse.vex/pom.xml
+++ b/org.eclipse.vex/pom.xml
@@ -4,7 +4,6 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>org.eclipse.vex</artifactId>
<packaging>eclipse-plugin</packaging>
- <version>1.1.0-SNAPSHOT</version>
<name>Vex Branding</name>
<parent>
diff --git a/pom.xml b/pom.xml
deleted file mode 100644
index 9de8149..0000000
--- a/pom.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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>
- <groupId>org.eclipse.vex</groupId>
- <artifactId>org.eclipse.vex-parent</artifactId>
- <version>1.1.0-SNAPSHOT</version>
- <packaging>pom</packaging>
- <mailingLists>
- <mailingList>
- <name>Vex Mailing List</name>
- <post>mylyn-vex-dev@eclipse.org</post>
- <subscribe>https://dev.eclipse.org/mailman/listinfo/mylyn-vex-dev</subscribe>
- <unsubscribe>https://dev.eclipse.org/mailman/listinfo/mylyn-vex-dev</unsubscribe>
- <archive>http://dev.eclipse.org/mhonarc/lists/mylyn-vex-dev</archive>
- </mailingList>
- </mailingLists>
- <issueManagement>
- <url>https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced;classification=Mylyn;product=Mylyn%20Docs%20Vex</url>
- <system>Bugzilla</system>
- </issueManagement>
- <repositories>
- <repository>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <id>vex-milestones</id>
- <url>http://download.eclipse.org/vex/milestones</url>
- <layout>default</layout>
- </repository>
- <repository>
- <id>vex-releases</id>
- <url>http://download.eclipse.org/vex/releases</url>
- <layout>default</layout>
- </repository>
- </repositories>
-</project>
\ No newline at end of file