jomu/shared
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases 7 Activity

started to fix sharepoint API under JDK11

Browse Source
This commit is contained in:
Joern Muehlencord
2019-06-17 14:21:11 +02:00
parent 6829b65a2f
commit 96892cf8f9
4 changed files with 70 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pom.xml
View File

@ -269,9 +269,10 @@
<version>3.0.1</version> <version>3.0.1</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <!-- switched to com.helger.maven - need to revert back to org.codehaus.mojo when jaxws-maven-plugin with JDK11 support has been released -->
<groupId>com.helger.maven</groupId>
<artifactId>jaxws-maven-plugin</artifactId> <artifactId>jaxws-maven-plugin</artifactId>
<version>2.5</version> <version>2.6.1</version>
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-release-plugin</artifactId> <artifactId>maven-release-plugin</artifactId>

64
sharepoint/api/pom.xml
View File

@ -19,7 +19,7 @@
<plugins> <plugins>
<!-- convert wsdl to object --> <!-- convert wsdl to object -->
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>com.helger.maven</groupId>
<artifactId>jaxws-maven-plugin</artifactId> <artifactId>jaxws-maven-plugin</artifactId>
<configuration> <configuration>
<sourceDestDir>${project.build.directory}/generated-sources/jaxws-wsimport</sourceDestDir> <sourceDestDir>${project.build.directory}/generated-sources/jaxws-wsimport</sourceDestDir>
@ -160,6 +160,28 @@
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
<dependencies>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>1.3.2</version>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.3.1</version>
</dependency>
<dependency>
<groupId>javax.xml.ws</groupId>
<artifactId>jaxws-api</artifactId>
<version>2.3.1</version>
</dependency>
<dependency>
<groupId>javax.jws</groupId>
<artifactId>javax.jws-api</artifactId>
<version>1.1</version>
</dependency>
</dependencies>
</plugin> </plugin>
<!-- Maven jaxb2 plugin - invoke the xjc compiler to compile XML schema into Java classes. --> <!-- Maven jaxb2 plugin - invoke the xjc compiler to compile XML schema into Java classes. -->
@ -168,7 +190,7 @@
<artifactId>jaxb2-maven-plugin</artifactId> <artifactId>jaxb2-maven-plugin</artifactId>
<configuration> <configuration>
<quiet>false</quiet> <quiet>false</quiet>
<verbose>false</verbose> <verbose>true</verbose>
<clearOutputDir>false</clearOutputDir> <!-- do not set to true, multiple executions into same dir --> <clearOutputDir>false</clearOutputDir> <!-- do not set to true, multiple executions into same dir -->
</configuration> </configuration>
@ -186,7 +208,8 @@
<outputDirectory>${project.build.directory}/generated-sources/jaxb/</outputDirectory> <outputDirectory>${project.build.directory}/generated-sources/jaxb/</outputDirectory>
<removeOldOutput>true</removeOldOutput> <removeOldOutput>true</removeOldOutput>
<sources> <sources>
<source>${basedir}/src/main/resources/xsd/batch.xsd</source> <source>src/main/resources/xsd/dummy.xsd</source>
<source>src/main/resources/xsd/batch.xsd</source>
</sources> </sources>
</configuration> </configuration>
</execution> </execution>
@ -230,6 +253,18 @@
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
<dependencies>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-xjc</artifactId>
<version>2.3.2</version>
</dependency>
<dependency>
<groupId>com.sun.activation</groupId>
<artifactId>jakarta.activation</artifactId>
<version>1.2.1</version>
</dependency>
</dependencies>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
@ -256,5 +291,28 @@
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-log4j12</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<!-- javax libraries removed from JDK9 and later -->
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.3.1</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
<version>2.3.0</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>2.3.2</version>
</dependency>
<dependency>
<groupId>com.sun.activation</groupId>
<artifactId>jakarta.activation</artifactId>
<version>1.2.1</version>
</dependency>
</dependencies> </dependencies>
</project> </project>

2
sharepoint/mock/pom.xml
View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>de.muehlencord.shared</groupId> <groupId>de.muehlencord.shared</groupId>
<artifactId>shared-sharepoint</artifactId> <artifactId>shared-sharepoint</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.2-SNAPSHOT</version>
</parent> </parent>
<groupId>de.muehlencord.shared.sharepoint</groupId> <groupId>de.muehlencord.shared.sharepoint</groupId>
<artifactId>sharepoint-mock</artifactId> <artifactId>sharepoint-mock</artifactId>

1
sharepoint/pom.xml
View File

@ -4,6 +4,7 @@
<parent> <parent>
<groupId>de.muehlencord</groupId> <groupId>de.muehlencord</groupId>
<artifactId>shared</artifactId> <artifactId>shared</artifactId>
<version>1.2-SNAPSHOT</version>
</parent> </parent>
<groupId>de.muehlencord.shared</groupId> <groupId>de.muehlencord.shared</groupId>
<artifactId>shared-sharepoint</artifactId> <artifactId>shared-sharepoint</artifactId>