Skip to content

Commit e51466f

Browse files
author
Joerg Huber
committed
Upgraded project to Java 8. This is minimum Java version from now on.
1 parent d72ccb1 commit e51466f

20 files changed

Lines changed: 89 additions & 21 deletions

SIF3InfraREST/README.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Project (note that the version number will change over time):
2525
<dependency>
2626
<groupId>sif3.framework</groupId>
2727
<artifactId>sif3-infra-rest</artifactId>
28-
<version>0.13.0</version>
28+
<version>0.14.0</version>
2929
</dependency>
3030
```
3131

@@ -174,6 +174,13 @@ new framework version.**
174174

175175
**Please refer to the detailed release notes in "release/v0.13.0" carefully to ensure that your project is upgraded properly to the new framework version.**
176176

177+
## Version from MMM DD, 2018: v0.14.0 - Various changes
178+
___
179+
**AS OF THIS VERSION ALL FRAMEWORK LIBRARIES ARE COMPILED WITH JAVA 8. THE FRAMEWORK MAY NO LONGER SUPPORT OR RUN ON JAVA VERSIONS OLDER THAN JAVA 8.**
180+
___
181+
182+
**Please refer to the detailed release notes in "release/v0.14.0" carefully to ensure that your project is upgraded properly to the new framework version.**
183+
177184
# Download Instructions
178185
How to download this project:
179186

SIF3InfraREST/SIF3Demo/sif3-demo-web/pom.xml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
34
<modelVersion>4.0.0</modelVersion>
45

56
<!-- =========== -->
@@ -8,7 +9,7 @@
89
<groupId>sif3.framework</groupId>
910
<artifactId>sif3-demo-web</artifactId>
1011
<packaging>war</packaging>
11-
<version>0.13.0-Demo</version>
12+
<version>0.14.0-Demo</version>
1213
<name>SIF3 Demo Provider</name>
1314

1415
<!-- =============================== -->
@@ -18,8 +19,8 @@
1819
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1920

2021
<!-- Set the Java Version compliance -->
21-
<maven.compiler.source>1.7</maven.compiler.source>
22-
<maven.compiler.target>1.7</maven.compiler.target>
22+
<maven.compiler.source>1.8</maven.compiler.source>
23+
<maven.compiler.target>1.8</maven.compiler.target>
2324

2425
<!-- Hardcoded Variable for the non-maven library location -->
2526
<!--project.lib.dir>C:/Development/GitHubRepositories/SIF3InfraRest/SIF3InfraREST/lib</project.lib.dir-->
@@ -41,7 +42,7 @@
4142
<dependency>
4243
<groupId>sif3.framework</groupId>
4344
<artifactId>sif3-infra-rest</artifactId>
44-
<version>0.13.0-beta</version>
45+
<version>0.14.0-beta</version>
4546
</dependency>
4647

4748
<!-- ====================== -->
@@ -167,7 +168,7 @@
167168
<plugin>
168169
<groupId>org.apache.maven.plugins</groupId>
169170
<artifactId>maven-war-plugin</artifactId>
170-
<!--version>3.0.0</version-->
171+
<!--version>3.2.2</version-->
171172
<configuration>
172173
<attachClasses>true</attachClasses>
173174
<archiveClasses>true</archiveClasses>

SIF3InfraREST/SIF3Demo/sif3-demo-web/src/test/java/sif3/test/infra/rest/consumer/TestRolloverStudentConsumer.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -168,12 +168,14 @@ private org.w3c.dom.Element createInitPayload()
168168

169169
org.w3c.dom.Element child = domDocument.createElement("property");
170170
child.setAttribute("name", "contextId");
171-
child.setTextContent("future");
171+
// child.setTextContent("future");
172+
child.appendChild(domDocument.createTextNode("future"));
172173
rootElement.appendChild(child);
173174

174175
child = domDocument.createElement("property");
175176
child.setAttribute("name", "initiator");
176-
child.setTextContent("user1");
177+
// child.setTextContent("user1");
178+
child.appendChild(domDocument.createTextNode("user1"));
177179
rootElement.appendChild(child);
178180

179181
return rootElement;
@@ -508,7 +510,7 @@ public static void main(String[] args)
508510
//
509511
// Job Operations
510512
//
511-
// tester.createJob(consumer);
513+
tester.createJob(consumer);
512514
// tester.createJobs(consumer);
513515

514516

@@ -522,7 +524,7 @@ public static void main(String[] args)
522524
//
523525
// Phase State Operations
524526
//
525-
tester.updateJobPhaseState(consumer, "oldYearEnrolment", PhaseState.PENDING);
527+
// tester.updateJobPhaseState(consumer, "oldYearEnrolment", PhaseState.PENDING);
526528
// tester.getJobPhaseStates(consumer, "newYearEnrolment");
527529

528530
//

SIF3InfraREST/SIF3REST/pom.xml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
1-
<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/xsd/maven-4.0.0.xsd">
2-
<modelVersion>4.0.0</modelVersion>
1+
<project xmlns="http://maven.apache.org/POM/4.0.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4+
<modelVersion>4.0.0</modelVersion>
35

46
<!-- ======================== -->
57
<!-- Parent Module Definition -->
68
<!-- ======================== -->
79
<parent>
810
<groupId>sif3.framework</groupId>
911
<artifactId>sif3-framework</artifactId>
10-
<version>0.13.0-beta</version>
12+
<version>0.14.0-beta</version>
1113
</parent>
1214

1315
<!-- =========== -->
Binary file not shown.
Binary file not shown.
2 Bytes
Binary file not shown.

SIF3InfraREST/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<!-- =========== -->
1818
<groupId>sif3.framework</groupId>
1919
<artifactId>sif3-framework</artifactId>
20-
<version>0.13.0-beta</version>
20+
<version>0.14.0-beta</version>
2121
<packaging>pom</packaging>
2222

2323
<!-- ===================================== -->
@@ -27,8 +27,8 @@
2727
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2828

2929
<!-- Set the Java Version compliance -->
30-
<maven.compiler.source>1.7</maven.compiler.source>
31-
<maven.compiler.target>1.7</maven.compiler.target>
30+
<maven.compiler.source>1.8</maven.compiler.source>
31+
<maven.compiler.target>1.8</maven.compiler.target>
3232

3333
<!-- Hardcoded Variable for the non-maven library location -->
3434
<!--project.lib.dir>C:/DEV/workspaces/jbds10.1.0/sif3-framework/lib</project.lib.dir-->
-218 KB
Binary file not shown.
218 KB
Binary file not shown.

0 commit comments

Comments
 (0)