Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Struckmann2015-02-09 15:36:06 +0000
committerSebastian Struckmann2015-02-09 15:45:26 +0000
commit0853d459b4bb6626bba984333a069b6edfe1d6fc (patch)
tree397d7bb9f899e5f9bc86a16862b7a405f2d7abee /org.eclipse.jubula.examples.api.adder.rcp.m2
parenta9273b93b0037338bef8d4d19c3f22d9c615ff66 (diff)
downloadorg.eclipse.jubula.core-0853d459b4bb6626bba984333a069b6edfe1d6fc.tar.gz
org.eclipse.jubula.core-0853d459b4bb6626bba984333a069b6edfe1d6fc.tar.xz
org.eclipse.jubula.core-0853d459b4bb6626bba984333a069b6edfe1d6fc.zip
Non-sprint task - Refactored maven structure for api example projects - Part 1
Still open: The resolving of version dependency ranges may not work as expected
Diffstat (limited to 'org.eclipse.jubula.examples.api.adder.rcp.m2')
-rw-r--r--org.eclipse.jubula.examples.api.adder.rcp.m2/.classpath44
-rw-r--r--org.eclipse.jubula.examples.api.adder.rcp.m2/launch/SimpleAdder JUnit Test - m2.launch38
-rw-r--r--org.eclipse.jubula.examples.api.adder.rcp.m2/pom.xml98
3 files changed, 54 insertions, 126 deletions
diff --git a/org.eclipse.jubula.examples.api.adder.rcp.m2/.classpath b/org.eclipse.jubula.examples.api.adder.rcp.m2/.classpath
index def5bd747..85a338d0e 100644
--- a/org.eclipse.jubula.examples.api.adder.rcp.m2/.classpath
+++ b/org.eclipse.jubula.examples.api.adder.rcp.m2/.classpath
@@ -1,16 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="shared/src"/>
- <classpathentry exported="true" kind="lib" path="shared/resources/"/>
- <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="shared/src"/>
+ <classpathentry exported="true" kind="lib" path="shared/resources/"/>
+ <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+ <attributes>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="src" output="target/classes" path="src/main/java">
+ <attributes>
+ <attribute name="optional" value="true"/>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java">
+ <attributes>
+ <attribute name="optional" value="true"/>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
+ <attributes>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/org.eclipse.jubula.examples.api.adder.rcp.m2/launch/SimpleAdder JUnit Test - m2.launch b/org.eclipse.jubula.examples.api.adder.rcp.m2/launch/SimpleAdder JUnit Test - m2.launch
index 524624e24..1fe2bb37e 100644
--- a/org.eclipse.jubula.examples.api.adder.rcp.m2/launch/SimpleAdder JUnit Test - m2.launch
+++ b/org.eclipse.jubula.examples.api.adder.rcp.m2/launch/SimpleAdder JUnit Test - m2.launch
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.jubula.examples.api.adder.rcp.m2/shared/src"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="2"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value="=org.eclipse.jubula.examples.api.adder.rcp.m2/shared\/src"/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.jubula.examples.api.adder.rcp.m2"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
-</launchConfiguration>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.eclipse.jubula.examples.api.adder.rcp.m2/shared/src"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="2"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value="=org.eclipse.jubula.examples.api.adder.rcp.m2/shared\/src"/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.jubula.examples.api.adder.rcp.m2"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
+</launchConfiguration>
diff --git a/org.eclipse.jubula.examples.api.adder.rcp.m2/pom.xml b/org.eclipse.jubula.examples.api.adder.rcp.m2/pom.xml
index 6bc4041db..0d9e47ea7 100644
--- a/org.eclipse.jubula.examples.api.adder.rcp.m2/pom.xml
+++ b/org.eclipse.jubula.examples.api.adder.rcp.m2/pom.xml
@@ -4,110 +4,26 @@
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>org.eclipse.jubula.releng.client</artifactId>
- <groupId>org.eclipse.jubula</groupId>
+ <artifactId>org.eclipse.jubula.examples.api</artifactId>
+ <groupId>org.eclipse.jubula.examples.api</groupId>
<version>3.0.0-SNAPSHOT</version>
- <relativePath>../org.eclipse.jubula.releng.client</relativePath>
+ <relativePath>../org.eclipse.jubula.examples.api.configuration/m2</relativePath>
</parent>
<artifactId>org.eclipse.jubula.examples.api.adder.rcp.m2</artifactId>
<packaging>jar</packaging>
- <repositories>
- <repository>
- <id>local-api-repo</id>
- <url>file://${project.build.directory}/../../org.eclipse.jubula.feature.api/m2-repo</url>
- </repository>
- </repositories>
-
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jubula</groupId>
- <artifactId>org.eclipse.jubula.client.api</artifactId>
- <version>3.0.0-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jubula</groupId>
- <artifactId>org.eclipse.jubula.client.api.commands</artifactId>
- <version>3.0.0-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jubula</groupId>
- <artifactId>org.eclipse.jubula.toolkit.api</artifactId>
- <version>3.0.0-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jubula</groupId>
- <artifactId>org.eclipse.jubula.tools</artifactId>
- <version>3.0.0-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jubula</groupId>
- <artifactId>org.eclipse.jubula.communication</artifactId>
- <version>3.0.0-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jubula</groupId>
- <artifactId>org.eclipse.jubula.toolkit.base.api</artifactId>
- <version>3.0.0-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jubula</groupId>
- <artifactId>org.eclipse.jubula.toolkit.concrete.api</artifactId>
- <version>3.0.0-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jubula</groupId>
+ <groupId>p2.eclipse-plugin</groupId>
<artifactId>org.eclipse.jubula.toolkit.swt.api</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>[3.0.0,3.1.0)</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.jubula</groupId>
+ <groupId>p2.eclipse-plugin</groupId>
<artifactId>org.eclipse.jubula.toolkit.rcp.api</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>[3.0.0,3.1.0)</version>
<scope>compile</scope>
</dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.4</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.4</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-nop</artifactId>
- <version>1.7.7</version>
- </dependency>
- <dependency>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- <version>1.3.1</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>xmlpull</groupId>
- <artifactId>xmlpull</artifactId>
- <version>1.1.3.4a</version>
- <scope>runtime</scope>
- </dependency>
</dependencies>
</project>

Back to the top