Java Version für Build auf 17, pom einfacher gestaltet, Version 11 Klassen neu generiert
This commit is contained in:
@@ -21,11 +21,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
|
||||
<bindings.location>${basedir}${bindings.location.rel}</bindings.location>
|
||||
<wsdl.location>src/main/resources/def/${currentReleaseDir}/${wsdl.name}</wsdl.location>
|
||||
|
||||
<jdk.version>1.8</jdk.version>
|
||||
<maven.compiler.source>${jdk.version}</maven.compiler.source>
|
||||
<maven.compiler.target>${jdk.version}</maven.compiler.target>
|
||||
|
||||
<cxf.version>3.5.7</cxf.version>
|
||||
<maven.compiler.release>17</maven.compiler.release>
|
||||
<cxf.version>3.6.2</cxf.version>
|
||||
</properties>
|
||||
|
||||
<build>
|
||||
@@ -36,68 +33,58 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
|
||||
<artifactId>cxf-codegen-plugin</artifactId>
|
||||
<version>${cxf.version}</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-help-plugin</artifactId>
|
||||
<version>2.2</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-source-plugin</artifactId>
|
||||
<version>2.0.4</version>
|
||||
<version>3.3.0</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<version>2.3.2</version>
|
||||
<version>3.12.1</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-assembly-plugin</artifactId>
|
||||
<version>3.1.0</version>
|
||||
<version>3.6.0</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-javadoc-plugin</artifactId>
|
||||
<version>3.0.1</version>
|
||||
<version>3.6.3</version>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</pluginManagement>
|
||||
|
||||
<plugins>
|
||||
<plugin>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-help-plugin</artifactId>
|
||||
<artifactId>maven-assembly-plugin</artifactId>
|
||||
<configuration>
|
||||
<descriptors>
|
||||
<descriptor>assembly.xml</descriptor>
|
||||
</descriptors>
|
||||
</configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>make-assembly</id> <!-- this is used for inheritance merges -->
|
||||
<phase>install</phase> <!-- bind to the install phase, damit source-jar und javadoc-jar mit eingepackt werden -->
|
||||
<goals>
|
||||
<goal>single</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-assembly-plugin</artifactId>
|
||||
<configuration>
|
||||
<descriptors>
|
||||
<descriptor>assembly.xml</descriptor>
|
||||
</descriptors>
|
||||
</configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>make-assembly</id> <!-- this is used for inheritance merges -->
|
||||
<phase>install</phase> <!-- bind to the install phase, damit source-jar und javadoc-jar mit eingepackt werden -->
|
||||
<goals>
|
||||
<goal>single</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<configuration>
|
||||
<verbose>true</verbose>
|
||||
<fork>true</fork>
|
||||
<compilerVersion>${jdk.version}</compilerVersion>
|
||||
<source>${jdk.version}</source>
|
||||
<target>${jdk.version}</target>
|
||||
<encoding>UTF-8</encoding>
|
||||
<!-- <fork>true</fork>-->
|
||||
<!-- <compilerVersion>${jdk.version}</compilerVersion>-->
|
||||
<!-- <source>${jdk.version}</source>-->
|
||||
<!-- <target>${jdk.version}</target>-->
|
||||
<!-- <encoding>UTF-8</encoding>-->
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
@@ -114,7 +101,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
|
||||
<!-- <Revision>${SVN_REVISION}</Revision>-->
|
||||
<!-- <BuildTag>${BUILD_TAG}</BuildTag>-->
|
||||
<BuildTimestamp>${maven.build.timestamp}</BuildTimestamp>
|
||||
<JDKVersion>${jdk.version}</JDKVersion>
|
||||
<JDKVersion>${maven.compiler.release}</JDKVersion>
|
||||
</manifestEntries>
|
||||
</archive>
|
||||
</configuration>
|
||||
@@ -158,6 +145,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
|
||||
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
<dependencyManagement>
|
||||
<dependencies>
|
||||
<!-- CFX Start -->
|
||||
@@ -184,8 +172,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
|
||||
<artifactId>cxf-rt-transports-http</artifactId>
|
||||
<version>${cxf.version}</version>
|
||||
</dependency>
|
||||
<!-- Jetty is needed if you're are not using the CXFServlet -->
|
||||
|
||||
<dependency>
|
||||
<!-- Jetty is needed if you're not using the CXFServlet -->
|
||||
<groupId>org.apache.cxf</groupId>
|
||||
<artifactId>cxf-rt-transports-http-jetty</artifactId>
|
||||
<version>${cxf.version}</version>
|
||||
@@ -204,14 +193,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
|
||||
</dependency>
|
||||
|
||||
<!-- CFX Ende -->
|
||||
<dependency>
|
||||
<groupId>junit</groupId>
|
||||
<artifactId>junit</artifactId>
|
||||
<version>3.8.2</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</dependencyManagement>
|
||||
|
||||
<dependencies>
|
||||
|
||||
<!-- CFX Start -->
|
||||
@@ -234,8 +218,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
|
||||
<groupId>org.apache.cxf</groupId>
|
||||
<artifactId>cxf-rt-transports-http</artifactId>
|
||||
</dependency>
|
||||
<!-- Jetty is needed if you're are not using the CXFServlet -->
|
||||
|
||||
<dependency>
|
||||
<!-- Jetty is needed if you're not using the CXFServlet -->
|
||||
<groupId>org.apache.cxf</groupId>
|
||||
<artifactId>cxf-rt-transports-http-jetty</artifactId>
|
||||
</dependency>
|
||||
@@ -246,8 +231,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.apache.cxf</groupId>
|
||||
<artifactId>cxf-rt-features-logging</artifactId>
|
||||
<groupId>org.apache.cxf</groupId>
|
||||
<artifactId>cxf-rt-features-logging</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- CFX Ende -->
|
||||
@@ -270,7 +255,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
|
||||
|
||||
|
||||
<profiles>
|
||||
|
||||
<!-- Spezielles Profil um Java-Code fuer die VU-Schnittstelle aus dem WSDL zu generieren -->
|
||||
<profile>
|
||||
<id>genJavaFromWsdl_VU</id>
|
||||
@@ -297,76 +281,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
|
||||
<id>generate-sources</id>
|
||||
<phase>generate-sources</phase>
|
||||
<configuration>
|
||||
<sourceRoot>${target.generation.path}</sourceRoot>
|
||||
<wsdlOptions>
|
||||
<wsdlOption>
|
||||
<wsdl>${wsdl.location}</wsdl>
|
||||
<extendedSoapHeaders>true</extendedSoapHeaders>
|
||||
|
||||
<!-- wsdl/jaxb Binding wie der Code generiert werden soll -->
|
||||
<bindingFiles>
|
||||
<bindingFile>${bindings.location}/omds20Types_binding.xml</bindingFile>
|
||||
<bindingFile>${bindings.location}/omdsServiceTypes_binding.xml</bindingFile>
|
||||
<bindingFile>${bindings.location}/omdsCommonServiceTypes_binding.xml</bindingFile>
|
||||
<bindingFile>${bindings.location}/omds3_ON1_Basisfunktionen_binding.xml</bindingFile>
|
||||
<bindingFile>${bindings.location}/omds3_ON2_Antrag_Common_binding.xml</bindingFile>
|
||||
<bindingFile>${bindings.location}/omds3_ON2_Antrag_Kfz_binding.xml</bindingFile>
|
||||
<bindingFile>${bindings.location}/omds3_ON2_Antrag_SachPrivat_binding.xml</bindingFile>
|
||||
<bindingFile>${bindings.location}/omds3_ON2_Antrag_Unfall_binding.xml</bindingFile>
|
||||
<bindingFile>${bindings.location}/omds3_ON2_Antrag_Leben_binding.xml</bindingFile>
|
||||
<bindingFile>${bindings.location}/omds3_ON2_Antrag_Kranken_binding.xml</bindingFile>
|
||||
<bindingFile>${bindings.location}/omds3_ON2_Antrag_RS_binding.xml</bindingFile>
|
||||
<bindingFile>${bindings.location}/omds3_ON7_Schaden_binding.xml</bindingFile>
|
||||
<bindingFile>${bindings.location}/${wsdl.binding.xml}</bindingFile>
|
||||
</bindingFiles>
|
||||
|
||||
<!-- you can set the options of wsdl2java command by using the <extraargs> -->
|
||||
<extraargs>
|
||||
<!-- <extraarg>-v</extraarg> zeige Versionsnummer dieses Tools -->
|
||||
<extraarg>-impl</extraarg><!-- Implementation -->
|
||||
<extraarg>-validate</extraarg>
|
||||
<extraarg>-client</extraarg><!-- Auch Ansatzpunkt fuer Client generieren -->
|
||||
<extraarg>-verbose</extraarg>
|
||||
<extraarg>-mark-generated</extraarg><!-- Markiere Klassen als generiert -->
|
||||
</extraargs>
|
||||
</wsdlOption>
|
||||
</wsdlOptions>
|
||||
</configuration>
|
||||
<goals>
|
||||
<goal>wsdl2java</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</profile>
|
||||
|
||||
<profile>
|
||||
<id>genJavaFromWsdl_Broker</id>
|
||||
<activation>
|
||||
<activeByDefault>false</activeByDefault>
|
||||
<property>
|
||||
<name>codeGen</name>
|
||||
</property>
|
||||
</activation>
|
||||
<properties>
|
||||
<wsdl.name>omds3ServicesBroker.wsdl</wsdl.name>
|
||||
<wsdl.binding.xml>wsdl_broker_binding.xml</wsdl.binding.xml>
|
||||
</properties>
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.cxf</groupId>
|
||||
<artifactId>cxf-codegen-plugin</artifactId>
|
||||
<configuration>
|
||||
<additionalJvmArgs>-Djavax.xml.accessExternalSchema=all</additionalJvmArgs>
|
||||
</configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>generate-sources</id>
|
||||
<phase>generate-sources</phase>
|
||||
<configuration>
|
||||
<sourceRoot>${target.generation.path}</sourceRoot>
|
||||
<wsdlOptions>
|
||||
<wsdlOption>
|
||||
@@ -378,6 +292,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
|
||||
<bindingFile>${bindings.location}/omds20Types_binding.xml</bindingFile>
|
||||
<bindingFile>${bindings.location}/omdsServiceTypes_binding.xml</bindingFile>
|
||||
<bindingFile>${bindings.location}/omdsCommonServiceTypes_binding.xml</bindingFile>
|
||||
<bindingFile>${bindings.location}/omds3_ON1_Basisfunktionen_binding.xml</bindingFile>
|
||||
<bindingFile>${bindings.location}/omds3_ON2_Antrag_Common_binding.xml</bindingFile>
|
||||
<bindingFile>${bindings.location}/omds3_ON2_Antrag_Kfz_binding.xml</bindingFile>
|
||||
<bindingFile>${bindings.location}/omds3_ON2_Antrag_SachPrivat_binding.xml</bindingFile>
|
||||
<bindingFile>${bindings.location}/omds3_ON2_Antrag_Unfall_binding.xml</bindingFile>
|
||||
<bindingFile>${bindings.location}/omds3_ON2_Antrag_Leben_binding.xml</bindingFile>
|
||||
<bindingFile>${bindings.location}/omds3_ON2_Antrag_Kranken_binding.xml</bindingFile>
|
||||
<bindingFile>${bindings.location}/omds3_ON2_Antrag_RS_binding.xml</bindingFile>
|
||||
<bindingFile>${bindings.location}/omds3_ON7_Schaden_binding.xml</bindingFile>
|
||||
<bindingFile>${bindings.location}/${wsdl.binding.xml}</bindingFile>
|
||||
</bindingFiles>
|
||||
@@ -389,6 +311,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
|
||||
<extraarg>-validate</extraarg>
|
||||
<extraarg>-client</extraarg><!-- Auch Ansatzpunkt fuer Client generieren -->
|
||||
<extraarg>-verbose</extraarg>
|
||||
<extraarg>-mark-generated</extraarg><!-- Markiere Klassen als generiert -->
|
||||
</extraargs>
|
||||
</wsdlOption>
|
||||
</wsdlOptions>
|
||||
@@ -403,7 +326,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
|
||||
</build>
|
||||
</profile>
|
||||
|
||||
|
||||
</profiles>
|
||||
</profiles>
|
||||
|
||||
</project>
|
||||
|
||||
Reference in New Issue
Block a user