Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate to 12.0 🐫 #21

Merged
merged 14 commits into from
Jan 3, 2025
Merged
Show file tree
Hide file tree
Changes from 13 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ on:

jobs:
build:
uses: axonivy-market/github-workflows/.github/workflows/ci.yml@v4
uses: axonivy-market/github-workflows/.github/workflows/ci.yml@v5
2 changes: 1 addition & 1 deletion .github/workflows/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ on:

jobs:
build:
uses: axonivy-market/github-workflows/.github/workflows/dev.yml@v4
uses: axonivy-market/github-workflows/.github/workflows/dev.yml@v5
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ on: workflow_dispatch

jobs:
build:
uses: axonivy-market/github-workflows/.github/workflows/release.yml@v4
uses: axonivy-market/github-workflows/.github/workflows/release.yml@v5
2 changes: 2 additions & 0 deletions .settings/org.eclipse.core.resources.prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8
5 changes: 4 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,11 @@
<groupId>com.axonivy.connector.sbb</groupId><!-- your group id: e.g. com.axonivy.connector.<myconnector> or com.axonivy.utils.<myutil> -->
<name>sbb-connector</name><!-- fill your product name -->
<artifactId>sbb-connector-modules</artifactId><!-- fill your product name + a "-modules" postfix -->
<version>10.0.3-SNAPSHOT</version><!-- identicate your minimal compliant ivy version with the first 2 digits -->
<version>12.0.0-SNAPSHOT</version><!-- identicate your minimal compliant ivy version with the first 2 digits -->
<packaging>pom</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<modules>
<module>${project.name}</module>
Expand Down
7 changes: 1 addition & 6 deletions sbb-connector-demo/.classpath
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,7 @@
<attribute name="optional" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**/*.ivyClass|**/*.p.json|**/*.rddescriptor|**/*.xhtml" kind="src" path="src_hd">
<attributes>
<attribute name="optional" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" path="src_wsproc">
<classpathentry kind="src" path="src_wsproc">
<attributes>
<attribute name="optional" value="true"/>
</attributes>
Expand Down
102 changes: 53 additions & 49 deletions sbb-connector-demo/.project
Original file line number Diff line number Diff line change
@@ -1,49 +1,53 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>sbb-connector-demo</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>ch.ivyteam.ivy.designer.dataClasses.ui.ivyDataClassBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>ch.ivyteam.ivy.designer.process.ui.ivyWebServiceProcessClassBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.wst.common.project.facet.core.builder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>ch.ivyteam.ivy.designer.ide.ivyModelValidationBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>ch.ivyteam.ivy.project.IvyProjectNature</nature>
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.jem.beaninfo.BeanInfoNature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
</natures>
</projectDescription>
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>sbb-connector-demo</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>ch.ivyteam.ivy.designer.dataClasses.ui.ivyDataClassBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>ch.ivyteam.ivy.designer.process.ui.ivyWebServiceProcessClassBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.wst.common.project.facet.core.builder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>ch.ivyteam.ivy.dialog.form.build.ivyDialogFormBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>ch.ivyteam.ivy.designer.ide.ivyModelValidationBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>ch.ivyteam.ivy.project.IvyProjectNature</nature>
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.jem.beaninfo.BeanInfoNature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
</natures>
</projectDescription>
12 changes: 0 additions & 12 deletions sbb-connector-demo/.settings/.jsdtscope

This file was deleted.

11 changes: 5 additions & 6 deletions sbb-connector-demo/.settings/ch.ivyteam.ivy.designer.prefs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_DATA_CLASS=com.axonivy.connector.sbb.demo.Data
ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.axonivy.connector.sbb.demo
ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:useProjectSettings=true
ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=11
ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=100000
eclipse.preferences.version=1
ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.axonivy.connector.sbb.demo
ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:useProjectSettings=true
ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=13
ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=120001
eclipse.preferences.version=1
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8
6 changes: 3 additions & 3 deletions sbb-connector-demo/.settings/org.eclipse.jdt.core.prefs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
org.eclipse.jdt.core.compiler.compliance=17
org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
org.eclipse.jdt.core.compiler.compliance=21
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.release=enabled
org.eclipse.jdt.core.compiler.source=17
org.eclipse.jdt.core.compiler.source=21
21 changes: 10 additions & 11 deletions sbb-connector-demo/.settings/org.eclipse.wst.common.component
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="sbb-connector-demo">
<wb-resource deploy-path="/" source-path="/webContent" tag="defaultRootSource"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src_hd"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src_wsproc"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src_dataClasses"/>
<property name="context-root" value="sbb-connector-demo"/>
<property name="java-output-path" value="/sbb-connector-demo/target/classes"/>
</wb-module>
</project-modules>
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="sbb-connector-demo">
<wb-resource deploy-path="/" source-path="/webContent" tag="defaultRootSource"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src_wsproc"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src_dataClasses"/>
<property name="context-root" value="sbb-connector-demo"/>
<property name="java-output-path" value="/sbb-connector-demo/target/classes"/>
</wb-module>
</project-modules>
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
<fixed facet="wst.jsdt.web"/>
<installed facet="java" version="17"/>
<installed facet="jst.web" version="3.0"/>
<installed facet="wst.jsdt.web" version="1.0"/>
<installed facet="jst.jsf" version="2.1"/>
</faceted-project>
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
<installed facet="java" version="21"/>
<installed facet="jst.web" version="3.0"/>
<installed facet="jst.jsf" version="2.1"/>
</faceted-project>

