forked from airsonic-advanced/airsonic-advanced
-
Notifications
You must be signed in to change notification settings - Fork 14
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #549 from kagemomiji/issue548-fix-cxf-error
#548 Replace apache.cxf-core to patched version
- Loading branch information
Showing
4 changed files
with
356 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| #NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice. | ||
| #Mon Jul 22 14:00:40 UTC 2024 | ||
| cxf-core-4.0.5.pom>= | ||
| cxf-core-4.0.5.jar>= |
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,340 @@ | ||
| <?xml version="1.0"?> | ||
| <!-- | ||
| Licensed to the Apache Software Foundation (ASF) under one | ||
| or more contributor license agreements. See the NOTICE file | ||
| distributed with this work for additional information | ||
| regarding copyright ownership. The ASF licenses this file | ||
| to you under the Apache License, Version 2.0 (the | ||
| "License"); you may not use this file except in compliance | ||
| with the License. You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, | ||
| software distributed under the License is distributed on an | ||
| "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| KIND, either express or implied. See the License for the | ||
| specific language governing permissions and limitations | ||
| under the License. | ||
| --> | ||
| <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <artifactId>cxf-core</artifactId> | ||
| <packaging>bundle</packaging> | ||
| <name>Apache CXF Core</name> | ||
| <description>Apache CXF Core</description> | ||
| <url>https://cxf.apache.org</url> | ||
| <parent> | ||
| <groupId>org.apache.cxf</groupId> | ||
| <artifactId>cxf-parent</artifactId> | ||
| <version>4.0.5</version> | ||
| <relativePath>../parent/pom.xml</relativePath> | ||
| </parent> | ||
| <properties> | ||
| <cxf.module.name>org.apache.cxf.core</cxf.module.name> | ||
| <cxf.osgi.export> | ||
| !org.apache.cxf.internal, | ||
| META-INF.cxf, | ||
| org.apache.cxf.* | ||
| </cxf.osgi.export> | ||
| <cxf.osgi.import> | ||
| com.sun.xml.messaging.saaj.soap;resolution:=optional, | ||
| com.sun.xml.internal.messaging.saaj.soap;resolution:=optional, | ||
| com.ctc.wstx*;resolution:=optional, | ||
| org.codehaus.stax2*;resolution:=optional, | ||
| com.sun.msv*;resolution:=optional, | ||
| com.sun.tools*;resolution:=optional, | ||
| com.sun.xml*;resolution:=optional, | ||
| com.sun.codemodel.writer;resolution:=optional, | ||
| org.slf4j*;resolution:=optional;version="${cxf.osgi.slf4j.version}", | ||
| net.sf.cglib*;resolution:=optional;version="${cxf.cglib.osgi.version}", | ||
| org.springframework.aop*;resolution:=optional;version="${cxf.osgi.spring.version}", | ||
| org.springframework.beans*;resolution:=optional;version="${cxf.osgi.spring.version}", | ||
| org.springframework.context*;resolution:=optional;version="${cxf.osgi.spring.version}", | ||
| org.springframework.core*;resolution:=optional;version="${cxf.osgi.spring.version}", | ||
| org.springframework.util*;resolution:=optional;version="${cxf.osgi.spring.version}", | ||
| org.objectweb.asm*;resolution:=optional;version="${cxf.osgi.asm.version}", | ||
| jakarta.activation;version="${cxf.osgi.jakarta.activation.version}", | ||
| jakarta.annotation;version="${cxf.osgi.jakarta.annotation.version}", | ||
| jakarta.xml.ws*;version="${cxf.osgi.jakarta.xml.ws.version}", | ||
| jakarta.xml.bind*;version="${cxf.osgi.jakarta.bind.version}", | ||
| jakarta.validation*;resolution:=optional;version="${cxf.validation.api.package.version}", | ||
| !sun.misc | ||
| </cxf.osgi.import> | ||
| <cxf.osgi.dynamic.import> | ||
| org.apache.cxf.bus,org.apache.cxf.*,com.ctc.wstx.* | ||
| </cxf.osgi.dynamic.import> | ||
| </properties> | ||
| <dependencies> | ||
| <dependency> | ||
| <groupId>jakarta.annotation</groupId> | ||
| <artifactId>jakarta.annotation-api</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>jakarta.xml.ws</groupId> | ||
| <artifactId>jakarta.xml.ws-api</artifactId> | ||
| <optional>true</optional> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>junit</groupId> | ||
| <artifactId>junit</artifactId> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.mockito</groupId> | ||
| <artifactId>mockito-subclass</artifactId> | ||
| <version>${cxf.mockito.version}</version> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>jakarta.validation</groupId> | ||
| <artifactId>jakarta.validation-api</artifactId> | ||
| <optional>true</optional> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>${cxf.asm.groupId}</groupId> | ||
| <artifactId>${cxf.asm.artifactId}</artifactId> | ||
| <optional>true</optional> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>xml-resolver</groupId> | ||
| <artifactId>xml-resolver</artifactId> | ||
| <optional>true</optional> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.glassfish.jaxb</groupId> | ||
| <artifactId>jaxb-runtime</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.slf4j</groupId> | ||
| <artifactId>slf4j-api</artifactId> | ||
| <optional>true</optional> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.slf4j</groupId> | ||
| <artifactId>slf4j-jdk14</artifactId> | ||
| <optional>true</optional> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.slf4j</groupId> | ||
| <artifactId>jcl-over-slf4j</artifactId> | ||
| <optional>true</optional> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>cglib</groupId> | ||
| <artifactId>cglib-nodep</artifactId> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.fasterxml.woodstox</groupId> | ||
| <artifactId>woodstox-core</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.springframework</groupId> | ||
| <artifactId>spring-beans</artifactId> | ||
| <optional>true</optional> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.springframework</groupId> | ||
| <artifactId>spring-context</artifactId> | ||
| <optional>true</optional> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.springframework</groupId> | ||
| <artifactId>spring-aop</artifactId> | ||
| <scope>provided</scope> | ||
| <optional>true</optional> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.apache.ws.xmlschema</groupId> | ||
| <artifactId>xmlschema-core</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.eclipse.angus</groupId> | ||
| <artifactId>angus-activation</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.eclipse.angus</groupId> | ||
| <artifactId>angus-mail</artifactId> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.sun.xml.fastinfoset</groupId> | ||
| <artifactId>FastInfoset</artifactId> | ||
| <optional>true</optional> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>net.java.dev.msv</groupId> | ||
| <artifactId>msv-core</artifactId> | ||
| <optional>true</optional> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>jakarta.xml.bind</groupId> | ||
| <artifactId>jakarta.xml.bind-api</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.sun.xml.messaging.saaj</groupId> | ||
| <artifactId>saaj-impl</artifactId> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| </dependencies> | ||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.codehaus.mojo</groupId> | ||
| <artifactId>buildnumber-maven-plugin</artifactId> | ||
| <version>3.2.0</version> | ||
| <executions> | ||
| <execution> | ||
| <id>create-noncanonicalrev</id> | ||
| <goals> | ||
| <goal>create-timestamp</goal> | ||
| </goals> | ||
| <configuration> | ||
| <timestampFormat>'NON-CANONICAL_'yyyy-MM-dd_HH-mm_'${user.name}'</timestampFormat> | ||
| <timestampPropertyName>nonCanonicalRevision</timestampPropertyName> | ||
| </configuration> | ||
| </execution> | ||
| <execution> | ||
| <id>create-buildnumber</id> | ||
| <goals> | ||
| <goal>create</goal> | ||
| </goals> | ||
| <configuration> | ||
| <doCheck>false</doCheck> | ||
| <doUpdate>false</doUpdate> | ||
| <revisionOnScmFailure>${nonCanonicalRevision}</revisionOnScmFailure> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.apache.cxf</groupId> | ||
| <artifactId>cxf-xjc-plugin</artifactId> | ||
| <version>${cxf.xjc-utils.version}</version> | ||
| <executions> | ||
| <execution> | ||
| <id>generate-sources</id> | ||
| <phase>generate-sources</phase> | ||
| <goals> | ||
| <goal>xsdtojava</goal> | ||
| </goals> | ||
| <configuration> | ||
| <fork>${cxf.xjcplugin.forkmode}</fork> | ||
| <additionalJvmArgs>${cxf.xjc.jvmArgs}</additionalJvmArgs> | ||
| <extensions> | ||
| <extension>org.apache.cxf.xjcplugins:cxf-xjc-javadoc:${cxf.xjc-utils.version}</extension> | ||
| <extension>org.apache.cxf.xjcplugins:cxf-xjc-dv:${cxf.xjc-utils.version}</extension> | ||
| </extensions> | ||
| <sourceRoot>${basedir}/target/generated-sources/cxf-xjc-plugin</sourceRoot> | ||
| <xsdOptions> | ||
| <xsdOption> | ||
| <xsd>${basedir}/src/main/resources/schemas/wsdl/http.xsd</xsd> | ||
| <bindingFile>${basedir}/src/main/resources/schemas/wsdl/http.xjb</bindingFile> | ||
| <catalog>${basedir}/src/main/build-resources/catalog.cat</catalog> | ||
| <extensionArgs> | ||
| <extensionArg>-npa</extensionArg> | ||
| <extensionArg>-Xjavadoc</extensionArg> | ||
| </extensionArgs> | ||
| </xsdOption> | ||
| <xsdOption> | ||
| <xsd>${basedir}/src/main/resources/schemas/wsdl/ws-addr.xsd</xsd> | ||
| <packagename>org.apache.cxf.ws.addressing</packagename> | ||
| <extensionArgs> | ||
| <extensionArg>-Xjavadoc</extensionArg> | ||
| <extensionArg>-npa</extensionArg> | ||
| <extensionArg>-Xdv</extensionArg> | ||
| </extensionArgs> | ||
| </xsdOption> | ||
| <xsdOption> | ||
| <xsd>${basedir}/src/main/resources/schemas/wsdl/addressing.xsd</xsd> | ||
| <bindingFile>${basedir}/src/main/resources/schemas/wsdl/addressing.xjb</bindingFile> | ||
| <extensionArgs> | ||
| <extensionArg>-npa</extensionArg> | ||
| <extensionArg>-Xjavadoc</extensionArg> | ||
| <extensionArg>-Xdv</extensionArg> | ||
| </extensionArgs> | ||
| </xsdOption> | ||
| <xsdOption> | ||
| <xsd>${basedir}/src/main/resources/schemas/configuration/security.xsd</xsd> | ||
| <bindingFile>${basedir}/src/main/resources/schemas/configuration/security.xjb</bindingFile> | ||
| <catalog>${basedir}/src/main/build-resources/catalog.cat</catalog> | ||
| <extensionArgs> | ||
| <extensionArg>-npa</extensionArg> | ||
| <extensionArg>-Xdv</extensionArg> | ||
| <extensionArg>-Xjavadoc</extensionArg> | ||
| </extensionArgs> | ||
| </xsdOption> | ||
| <xsdOption> | ||
| <xsd>${basedir}/src/main/resources/schemas/wsdl/ws-addr-wsdl.xsd</xsd> | ||
| <bindingFile>${basedir}/src/main/resources/schemas/wsdl/ws-addr-wsdl.xjb</bindingFile> | ||
| <extension>true</extension> | ||
| <extensionArgs> | ||
| <extensionArg>-npa</extensionArg> | ||
| <extensionArg>-Xjavadoc</extensionArg> | ||
| <extensionArg>-Xdv</extensionArg> | ||
| </extensionArgs> | ||
| </xsdOption> | ||
| <xsdOption> | ||
| <xsd>${basedir}/src/main/resources/schemas/wsdl/addressing200403.xsd</xsd> | ||
| <bindingFile>${basedir}/src/main/resources/schemas/wsdl/addressing200403.xjb</bindingFile> | ||
| <extensionArgs> | ||
| <extensionArg>-Xjavadoc</extensionArg> | ||
| <extensionArg>-npa</extensionArg> | ||
| <extensionArg>-Xdv</extensionArg> | ||
| </extensionArgs> | ||
| </xsdOption> | ||
| </xsdOptions> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| </plugins> | ||
| <pluginManagement> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-javadoc-plugin</artifactId> | ||
| <configuration> | ||
| <detectOfflineLinks>false</detectOfflineLinks> | ||
| <header>Apache CXF API</header> | ||
| <footer>Apache CXF API</footer> | ||
| </configuration> | ||
| </plugin> | ||
| </plugins> | ||
| </pluginManagement> | ||
| </build> | ||
|
|
||
| <profiles> | ||
| <profile> | ||
| <id>before-jdk14</id> | ||
| <activation> | ||
| <jdk>(,14)</jdk> | ||
| </activation> | ||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.codehaus.mojo</groupId> | ||
| <artifactId>build-helper-maven-plugin</artifactId> | ||
| <executions> | ||
| <execution> | ||
| <phase>generate-test-sources</phase> | ||
| <goals> | ||
| <goal>add-test-source</goal> | ||
| </goals> | ||
| <configuration> | ||
| <sources> | ||
| <source>${project.basedir}/src/test/java8</source> | ||
| </sources> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| </profile> | ||
| </profiles> | ||
| </project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <metadata> | ||
| <groupId>org.apache.cxf</groupId> | ||
| <artifactId>cxf-core</artifactId> | ||
| <versioning> | ||
| <release>4.0.5</release> | ||
| <versions> | ||
| <version>4.0.5</version> | ||
| </versions> | ||
| <lastUpdated>20240722140038</lastUpdated> | ||
| </versioning> | ||
| </metadata> |