Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes for JDK11

This commit is contained in:
Martin Stockhammer 2019-09-01 11:18:11 +02:00
parent 36249f6646
commit f39fc917a8
4 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/enunciate/enunciate.xml
View File

@ -17,12 +17,10 @@
~ specific language governing permissions and limitations ~ specific language governing permissions and limitations
~ under the License. ~ under the License.
--> -->
<enunciate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://enunciate.webcohesion.com/schemas/enunciate-2.0.0.xsd"> <enunciate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/stoicflame/enunciate/v2.12.0/top/src/main/resources/META-INF/enunciate-2.2.0.xsd" >
<services>
<rest defaultRestSubcontext="restServices"/>
</services>
<title>Apache Archiva REST API</title>
<modules> <modules>
<cxf disabled="false"/> <cxf disabled="false"/>
@ -32,12 +30,16 @@
<obj-c disabled="true"/> <obj-c disabled="true"/>
<jaxws-ri disabled="true"/> <jaxws-ri disabled="true"/>
<jaxws-support disabled="true"/> <jaxws-support disabled="true"/>
<jaxrs>
<application path="restServices"/>
</jaxrs>
<docs disabled="false" title="Apache Archiva REST API" includeExampleXml="true" includeExampleJson="true" <docs disabled="false"
includeDefaultDownloads="false" docsSubdir="" freemarkerTemplate="${project.basedir}/src/enunciate/archiva.fmt" css="${project.basedir}/src/enunciate/archiva.css" > docsSubdir="" freemarkerTemplate="${project.basedir}/src/enunciate/archiva.fmt" css="${project.basedir}/src/enunciate/archiva.css" >
<!--<war docsDir="apidocs" />--> <!--<war docsDir="apidocs" />-->
</docs> </docs>
</modules> </modules>
</enunciate> </enunciate>

2
archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/BrowseServiceTest.java
View File

@ -376,11 +376,13 @@ public class BrowseServiceTest
// START SNIPPET: get-artifacts-by-property // START SNIPPET: get-artifacts-by-property
BrowseService browseService = getBrowseService( authorizationHeader, true ); BrowseService browseService = getBrowseService( authorizationHeader, true );
tryAssert( ( ) -> {
List<Artifact> artifactDownloadInfos = List<Artifact> artifactDownloadInfos =
browseService.getArtifactsByProperty( "org.name", "The Apache Software Foundation", TEST_REPO_ID ); browseService.getArtifactsByProperty( "org.name", "The Apache Software Foundation", TEST_REPO_ID );
assertThat( artifactDownloadInfos ).isNotNull( ).isNotEmpty( ).hasSize( 7 ); assertThat( artifactDownloadInfos ).isNotNull( ).isNotEmpty( ).hasSize( 7 );
// END SNIPPET: get-artifacts-by-property // END SNIPPET: get-artifacts-by-property
} );
} }

2
archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessorTest.java
View File

@ -132,7 +132,7 @@ public class NewArtifactsRssFeedProcessorTest
assertEquals( entries.size(), 1 ); assertEquals( entries.size(), 1 );
assertTrue( assertTrue(
entries.get( 0 ).getTitle().contains( "New Artifacts in Repository 'test-repo' as of " )); entries.get( 0 ).getTitle().contains( "New Artifacts in Repository 'test-repo' as of " ));
assertTrue( entries.get( 0 ).getPublishedDate().toInstant().equals( whenGathered.toInstant() ) ); assertTrue( entries.get( 0 ).getPublishedDate().toInstant().truncatedTo( ChronoUnit.MILLIS ).equals( whenGathered.toInstant().truncatedTo( ChronoUnit.MILLIS ) ) );
} }
private ArtifactMetadata createArtifact( String artifactId, String version, ZonedDateTime whenGathered ) private ArtifactMetadata createArtifact( String artifactId, String version, ZonedDateTime whenGathered )

20
archiva-modules/archiva-web/archiva-web-common/src/enunciate/enunciate.xml
View File

@ -17,14 +17,17 @@
~ specific language governing permissions and limitations ~ specific language governing permissions and limitations
~ under the License. ~ under the License.
--> -->
<enunciate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://enunciate.webcohesion.com/schemas/enunciate-2.0.0.xsd"> <enunciate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/stoicflame/enunciate/v2.12.0/top/src/main/resources/META-INF/enunciate-2.2.0.xsd">
<services>
<rest defaultRestSubcontext="archivaUiServices"/>
</services>
<title>Archiva UI Rest API</title>
<modules> <modules>
<jaxrs>
<application path="archivaUiServices" />
</jaxrs>
<cxf disabled="false"/> <cxf disabled="false"/>
<jersey disabled="true"/> <jersey disabled="true"/>
<c disabled="true"/> <c disabled="true"/>
@ -32,9 +35,12 @@
<obj-c disabled="true"/> <obj-c disabled="true"/>
<jaxws-ri disabled="true"/> <jaxws-ri disabled="true"/>
<jaxws-support disabled="true"/> <jaxws-support disabled="true"/>
<jaxon1 disabled="true"/>
<docs disabled="false" title="Apache Archiva UI REST API" includeExampleXml="true" includeExampleJson="true" <docs disabled="false"
includeDefaultDownloads="false" docsSubdir="" freemarkerTemplate="${project.basedir}/src/enunciate/archiva.fmt" css="${project.basedir}/src/enunciate/archiva.css"> docsSubdir=""
freemarkerTemplate="${project.basedir}/src/enunciate/archiva.fmt"
css="${project.basedir}/src/enunciate/archiva.css">
<!-- <war docsDir="apidocs" />--> <!-- <war docsDir="apidocs" />-->
</docs> </docs>