Skip to content

Commit 2fcbbc5

Browse files
douglmdouglm
committed
travis build and intellij files changed with move to java 11
1 parent f200db7 commit 2fcbbc5

File tree

27 files changed

+39
-40
lines changed

27 files changed

+39
-40
lines changed

‎.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
language: java
22
jdk:
3-
- oraclejdk8
3+
- openjdk11
44
sudo: false

‎bw-calendar-engine-annotations/bw-calendar-engine-annotations.iml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
3-
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
3+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_11">
44
<output url="file://$MODULE_DIR$/target/classes" />
55
<output-test url="file://$MODULE_DIR$/target/test-classes" />
66
<content url="file://$MODULE_DIR$">

‎bw-calendar-engine-api/bw-calendar-engine-api.iml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
3-
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
3+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_11">
44
<output url="file://$MODULE_DIR$/target/classes" />
55
<output-test url="file://$MODULE_DIR$/target/test-classes" />
66
<content url="file://$MODULE_DIR$">

‎bw-calendar-engine-caldav/bw-calendar-engine-caldav.iml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
3-
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
3+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_11">
44
<output url="file://$MODULE_DIR$/target/classes" />
55
<output-test url="file://$MODULE_DIR$/target/test-classes" />
66
<content url="file://$MODULE_DIR$">

‎bw-calendar-engine-chgnote/bw-calendar-engine-chgnote.iml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
3-
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
3+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_11">
44
<output url="file://$MODULE_DIR$/target/classes" />
55
<output-test url="file://$MODULE_DIR$/target/test-classes" />
66
<content url="file://$MODULE_DIR$">

‎bw-calendar-engine-core-common/bw-calendar-engine-core-common.iml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
3-
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
3+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_11">
44
<output url="file://$MODULE_DIR$/target/classes" />
55
<output-test url="file://$MODULE_DIR$/target/test-classes" />
66
<content url="file://$MODULE_DIR$">

‎bw-calendar-engine-core/bw-calendar-engine-core.iml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</configuration>
1212
</facet>
1313
</component>
14-
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
14+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_11">
1515
<output url="file://$MODULE_DIR$/target/classes" />
1616
<output-test url="file://$MODULE_DIR$/target/test-classes" />
1717
<content url="file://$MODULE_DIR$">

‎bw-calendar-engine-core/src/main/java/org/bedework/calcore/hibernate/CoreCalendars.java

