Merge branch 'master' of https://git.eclipse.org/gitroot/eclipselink/examples
Conflicts:
jpa/employee.dynamic/pom.xml
jpa/employee/employee.web-js/pom.xml
jpa/polyglot/polyglot.client/pom.xml
diff --git a/jpa/employee/employee.model/pom.xml b/jpa/employee/employee.model/pom.xml
index 3d016db..70a4806 100644
--- a/jpa/employee/employee.model/pom.xml
+++ b/jpa/employee/employee.model/pom.xml
@@ -89,6 +89,18 @@
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.4</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
<pluginManagement>
<plugins>
diff --git a/jpa/employee/employee.web-js/pom.xml b/jpa/employee/employee.web-js/pom.xml
index 4c238a4..e8add37 100644
--- a/jpa/employee/employee.web-js/pom.xml
+++ b/jpa/employee/employee.web-js/pom.xml
@@ -23,7 +23,7 @@
<dependency>
<groupId>eclipselink.example.jpa</groupId>
<artifactId>employee.model</artifactId>
- <version>2.4.2</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
diff --git a/jpa/employee/employee.web/pom.xml b/jpa/employee/employee.web/pom.xml
index a092e8a..f925aa8 100644
--- a/jpa/employee/employee.web/pom.xml
+++ b/jpa/employee/employee.web/pom.xml
@@ -31,7 +31,7 @@
<dependency>
<groupId>eclipselink.example.jpa</groupId>
<artifactId>employee.model</artifactId>
- <version>${eclipselink.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
@@ -40,6 +40,22 @@
<version>4.11</version>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>eclipselink.example.jpa</groupId>
+ <artifactId>employee.model</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>10.9.1.0</version>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>javax.faces</groupId>
<artifactId>javax.faces-api</artifactId>
diff --git a/jpa/polyglot/polyglot.client/pom.xml b/jpa/polyglot/polyglot.client/pom.xml
index e118d3d..28d3f3e 100644
--- a/jpa/polyglot/polyglot.client/pom.xml
+++ b/jpa/polyglot/polyglot.client/pom.xml
@@ -15,7 +15,7 @@
<dependency>
<groupId>eclipselink.example.polyglot</groupId>
<artifactId>polyglot.composite</artifactId>
- <version>2.4.2</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
diff --git a/jpa/polyglot/polyglot.composite/pom.xml b/jpa/polyglot/polyglot.composite/pom.xml
index d7ccc27..fd08913 100644
--- a/jpa/polyglot/polyglot.composite/pom.xml
+++ b/jpa/polyglot/polyglot.composite/pom.xml
@@ -16,12 +16,12 @@
<dependency>
<groupId>eclipselink.example.polyglot</groupId>
<artifactId>polyglot.nosql</artifactId>
- <version>${eclipselink.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>eclipselink.example.polyglot</groupId>
<artifactId>polyglot.relational</artifactId>
- <version>${eclipselink.version}</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/jpa/polyglot/polyglot.nosql/pom.xml b/jpa/polyglot/polyglot.nosql/pom.xml
index c5102e9..cee90ba 100644
--- a/jpa/polyglot/polyglot.nosql/pom.xml
+++ b/jpa/polyglot/polyglot.nosql/pom.xml
@@ -15,17 +15,15 @@
<dependency>
<groupId>${eclipselink.groupid}</groupId>
<artifactId>eclipselink</artifactId>
- <version>${eclipselink.version}</version>
</dependency>
<dependency>
<groupId>${eclipselink.groupid}</groupId>
<artifactId>org.eclipse.persistence.nosql</artifactId>
- <version>${eclipselink.version}</version>
</dependency>
<dependency>
<groupId>eclipselink.example.polyglot</groupId>
<artifactId>polyglot.relational</artifactId>
- <version>${eclipselink.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.mongodb</groupId>
diff --git a/jpa/polyglot/polyglot.relational/pom.xml b/jpa/polyglot/polyglot.relational/pom.xml
index 041039f..661cce7 100644
--- a/jpa/polyglot/polyglot.relational/pom.xml
+++ b/jpa/polyglot/polyglot.relational/pom.xml
@@ -21,7 +21,6 @@
<dependency>
<groupId>${eclipselink.groupid}</groupId>
<artifactId>eclipselink</artifactId>
- <version>${eclipselink.version}</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
diff --git a/jpa/polyglot/pom.xml b/jpa/polyglot/pom.xml
index 209eb72..1ac8aaa 100644
--- a/jpa/polyglot/pom.xml
+++ b/jpa/polyglot/pom.xml
@@ -3,6 +3,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <relativePath>..</relativePath>
+ <groupId>eclipselink.example.jpa</groupId>
+ <artifactId>parent</artifactId>
+ <version>2.4.2</version>
+ </parent>
+
<groupId>eclipselink.example.polyglot</groupId>
<artifactId>parent</artifactId>
<packaging>pom</packaging>
@@ -16,6 +23,21 @@
<eclipselink.version>2.4.2</eclipselink.version>
</properties>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>${eclipselink.groupid}</groupId>
+ <artifactId>eclipselink</artifactId>
+ <version>${eclipselink.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${eclipselink.groupid}</groupId>
+ <artifactId>org.eclipse.persistence.nosql</artifactId>
+ <version>${eclipselink.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<modules>
<module>polyglot.relational</module>
<module>polyglot.nosql</module>
diff --git a/moxy/social-binding/src/test/java/test/TestMainGolf.java b/moxy/social-binding/src/test/java/test/TestMainGolf.java
new file mode 100644
index 0000000..7dd4378
--- /dev/null
+++ b/moxy/social-binding/src/test/java/test/TestMainGolf.java
@@ -0,0 +1,15 @@
+package test;
+
+import javax.xml.bind.JAXBException;
+
+import org.junit.Test;
+
+import eclipselink.example.moxy.socialbinding.Main;
+
+public class TestMainGolf {
+
+ @Test
+ public void test() throws JAXBException {
+ Main.main(new String[] {"golf"});
+ }
+}
diff --git a/moxy/social-binding/src/test/java/test/TestMainHockey.java b/moxy/social-binding/src/test/java/test/TestMainHockey.java
new file mode 100644
index 0000000..3a96466
--- /dev/null
+++ b/moxy/social-binding/src/test/java/test/TestMainHockey.java
@@ -0,0 +1,15 @@
+package test;
+
+import javax.xml.bind.JAXBException;
+
+import org.junit.Test;
+
+import eclipselink.example.moxy.socialbinding.Main;
+
+public class TestMainHockey {
+
+ @Test
+ public void test() throws JAXBException {
+ Main.main(new String[] {"hockey"});
+ }
+}
diff --git a/moxy/social-binding/src/test/java/test/TestMainTechnology.java b/moxy/social-binding/src/test/java/test/TestMainTechnology.java
new file mode 100644
index 0000000..2c97c4b
--- /dev/null
+++ b/moxy/social-binding/src/test/java/test/TestMainTechnology.java
@@ -0,0 +1,15 @@
+package test;
+
+import javax.xml.bind.JAXBException;
+
+import org.junit.Test;
+
+import eclipselink.example.moxy.socialbinding.Main;
+
+public class TestMainTechnology {
+
+ @Test
+ public void test() throws JAXBException {
+ Main.main(new String[] {"technology"});
+ }
+}