This file was deleted.

This file was deleted.

2 changes: 1 addition & 1 deletion sbb-connector-demo/cms/cms_en.yaml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
demoInfoMessage: This demo uses the Sandbox URI of the Swiss Mobility API, which will only return the Location Bern and a Trip from Bern to Zürich HB. In case you already have access to the Swiss Mobility API, you can substitute your credentials and the other neccessary information in the variables.yaml
demoInfoMessage: This demo uses the Sandbox URI of the Journey Swiss Mobility API, which will only return a list of places and a list of trips. In case you already have access to the Journey Swiss Mobility API, you can substitute your credentials and the other neccessary information in the variables.yaml
file of this demo project as explained in the setup section of the documentation for a fully working demonstration.
9 changes: 1 addition & 8 deletions sbb-connector-demo/config/variables.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1 @@
Variables:
sbbConnector:
uri: https://b2p.app.sbb.ch
contractId: DEMO
clientId: DEMO
clientSecret: DEMO
tokenEndpoint: DEMO
scope: DEMO
Variables:
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json",
"simpleName" : "BookTripData",
"namespace" : "com.axonivy.connector.sbb.demo",
"isBusinessCaseData" : false,
"fields" : [ {
"name" : "getTripsCollectionDataIn",
"type" : "com.axonivy.connector.sbb.tripscollection.GetTripsCollectionDataIn"
}, {
"name" : "trips",
"type" : "List<ch.sbb.api.smapi.osdm.journey.client.Trip>"
} ]
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json",
"simpleName" : "Data",
"namespace" : "com.axonivy.connector.sbb.demo",
"isBusinessCaseData" : false
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json",
"simpleName" : "SegmentForDisplay",
"namespace" : "com.axonivy.connector.sbb.demo.trip",
"isBusinessCaseData" : false,
"fields" : [ {
"name" : "iconClass",
"type" : "String",
"comment" : "Class of icon to represent segment."
}, {
"name" : "stopFrom",
"type" : "com.axonivy.connector.sbb.demo.trip.StopFromForDisplay",
"comment" : "First stop in segment."
}, {
"name" : "stopTo",
"type" : "com.axonivy.connector.sbb.demo.trip.StopToForDisplay",
"comment" : "Last stop in segment."
}, {
"name" : "transportName",
"type" : "String",
"comment" : "Operator specific name of vehicle."
}, {
"name" : "direction",
"type" : "String",
"comment" : "Last station of the associated transportProduct's journey."
}, {
"name" : "transportDescription",
"type" : "String",
"comment" : "Operator specific description of vehicle."
}, {
"name" : "publishedServiceName",
"type" : "String",
"comment" : "Transport type of vehicle, line number and vehicle number"
} ]
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json",
"simpleName" : "StopFromForDisplay",
"namespace" : "com.axonivy.connector.sbb.demo.trip",
"isBusinessCaseData" : false,
"fields" : [ {
"name" : "name",
"type" : "String",
"comment" : "Name of Stop."
}, {
"name" : "departureDateTime",
"type" : "java.time.OffsetDateTime",
"comment" : "Departure dateTime in realtime."
}, {
"name" : "departureDate",
"type" : "String",
"comment" : "Departure date in realtime parsed for displaying in user dialog."
}, {
"name" : "departureTime",
"type" : "String",
"comment" : "Departure time in realtime parsed for displaying in user dialog."
}, {
"name" : "departureDelay",
"type" : "String",
"comment" : "Departure delay in realtime parsed for displaying in user dialog."
}, {
"name" : "departurePlatform",
"type" : "String",
"comment" : "Departing platform in realtime."
}, {
"name" : "departurePlatformChanged",
"type" : "Boolean",
"comment" : "Flag to determine whether departurePlatform has changed in comparison to planned departurePlatform."
} ]
}
Loading
Loading