+1-4
Original file line numberDiff line numberDiff line change
@@ -411,9 +411,7 @@ public void updateCalendar(final BwCalendar val) throws CalFacadeException {
411411
ac.checkAccess(val, privWriteProperties, false);
412412

413413
dao.updateCollection(unwrap(val));
414-
touchCalendar(val.getPath());
415-
416-
indexEntity(val);
414+
touchCalendar(val.getPath()); // Also indexes
417415

418416
notify(SysEvent.SysCode.COLLECTION_UPDATED, val);
419417

@@ -1134,7 +1132,6 @@ private void notify(final SysEvent.SysCode code,
11341132
val.getPublick(),
11351133
indexed));
11361134
} else {
1137-
indexEntity(val);
11381135
postNotification(
11391136
SysEvent.makeCollectionUpdateEvent(code,
11401137
authenticatedPrincipal(),

‎bw-calendar-engine-dumprestore/bw-calendar-engine-dumprestore.iml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
3-
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
3+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_11">
44
<output url="file://$MODULE_DIR$/target/classes" />
55
<output-test url="file://$MODULE_DIR$/target/test-classes" />
66
<content url="file://$MODULE_DIR$">

‎bw-calendar-engine-facade/bw-calendar-engine-facade.iml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
3-
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
3+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_11">
44
<output url="file://$MODULE_DIR$/target/classes" />
55
<output-test url="file://$MODULE_DIR$/target/test-classes" />
66
<content url="file://$MODULE_DIR$">

‎bw-calendar-engine-ical/bw-calendar-engine-ical.iml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
3-
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
3+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_11">
44
<output url="file://$MODULE_DIR$/target/classes" />
55
<output-test url="file://$MODULE_DIR$/target/test-classes" />
66
<content url="file://$MODULE_DIR$">

‎bw-calendar-engine-impl/bw-calendar-engine-impl.iml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
3-
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
3+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_11">
44
<output url="file://$MODULE_DIR$/target/classes" />
55
<output-test url="file://$MODULE_DIR$/target/test-classes" />
66
<content url="file://$MODULE_DIR$">

‎bw-calendar-engine-impl/src/main/java/org/bedework/calsvc/Events.java

+13-11
Original file line numberDiff line numberDiff line change
@@ -1758,24 +1758,26 @@ private String checkString(final String val) {
17581758
return null;
17591759
}
17601760

1761-
boolean hasBadChar = false;
1761+
// Normalize the line endings
1762+
final String s1 = val.replaceAll("(\\r|\\n|\\r\\n)+", "\\\\n");
17621763

1763-
final char[] badChars = {'\u0013', '\u001F'};
1764+
boolean changed = !s1.equals(val);
17641765

1765-
for (final char c: badChars) {
1766-
if (val.indexOf(c) >= 0) {
1767-
hasBadChar = true;
1768-
break;
1769-
}
1766+
// Get rid of all controls except cr and LF
1767+
final String s2 =
1768+
s1.replaceAll("[\u0000-\u0009\u000B-\u000C\u000E-\u0019\u007F]+",
1769+
"");
1770+
1771+
if (!s2.equals(s1)) {
1772+
changed = true;
17701773
}
17711774

1772-
if (!hasBadChar) {
1775+
if (!changed) {
17731776
return null;
17741777
}
17751778

1776-
warn("String " + val + " contains a bad character");
1777-
1778-
return val.replaceAll(new String(badChars), val);
1779+
// Put the escaped form back again
1780+
return s2.replaceAll("(\\r|\\n|\\r\\n)+", "\\\\n");
17791781
}
17801782

17811783
/* Flag this as an attendee scheduling object or an organizer scheduling object

‎bw-calendar-engine-indexer/bw-calendar-engine-indexer.iml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
3-
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
3+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_11">
44
<output url="file://$MODULE_DIR$/target/classes" />
55
<output-test url="file://$MODULE_DIR$/target/test-classes" />
66
<content url="file://$MODULE_DIR$">

‎bw-calendar-engine-inoutsched/bw-calendar-engine-inoutsched.iml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
3-
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
3+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_11">
44
<output url="file://$MODULE_DIR$/target/classes" />
55
<output-test url="file://$MODULE_DIR$/target/test-classes" />
66
<content url="file://$MODULE_DIR$">

‎bw-calendar-engine-interfaces/bw-calendar-engine-interfaces.iml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
3-
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
3+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_11">
44
<output url="file://$MODULE_DIR$/target/classes" />
55
<output-test url="file://$MODULE_DIR$/target/test-classes" />
66
<content url="file://$MODULE_DIR$">

‎bw-calendar-engine-mail/bw-calendar-engine-mail.iml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
3-
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
3+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_11">
44
<output url="file://$MODULE_DIR$/target/classes" />
55
<output-test url="file://$MODULE_DIR$/target/test-classes" />
66
<content url="file://$MODULE_DIR$">

‎bw-calendar-engine-notifyws/bw-calendar-engine-notifyws.iml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</configuration>
1414
</facet>
1515
</component>
16-
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
16+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_11">
1717
<output url="file://$MODULE_DIR$/target/classes" />
1818
<output-test url="file://$MODULE_DIR$/target/test-classes" />
1919
<content url="file://$MODULE_DIR$">

‎bw-calendar-engine-pubcaldav/bw-calendar-engine-pubcaldav.iml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</configuration>
1414
</facet>
1515
</component>
16-
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
16+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_11">
1717
<output url="file://$MODULE_DIR$/target/classes" />
1818
<output-test url="file://$MODULE_DIR$/target/test-classes" />
1919
<content url="file://$MODULE_DIR$">

‎bw-calendar-engine-publicws/bw-calendar-engine-publicws.iml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</configuration>
1414
</facet>
1515
</component>
16-
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
16+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_11">
1717
<output url="file://$MODULE_DIR$/target/classes" />
1818
<output-test url="file://$MODULE_DIR$/target/test-classes" />
1919
<content url="file://$MODULE_DIR$">

‎bw-calendar-engine-synchws/bw-calendar-engine-synchws.iml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</configuration>
1414
</facet>
1515
</component>
16-
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
16+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_11">
1717
<output url="file://$MODULE_DIR$/target/classes" />
1818
<output-test url="file://$MODULE_DIR$/target/test-classes" />
1919
<content url="file://$MODULE_DIR$">

‎bw-calendar-engine-sysevents-common/bw-calendar-engine-sysevents-common.iml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
3-
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
3+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_11">
44
<output url="file://$MODULE_DIR$/target/classes" />
55
<output-test url="file://$MODULE_DIR$/target/test-classes" />
66
<content url="file://$MODULE_DIR$">

‎bw-calendar-engine-sysevents-msgs/bw-calendar-engine-sysevents-msgs.iml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
3-
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
3+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_11">
44
<output url="file://$MODULE_DIR$/target/classes" />
55
<output-test url="file://$MODULE_DIR$/target/test-classes" />
66
<content url="file://$MODULE_DIR$">

‎bw-calendar-engine-tools/bw-calendar-engine-tools.iml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
3-
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
3+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_11">
44
<output url="file://$MODULE_DIR$/target/classes" />
55
<output-test url="file://$MODULE_DIR$/target/test-classes" />
66
<content url="file://$MODULE_DIR$">

‎bw-calendar-engine-ucaldav/bw-calendar-engine-ucaldav.iml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</configuration>
1414
</facet>
1515
</component>
16-
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
16+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_11">
1717
<output url="file://$MODULE_DIR$/target/classes" />
1818
<output-test url="file://$MODULE_DIR$/target/test-classes" />
1919
<content url="file://$MODULE_DIR$">

‎bw-calendar-engine-userws/bw-calendar-engine-userws.iml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</configuration>
1414
</facet>
1515
</component>
16-
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
16+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_11">
1717
<output url="file://$MODULE_DIR$/target/classes" />
1818
<output-test url="file://$MODULE_DIR$/target/test-classes" />
1919
<content url="file://$MODULE_DIR$">

‎bw-calendar-engine.iml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
3-
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
3+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_11">
44
<output url="file://$MODULE_DIR$/target/classes" />
55
<output-test url="file://$MODULE_DIR$/target/test-classes" />
66
<content url="file://$MODULE_DIR$">

0 commit comments

Comments
 (0)