Merge pull request #7102 from tech-conferences/asdhfxqnvsmbqcnpkxb

Add JavaLand for java, javascript, devops
tech-conferences · Aug 6, 2024 · 07cb9b7 · 07cb9b7
2 parents e5b93ae + 6d9ad00
commit 07cb9b7
Show file tree

Hide file tree

Showing 8 changed files with 51 additions and 5 deletions.
diff --git a/conferences/2025/devops.json b/conferences/2025/devops.json
@@ -1,4 +1,19 @@
 [
+  {
+    "name": "JavaLand",
+    "url": "https://www.javaland.eu",
+    "startDate": "2025-04-01",
+    "endDate": "2025-04-03",
+    "city": "Nürburgring",
+    "country": "Germany",
+    "online": false,
+    "locales": "EN,DE",
+    "cocUrl": "https://www.javaland.eu/de/verhaltenscodex/",
+    "cfpUrl": "https://www.javaland.eu/de/referierende",
+    "cfpEndDate": "2024-09-06",
+    "twitter": "@DOAGeV",
+    "mastodon": "@JavaLandConf@ijug.social"
+  },
   {
     "name": "KubeCon + CloudNativeCon Europe",
     "url": "https://events.linuxfoundation.org/kubecon-cloudnativecon-europe-2025/",

diff --git a/conferences/2025/java.json b/conferences/2025/java.json
@@ -1,4 +1,19 @@
 [
+  {
+    "name": "JavaLand",
+    "url": "https://www.javaland.eu",
+    "startDate": "2025-04-01",
+    "endDate": "2025-04-03",
+    "city": "Nürburgring",
+    "country": "Germany",
+    "online": false,
+    "locales": "EN,DE",
+    "cocUrl": "https://www.javaland.eu/de/verhaltenscodex/",
+    "cfpUrl": "https://www.javaland.eu/de/referierende",
+    "cfpEndDate": "2024-09-06",
+    "twitter": "@DOAGeV",
+    "mastodon": "@JavaLandConf@ijug.social"
+  },
   {
     "name": "JCON EUROPE",
     "url": "https://2025.europe.jcon.one",

diff --git a/conferences/2025/javascript.json b/conferences/2025/javascript.json
@@ -24,6 +24,21 @@
     "cfpEndDate": "2024-11-15",
     "twitter": "@frontrunnersdc"
   },
+  {
+    "name": "JavaLand",
+    "url": "https://www.javaland.eu",
+    "startDate": "2025-04-01",
+    "endDate": "2025-04-03",
+    "city": "Nürburgring",
+    "country": "Germany",
+    "online": false,
+    "locales": "EN,DE",
+    "cocUrl": "https://www.javaland.eu/de/verhaltenscodex/",
+    "cfpUrl": "https://www.javaland.eu/de/referierende",
+    "cfpEndDate": "2024-09-06",
+    "twitter": "@DOAGeV",
+    "mastodon": "@JavaLandConf@ijug.social"
+  },
   {
     "name": "CityJS London",
     "url": "https://london.cityjsconf.org",

diff --git a/scripts/conferences.test.ts b/scripts/conferences.test.ts
@@ -10,7 +10,7 @@ console.log('Running conference tests...');
 const label = 'Conference Tests Runtime';
 console.time(label);
 
-const mergedConferences = mergedConferencesReader();
+const mergedConferences = mergedConferencesReader(false);
 
 const testResult: TestResult = {
     errors: {},

diff --git a/scripts/config/validLocations.ts b/scripts/config/validLocations.ts
@@ -116,6 +116,7 @@ export const validLocations = {
         'Mainz',
         'Mannheim',
         'Munich',
+        'Nürburgring',
         'Nürnberg',
         'Ostfildern',
         'Potsdam',

diff --git a/scripts/reorderConferencesByDate.ts b/scripts/reorderConferencesByDate.ts
@@ -11,7 +11,7 @@ import { uniqWith } from 'lodash';
 const BASE_DIR = 'conferences';
 
 const conferencesJSON = conferenceReader(true);
-const mergedConferences = mergedConferencesReader();
+const mergedConferences = mergedConferencesReader(true);
 const generalDuplicateErrors = mergedConferences.duplicateErrors.filter(error => error.type === DuplicateType.NotOnlyGeneral);
 const containsGeneralDuplicateErrors = generalDuplicateErrors.length > 0;
 const conferencesWithTooManyStacks = mergedConferences.duplicateErrors.filter(error => error.type === DuplicateType.TooManyStacks).map(error => error.conference);

diff --git a/scripts/utils/checkConference.ts b/scripts/utils/checkConference.ts
@@ -17,7 +17,7 @@ const dateFormat: string = 'yyyy-MM-dd';
 const dateRegex: RegExp = /(2\d\d\d)-(0[1-9])|(1[012])-(0[1-9])|([12][0-9])|(3[01])/;
 const year2000Regex: RegExp = /20\d{2}/;
 const REQUIRED_KEYS: string[] = ['name', 'url', 'startDate', 'endDate'];
-const validLocationsHint: string = ' - Check/Maintain the file "config/validLocations.js"';
+const validLocationsHint: string = ' - Check/Maintain the file "scripts/config/validLocations.ts"';
 
 export default function (year: string, conference: MergedConference, assertField: AssertField) {
     const { name, url, cfpUrl, twitter } = conference;

diff --git a/scripts/utils/mergedConferencesReader.ts b/scripts/utils/mergedConferencesReader.ts
@@ -7,8 +7,8 @@ import { DuplicateError } from './DuplicateError';
 import { DuplicateType } from './DuplicateType';
 import IsConferenceEqual from './IsConferenceEqual';
 
-export default function mergedConferencesReader() {
-    const conferencesJSON = conferenceReader(false);
+export default function mergedConferencesReader(reorderConferences: boolean) {
+    const conferencesJSON = conferenceReader(reorderConferences);
     const mergedConferences: { [key: string]: MergedConference[] } = {};
 
     const duplicateErrors: DuplicateError[] = [];