This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva.git
The following commit(s) were added to refs/heads/master by this push:
new f39fc91 Fixes for JDK11
f39fc91 is described below
commit f39fc917a8b87f4437095ef7d2d26c6344911e07
Author: Martin Stockhammer <[email protected]>
AuthorDate: Sun Sep 1 11:18:11 2019 +0200
Fixes for JDK11
---
.../archiva-rest-api/src/enunciate/enunciate.xml | 16 ++++++++-------
.../archiva/rest/services/BrowseServiceTest.java | 10 +++++----
.../NewArtifactsRssFeedProcessorTest.java | 2 +-
.../archiva-web-common/src/enunciate/enunciate.xml | 24 ++++++++++++++--------
4 files changed, 31 insertions(+), 21 deletions(-)
diff --git
a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/enunciate/enunciate.xml
b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/enunciate/enunciate.xml
index 2afff72..c0f27aa 100644
---
a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/enunciate/enunciate.xml
+++
b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/enunciate/enunciate.xml
@@ -17,12 +17,10 @@
~ specific language governing permissions and limitations
~ 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";>
-
- <services>
- <rest defaultRestSubcontext="restServices"/>
- </services>
+<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";
>
+ <title>Apache Archiva REST API</title>
<modules>
<cxf disabled="false"/>
@@ -32,12 +30,16 @@
<obj-c disabled="true"/>
<jaxws-ri disabled="true"/>
<jaxws-support disabled="true"/>
+ <jaxrs>
+ <application path="restServices"/>
+ </jaxrs>
- <docs disabled="false" title="Apache Archiva REST API"
includeExampleXml="true" includeExampleJson="true"
- includeDefaultDownloads="false" docsSubdir=""
freemarkerTemplate="${project.basedir}/src/enunciate/archiva.fmt"
css="${project.basedir}/src/enunciate/archiva.css" >
+ <docs disabled="false"
+ docsSubdir=""
freemarkerTemplate="${project.basedir}/src/enunciate/archiva.fmt"
css="${project.basedir}/src/enunciate/archiva.css" >
<!--<war docsDir="apidocs" />-->
</docs>
+
</modules>
</enunciate>
\ No newline at end of file
diff --git
a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/BrowseServiceTest.java
b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/BrowseServiceTest.java
index 350d849..25686fa 100644
---
a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/BrowseServiceTest.java
+++
b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/BrowseServiceTest.java
@@ -376,11 +376,13 @@ public class BrowseServiceTest
// START SNIPPET: get-artifacts-by-property
BrowseService browseService = getBrowseService( authorizationHeader,
true );
- List<Artifact> artifactDownloadInfos =
- browseService.getArtifactsByProperty( "org.name", "The Apache
Software Foundation", TEST_REPO_ID );
+ tryAssert( ( ) -> {
+ List<Artifact> artifactDownloadInfos =
+ browseService.getArtifactsByProperty( "org.name", "The Apache
Software Foundation", TEST_REPO_ID );
- assertThat( artifactDownloadInfos ).isNotNull().isNotEmpty().hasSize(
7 );
- // END SNIPPET: get-artifacts-by-property
+ assertThat( artifactDownloadInfos ).isNotNull( ).isNotEmpty(
).hasSize( 7 );
+ // END SNIPPET: get-artifacts-by-property
+ } );
}
diff --git
a/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessorTest.java
b/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessorTest.java
index 8b27d52..40cccc0 100644
---
a/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessorTest.java
+++
b/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessorTest.java
@@ -132,7 +132,7 @@ public class NewArtifactsRssFeedProcessorTest
assertEquals( entries.size(), 1 );
assertTrue(
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 )
diff --git
a/archiva-modules/archiva-web/archiva-web-common/src/enunciate/enunciate.xml
b/archiva-modules/archiva-web/archiva-web-common/src/enunciate/enunciate.xml
index c1ea80a..b944852 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/enunciate/enunciate.xml
+++ b/archiva-modules/archiva-web/archiva-web-common/src/enunciate/enunciate.xml
@@ -17,25 +17,31 @@
~ specific language governing permissions and limitations
~ 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";>
-
- <services>
- <rest defaultRestSubcontext="archivaUiServices"/>
- </services>
+<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";>
+ <title>Archiva UI Rest API</title>
<modules>
+ <jaxrs>
+ <application path="archivaUiServices" />
+ </jaxrs>
+
+
<cxf disabled="false"/>
- <jersey disabled="true" />
+ <jersey disabled="true"/>
<c disabled="true"/>
<csharp disabled="true"/>
<obj-c disabled="true"/>
<jaxws-ri disabled="true"/>
<jaxws-support disabled="true"/>
+ <jaxon1 disabled="true"/>
- <docs disabled="false" title="Apache Archiva UI REST API"
includeExampleXml="true" includeExampleJson="true"
- includeDefaultDownloads="false" docsSubdir=""
freemarkerTemplate="${project.basedir}/src/enunciate/archiva.fmt"
css="${project.basedir}/src/enunciate/archiva.css">
- <!-- <war docsDir="apidocs" />-->
+ <docs disabled="false"
+ docsSubdir=""
+ freemarkerTemplate="${project.basedir}/src/enunciate/archiva.fmt"
+ css="${project.basedir}/src/enunciate/archiva.css">
+ <!-- <war docsDir="apidocs" />-->
</docs>
</modules>
