Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
15 changes: 15 additions & 0 deletions .github/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
changelog:
categories:
- title: Breaking changes
labels:
- "Breaking change"
- title: Bugfixes
labels:
- bug
- title: Dependency upgrades
labels:
- dependencies
- title: Non-breaking changes
labels:
- "*"

4 changes: 2 additions & 2 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: Java CI with Maven

on:
push:
branches: [ "master" ]
branches: [ "main" ]
pull_request:
branches: [ "master" ]
branches: [ "main" ]

env:
MAVEN_ARGS: "--no-transfer-progress -Dstyle.color=always"
Expand Down
20 changes: 20 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Create Github release

on:
push:
tags:
- "*.*.*"

permissions:
contents: write

jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v6
- name: Release
uses: softprops/action-gh-release@v2
with:
generate_release_notes: true
2 changes: 1 addition & 1 deletion bindings.xjb
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
<jxb:bindings>
<jxb:globalBindings underscoreBinding="asCharInWord">
<xjc:javaType name="org.opentripplanner.ojp.time.XmlDateTime" xmlType="xs:dateTime" adapter="org.opentripplanner.ojp.util.XmlDateTimeAdapter" />
<!--<xjc:javaType name="java.time.ZonedDateTime" xmlType="xs:dateTime" adapter="org.opentripplanner.ojp.util.ZonedDateTimeISO8601XmlAdapter" />-->
<xjc:javaType name="java.time.LocalTime" xmlType="xs:time" adapter="org.opentripplanner.ojp.util.LocalTimeISO8601XmlAdapter" />
<xjc:javaType name="java.time.LocalDateTime" xmlType="xs:date" adapter="org.opentripplanner.ojp.util.LocalDateXmlAdapter" />
<xjc:javaType name="java.time.Duration" xmlType="xs:duration" adapter="org.opentripplanner.ojp.util.DurationXmlAdapter" />
<xjc:javaType name="double" xmlType="xs:decimal" adapter="org.opentripplanner.ojp.util.DoubleXmlAdapter" />
</jxb:globalBindings>
</jxb:bindings>

Expand Down
13 changes: 3 additions & 10 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.opentripplanner</groupId>
<artifactId>ojp-java-model</artifactId>
<version>2.0.2</version>
<version>2.0.3-SNAPSHOT</version>

<name>ojp-java-model</name>
<description>Generates Java model from OJP xsds using jaxb.</description>
Expand Down Expand Up @@ -372,17 +372,10 @@
<version>${maven-release-plugin.version}</version>
<configuration>
<autoVersionSubmodules>true</autoVersionSubmodules>
<useReleaseProfile>false</useReleaseProfile>
<releaseProfiles>release,sign,!noPublicDeploy</releaseProfiles>
<releaseProfiles>release,sign</releaseProfiles>
<goals>deploy</goals>
<tagNameFormat>@{project.version}</tagNameFormat>
</configuration>
<dependencies>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-gitexe</artifactId>
<version>1.9.2</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down
21 changes: 21 additions & 0 deletions src/main/java/org/opentripplanner/ojp/util/DoubleXmlAdapter.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package org.opentripplanner.ojp.util;

import jakarta.xml.bind.annotation.adapters.XmlAdapter;
import java.math.BigDecimal;

/**
* {@code XmlAdapter} mapping xs:decimal to Java double
*
* @see jakarta.xml.bind.annotation.adapters.XmlAdapter
*/
public class DoubleXmlAdapter extends XmlAdapter<String, Double> {
@Override
public Double unmarshal(String stringValue) {
return stringValue != null ? Double.parseDouble(stringValue) : null;
}

@Override
public String marshal(Double value) {
return value != null ? value.toString() : null;
}
}