Updated pom files to use JDK 8, EclipseLink 2.6.0, and various updated maven plugin versions.
Signed-off-by: John Clingan <jtclingan@yahoo.com>
Signed-off-by: John Clingan <john.clingan@oracle.com>
diff --git a/jpars/student/pom.xml b/jpars/student/pom.xml
index 9cbc829..78be0ce 100644
--- a/jpars/student/pom.xml
+++ b/jpars/student/pom.xml
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>eclipselink.example.jpars</groupId>
<artifactId>student</artifactId>
- <version>2.4.2</version>
+ <version>2.6.0</version>
<packaging>pom</packaging>
<name>Student</name>
@@ -38,20 +38,9 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<eclipselink.groupid>org.eclipse.persistence</eclipselink.groupid>
<eclipselink.artifactid>eclipselink</eclipselink.artifactid>
- <eclipselink.version>2.4.2</eclipselink.version>
+ <eclipselink.version>2.6.0</eclipselink.version>
</properties>
- <repositories>
- <repository>
- <id>maven.java.net</id>
- <url>http://download.java.net/maven/2</url>
- </repository>
- <repository>
- <id>EclipseLink</id>
- <url>http://download.eclipse.org/rt/eclipselink/maven.repo</url>
- </repository>
- </repositories>
-
<modules>
<module>student.model</module>
<module>student.web</module>
@@ -63,12 +52,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
+ <version>3.2</version>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>1.8</source>
+ <target>1.8</target>
</configuration>
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/jpars/student/student.model/.classpath b/jpars/student/student.model/.classpath
index d6e899f..67445ae 100644
--- a/jpars/student/student.model/.classpath
+++ b/jpars/student/student.model/.classpath
@@ -13,16 +13,16 @@
<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="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="org.eclipse.jst.component.nondependency" value=""/>
</attributes>
</classpathentry>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+ <attributes>
+ <attribute name="owner.project.facets" value="java"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/jpars/student/student.model/.settings/org.eclipse.jdt.core.prefs b/jpars/student/student.model/.settings/org.eclipse.jdt.core.prefs
index bef36df..7eaa9ac 100644
--- a/jpars/student/student.model/.settings/org.eclipse.jdt.core.prefs
+++ b/jpars/student/student.model/.settings/org.eclipse.jdt.core.prefs
@@ -1,11 +1,11 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.8
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff --git a/jpars/student/student.model/.settings/org.eclipse.wst.common.project.facet.core.xml b/jpars/student/student.model/.settings/org.eclipse.wst.common.project.facet.core.xml
index 08e864b..646ae4e 100644
--- a/jpars/student/student.model/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/jpars/student/student.model/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
- <installed facet="java" version="1.6"/>
<installed facet="jpt.jpa" version="2.0"/>
<installed facet="jst.utility" version="1.0"/>
+ <installed facet="java" version="1.8"/>
</faceted-project>
diff --git a/jpars/student/student.model/.settings/org.eclipse.wst.validation.prefs b/jpars/student/student.model/.settings/org.eclipse.wst.validation.prefs
new file mode 100644
index 0000000..04cad8c
--- /dev/null
+++ b/jpars/student/student.model/.settings/org.eclipse.wst.validation.prefs
@@ -0,0 +1,2 @@
+disabled=06target
+eclipse.preferences.version=1
diff --git a/jpars/student/student.model/pom.xml b/jpars/student/student.model/pom.xml
index e19d3a1..8156d73 100644
--- a/jpars/student/student.model/pom.xml
+++ b/jpars/student/student.model/pom.xml
@@ -5,7 +5,7 @@
<relativePath>..</relativePath>
<groupId>eclipselink.example.jpars</groupId>
<artifactId>student</artifactId>
- <version>2.4.2</version>
+ <version>2.6.0</version>
</parent>
<artifactId>student.model</artifactId>
@@ -29,7 +29,7 @@
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0</version>
+ <version>7.0</version>
<scope>provided</scope>
</dependency>
</dependencies>
@@ -41,10 +41,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.5.1</version>
+ <version>3.2</version>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>1.8</source>
+ <target>1.8</target>
</configuration>
</plugin>
</plugins>
diff --git a/jpars/student/student.web/.classpath b/jpars/student/student.web/.classpath
index 0f4a4c2..53d2672 100644
--- a/jpars/student/student.web/.classpath
+++ b/jpars/student/student.web/.classpath
@@ -6,27 +6,22 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
- <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
- <attributes>
- <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/JavaSE-1.6">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
</classpathentry>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+ <attributes>
+ <attribute name="owner.project.facets" value="java"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/jpars/student/student.web/.settings/org.eclipse.jdt.core.prefs b/jpars/student/student.web/.settings/org.eclipse.jdt.core.prefs
index c1e9076..e052f6e 100644
--- a/jpars/student/student.web/.settings/org.eclipse.jdt.core.prefs
+++ b/jpars/student/student.web/.settings/org.eclipse.jdt.core.prefs
@@ -1,15 +1,15 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.8
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff --git a/jpars/student/student.web/.settings/org.eclipse.wst.common.component b/jpars/student/student.web/.settings/org.eclipse.wst.common.component
index 406f239..f2b8266 100644
--- a/jpars/student/student.web/.settings/org.eclipse.wst.common.component
+++ b/jpars/student/student.web/.settings/org.eclipse.wst.common.component
@@ -4,7 +4,7 @@
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
- <dependent-module archiveName="student.model-2.4.2.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/jpars.student.model/jpars.student.model">
+ <dependent-module archiveName="student.model-2.6.0-M3.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/student.model/student.model">
<dependency-type>uses</dependency-type>
</dependent-module>
<property name="java-output-path" value="/jpars.student.web/target/classes"/>
diff --git a/jpars/student/student.web/.settings/org.eclipse.wst.common.project.facet.core.xml b/jpars/student/student.web/.settings/org.eclipse.wst.common.project.facet.core.xml
index 894549e..543e7af 100644
--- a/jpars/student/student.web/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/jpars/student/student.web/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -3,6 +3,6 @@
<installed facet="jst.web" version="3.0"/>
<installed facet="wst.jsdt.web" version="1.0"/>
<installed facet="jst.jsf" version="2.1"/>
- <installed facet="java" version="1.6"/>
<installed facet="jst.jaxrs" version="1.1"/>
+ <installed facet="java" version="1.8"/>
</faceted-project>
diff --git a/jpars/student/student.web/.settings/org.eclipse.wst.validation.prefs b/jpars/student/student.web/.settings/org.eclipse.wst.validation.prefs
new file mode 100644
index 0000000..04cad8c
--- /dev/null
+++ b/jpars/student/student.web/.settings/org.eclipse.wst.validation.prefs
@@ -0,0 +1,2 @@
+disabled=06target
+eclipse.preferences.version=1
diff --git a/jpars/student/student.web/pom.xml b/jpars/student/student.web/pom.xml
index d3679d7..736c18f 100644
--- a/jpars/student/student.web/pom.xml
+++ b/jpars/student/student.web/pom.xml
@@ -6,7 +6,7 @@
<relativePath>..</relativePath>
<groupId>eclipselink.example.jpars</groupId>
<artifactId>student</artifactId>
- <version>2.4.2</version>
+ <version>2.6.0</version>
</parent>
<artifactId>student.web</artifactId>
@@ -37,19 +37,19 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.11</version>
+ <version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>eclipselink.example.jpars</groupId>
<artifactId>student.model</artifactId>
- <version>2.4.2</version>
+ <version>2.6.0</version>
</dependency>
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0</version>
+ <version>7.0</version>
<scope>provided</scope>
</dependency>
</dependencies>
@@ -61,10 +61,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.5.1</version>
+ <version>3.2</version>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>1.8</source>
+ <target>1.8</target>
</configuration>
</plugin>
