Skip to content

Commit

Permalink
Merge pull request #1 from BandwidthOnDemand/release-3.x
Browse files Browse the repository at this point in the history 
Release 3.x
  • Loading branch information
@erikrozendaal
erikrozendaal authored Oct 21, 2024
2 parents 8f1bc44 + 4985dd9 commit 281c7aa
Show file tree
Hide file tree
Showing 18 changed files with 209 additions and 254 deletions.
35 changes: 35 additions & 0 deletions .github/workflows/maven.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven

# This workflow uses actions that are not certified by GitHub.
# They are provided by a third-party and are governed by
# separate terms of service, privacy policy, and support
# documentation.

name: Java CI with Maven

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

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
java-version: '21'
distribution: 'temurin'
cache: maven
- name: Build with Maven
run: mvn -B package --file pom.xml

# Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
- name: Update dependency graph
uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6
2 changes: 1 addition & 1 deletion .java-version
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.8
21
3 changes: 2 additions & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# BoD NSI
This project contains the (wsimport/jaxws) generated java classes for the NSI (1.0_sc and 2.0) wsdl files.
This project contains the (wsimport) generated java classes for the NSI 2.0 wsdl files.

The NSI v1.0_sc wsdl documents are still present, but no code is generated for these as they are no longer used.
204 changes: 54 additions & 150 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,90 +4,100 @@
<groupId>nl.surfnet.bod</groupId>
<artifactId>bod-nsi</artifactId>
<packaging>jar</packaging>
<version>2.1.6-SNAPSHOT</version>
<version>3.0.0</version>
<name>bod-nsi</name>
<scm>
<connection>scm:git:[email protected]:BandwidthOnDemand/bod-nsi.git</connection>
<developerConnection>scm:git:[email protected]:BandwidthOnDemand/bod-nsi.git</developerConnection>
<url>https://github.com/BandwidthOnDemand/bod-nsi</url>
<tag>bod-nsi-2.1.5</tag>
</scm>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>
<jaxb.generated.sources>${project.build.directory}/generated-sources/wsdl</jaxb.generated.sources>
<jaxb-tools.version>4.0.8</jaxb-tools.version>
</properties>
<dependencies>
<dependency>
<groupId>org.jvnet.jaxb2_commons</groupId>
<artifactId>jaxb2-basics</artifactId>
<version>0.6.4</version>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>3.0.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.5</version>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>4.0.2</version>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.11.0</version>
<groupId>jakarta.xml.ws</groupId>
<artifactId>jakarta.xml.ws-api</artifactId>
<version>4.0.2</version>
</dependency>
<dependency>
<groupId>org.jvnet.jaxb</groupId>
<artifactId>jaxb-plugins-runtime</artifactId>
<version>${jaxb-tools.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.21</version>
<version>2.0.16</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<version>5.11.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<version>1.3</version>
<version>3.0</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.jvnet.jax-ws-commons</groupId>
<groupId>com.sun.xml.ws</groupId>
<artifactId>jaxws-maven-plugin</artifactId>
<version>2.3</version>
<version>4.0.3</version>
<configuration>
<!-- Needed with JAXP 1.5 -->
<vmArgs>
<vmArg>-Djavax.xml.accessExternalSchema=all</vmArg>
</vmArgs>
<!-- Same as XJC below to avoid duplicate class errors -->
<sourceDestDir>${jaxb.generated.sources}</sourceDestDir>
<quiet>true</quiet>
<verbose>false</verbose>
<keep>true</keep>
<xnocompile>true</xnocompile>
<xadditionalHeaders>true</xadditionalHeaders>
<xdebug>false</xdebug>
<xnocompile>true</xnocompile>
<wsdlDirectory>${basedir}/src/main/resources/wsdl</wsdlDirectory>
<bindingFiles>
<bindingFile>${project.basedir}/src/main/resources/schema-bindings.xjb</bindingFile>
<bindingFile>${basedir}/src/main/resources/wsdl/2.0/gnsbod.xsd</bindingFile>
<bindingFile>${basedir}/src/main/resources/wsdl/2.0/ogf_nsi_discovery_nsa_v1_0.xsd</bindingFile>
<bindingFile>${basedir}/src/main/resources/wsdl/2.0/ogf_nsi_services_p2p_v2_0.xsd</bindingFile>
<bindingFile>${basedir}/src/main/resources/wsdl/2.0/ogf_nsi_services_types_v2_0.xsd</bindingFile>
<bindingFile>${basedir}/src/main/resources/wsdl/2.0/ogf_nsi_services_definition_v2_0.xsd</bindingFile>
<bindingFile>${basedir}/src/main/resources/wsdl/2.0/ogf_nsi_path_trace_2015_04_30.xsd</bindingFile>
<bindingFile>${basedir}/src/main/resources/wsdl/soap/soap-envelope-1.1.xsd</bindingFile>
<bindingFile>${basedir}/src/main/resources/xsd/nmlbase.xsd</bindingFile>
<bindingFile>${basedir}/src/main/resources/xsd/nsi-ext.xsd</bindingFile>
<bindingFile>${basedir}/src/main/resources/xsd/pce-messages.xsd</bindingFile>
</bindingFiles>
<xjcArgs>
<xjcArg>-mark-generated</xjcArg>
<xjcArg>-Xfluent-api</xjcArg>
<xjcArg>-XtoString</xjcArg>
<xjcArg>-Xequals</xjcArg>
<xjcArg>-XhashCode</xjcArg>
<xjcArg>-XtoString</xjcArg>
<xjcArg>-Xcopyable</xjcArg>
<xjcArg>-Xfluent-api</xjcArg>
<xjcArg>-Xnamespace-prefix</xjcArg>
<xjcArg>-Xinheritance</xjcArg>
</xjcArgs>
</configuration>
<dependencies>
<dependency>
<groupId>org.jvnet.jaxb2_commons</groupId>
<artifactId>jaxb2-basics</artifactId>
<version>0.6.4</version>
</dependency>
<dependency>
<groupId>org.jvnet.jaxb2_commons</groupId>
<artifactId>jaxb2-fluent-api</artifactId>
<version>3.0</version>
<groupId>org.jvnet.jaxb</groupId>
<artifactId>jaxb-plugins</artifactId>
<version>${jaxb-tools.version}</version>
</dependency>
</dependencies>
<executions>
Expand All @@ -98,107 +108,32 @@
</goals>
<configuration>
<wsdlFiles>
<wsdlFile>2.0/ogf_nsi_connection_requester_v2_0.wsdl</wsdlFile>
<wsdlFile>2.0/ogf_nsi_connection_requester_v2_0.wsdl</wsdlFile>>
<wsdlFile>2.0/ogf_nsi_connection_provider_v2_0.wsdl</wsdlFile>
</wsdlFiles>
</configuration>
</execution>
</executions>
</plugin>
<!-- Must run *after* wsimport so that XJC applies bindings from
`schema-bindings.xjc` on schemas that are also references
by WSDLs.
Because wsimport and jaxb generate to the same output folder
to prevent duplicate classes, it is important that the output
packages is preserved by jaxb. Because XJC may generate different
output based on the given bindings, the jaxb generation is
forced. -->
<plugin>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin</artifactId>
<version>0.11.0</version>
<executions>
<execution>
<goals>
<goal>generate</goal>
</goals>
<configuration>
<!-- Same as wsimport above to avoid duplicate class errors -->
<generateDirectory>${jaxb.generated.sources}</generateDirectory>
<cleanPackageDirectories>false</cleanPackageDirectories>
<forceRegenerate>true</forceRegenerate>
<bindingDirectory>src/main/resources</bindingDirectory>
<bindingIncludes>
<bindingInclude>schema-bindings.xjc</bindingInclude>
</bindingIncludes>
<schemaIncludes>
<include>wsdl/2.0/gnsbod.xsd</include>
<include>wsdl/2.0/ogf_nsi_discovery_nsa_v1_0.xsd</include>
<include>wsdl/2.0/ogf_nsi_services_p2p_v2_0.xsd</include>
<include>wsdl/2.0/ogf_nsi_services_types_v2_0.xsd</include>
<include>wsdl/2.0/ogf_nsi_services_definition_v2_0.xsd</include>
<include>wsdl/2.0/ogf_nsi_framework_types_v2_0.xsd</include>
<include>wsdl/2.0/ogf_nsi_framework_headers_v2_0.xsd</include>
<include>wsdl/2.0/ogf_nsi_connection_types_v2_0.xsd</include>
<include>wsdl/2.0/ogf_nsi_path_trace_2015_04_30.xsd</include>
<include>wsdl/2.0/saml-schema-assertion-2.0.xsd</include>
<include>wsdl/2.0/xenc-schema.xsd</include>
<include>wsdl/2.0/xmldsig-core-schema.xsd</include>
<include>wsdl/soap/soap-envelope-1.1.xsd</include>
<include>xsd/nmlbase.xsd</include>
<include>xsd/nsi-ext.xsd</include>
<include>xsd/pce-messages.xsd</include>
</schemaIncludes>
<args>
<arg>-Xfluent-api</arg>
<arg>-Xequals</arg>
<arg>-XhashCode</arg>
<arg>-XtoString</arg>
<arg>-Xinheritance</arg>
<arg>-Xnamespace-prefix</arg>
</args>
<markGenerated>true</markGenerated>
<plugins>
<plugin>
<groupId>org.jvnet.jaxb2_commons</groupId>
<artifactId>jaxb2-basics</artifactId>
<version>0.6.4</version>
</plugin>
<plugin>
<groupId>org.jvnet.jaxb2_commons</groupId>
<artifactId>jaxb2-fluent-api</artifactId>
<version>3.0</version>
</plugin>
<plugin>
<groupId>org.jvnet.jaxb2_commons</groupId>
<artifactId>jaxb2-namespace-prefix</artifactId>
<version>1.1</version>
</plugin>
</plugins>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.9.0</version>
<version>3.13.0</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<source>21</source>
<target>21</target>
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>3.0.0-M5</version>
<version>3.1.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.2.0</version>
<version>3.3.1</version>
<executions>
<execution>
<id>attach-sources</id>
Expand All @@ -208,49 +143,18 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.2.0</version>
<executions>
<execution>
<phase>validate</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/endorsed</outputDirectory>
<silent>true</silent>
<artifactItems>
<artifactItem>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.2.4</version>
<type>jar</type>
</artifactItem>
<artifactItem>
<groupId>javax.xml.ws</groupId>
<artifactId>jaxws-api</artifactId>
<version>2.2.8</version>
<type>jar</type>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.3.1</version>
<version>3.10.0</version>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>3.0.0-M2</version>
<version>3.1.3</version>
</plugin>
</plugins>
</build>
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/ietf/params/xml/ns/vcard4_0/FormattedNameType.java
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package ietf.params.xml.ns.vcard4_0;

import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlRootElement;

@XmlAccessorType(XmlAccessType.FIELD)
@XmlRootElement(name = "fn")
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/ietf/params/xml/ns/vcard4_0/NameType.java
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package ietf.params.xml.ns.vcard4_0;

import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlRootElement;

@XmlAccessorType(XmlAccessType.FIELD)
@XmlRootElement(name = "n")
Expand All @@ -28,4 +28,4 @@ public String getSurname() {
public String getGiven() {
return given;
}
}
}
6 changes: 3 additions & 3 deletions src/main/java/ietf/params/xml/ns/vcard4_0/ObjectFactory.java
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package ietf.params.xml.ns.vcard4_0;

import javax.xml.bind.JAXBElement;
import javax.xml.bind.annotation.XmlElementDecl;
import javax.xml.bind.annotation.XmlRegistry;
import jakarta.xml.bind.JAXBElement;
import jakarta.xml.bind.annotation.XmlElementDecl;
import jakarta.xml.bind.annotation.XmlRegistry;
import javax.xml.namespace.QName;

@XmlRegistry
Expand Down
Loading

0 comments on commit 281c7aa

Please sign in to comment.