trying fix for search posts missing deps

This commit is contained in:
Massimiliano Assante 2023-12-07 09:31:50 +01:00
parent bfc98ba8c0
commit 6242694d8d
4 changed files with 44 additions and 15 deletions

View File

@ -1 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId"/> <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="social-networking-library-ws-3.0.0-SNAPSHOT">
<wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
<property name="context-root" value="social-networking-library-ws"/>
<property name="java-output-path" value="/social-networking-library-ws/target/classes"/>
</wb-module>
</project-modules>

View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<faceted-project> <faceted-project>
<fixed facet="wst.jsdt.web"/> <fixed facet="wst.jsdt.web"/>
<installed facet="jst.web" version="3.0"/>
<installed facet="wst.jsdt.web" version="1.0"/>
<installed facet="jst.jaxrs" version="1.1"/>
<installed facet="java" version="1.8"/> <installed facet="java" version="1.8"/>
<installed facet="jst.web" version="3.0"/>
<installed facet="jst.jaxrs" version="2.1"/>
<installed facet="wst.jsdt.web" version="1.0"/>
</faceted-project> </faceted-project>

View File

@ -1,6 +1,6 @@
# Changelog # Changelog
## [v3.0.0] - 2023-12-06 ## [v3.0.0-SNAPSHOT] - 2023-12-06
- Feature #26193, new impl for get users by role in a VRE - Feature #26193, new impl for get users by role in a VRE
- Replace Astyanx Java client for Cassandra 2 with Datastax client for Cassandra 4 - Replace Astyanx Java client for Cassandra 2 with Datastax client for Cassandra 4

40
pom.xml
View File

@ -12,7 +12,7 @@
<groupId>org.gcube.portal</groupId> <groupId>org.gcube.portal</groupId>
<artifactId>social-networking-library-ws</artifactId> <artifactId>social-networking-library-ws</artifactId>
<packaging>war</packaging> <packaging>war</packaging>
<version>3.0.0</version> <version>3.0.0-SNAPSHOT</version>
<name>social-networking-library-ws</name> <name>social-networking-library-ws</name>
<description>Rest interface for the social networking library.</description> <description>Rest interface for the social networking library.</description>
<properties> <properties>
@ -27,8 +27,10 @@
</properties> </properties>
<scm> <scm>
<connection>scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</connection> <connection>
<developerConnection>scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</developerConnection> scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</connection>
<developerConnection>
scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</developerConnection>
<url>https://code-repo.d4science.org/gCubeSystem/${project.artifactId}</url> <url>https://code-repo.d4science.org/gCubeSystem/${project.artifactId}</url>
</scm> </scm>
@ -214,6 +216,17 @@
<artifactId>jackson-dataformat-cbor</artifactId> <artifactId>jackson-dataformat-cbor</artifactId>
<version>2.8.6</version> <version>2.8.6</version>
</dependency> </dependency>
<!-- needed by the search-->
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
<version>1.9.2</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
<version>1.9.2</version>
</dependency>
<dependency> <dependency>
<groupId>com.datastax.oss</groupId> <groupId>com.datastax.oss</groupId>
<artifactId>java-driver-query-builder</artifactId> <artifactId>java-driver-query-builder</artifactId>
@ -235,7 +248,8 @@
<version>2.6</version> <version>2.6</version>
</dependency> </dependency>
<!-- Please note that the elasticsearch client needs a compress-lzf version <!-- Please note that the elasticsearch client needs a compress-lzf
version
>= 1.0.2 --> >= 1.0.2 -->
<dependency> <dependency>
<groupId>com.ning</groupId> <groupId>com.ning</groupId>
@ -245,7 +259,8 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.glassfish.jersey.containers</groupId> <groupId>org.glassfish.jersey.containers</groupId>
<!-- if your container implements Servlet API older than 3.0, use "jersey-container-servlet-core" --> <!-- if your container implements Servlet API older than 3.0, use
"jersey-container-servlet-core" -->
<artifactId>jersey-container-servlet-core</artifactId> <artifactId>jersey-container-servlet-core</artifactId>
</dependency> </dependency>
<dependency> <dependency>
@ -320,7 +335,8 @@
<artifactId>sphinx-maven-plugin</artifactId> <artifactId>sphinx-maven-plugin</artifactId>
<version>2.10.0</version> <version>2.10.0</version>
<configuration> <configuration>
<outputDirectory>${project.build.directory}/${project.artifactId}-${project.version}/docs</outputDirectory> <outputDirectory>
${project.build.directory}/${project.artifactId}-${project.version}/docs</outputDirectory>
<builder>html</builder> <builder>html</builder>
<configDirectory>${basedir}/docs</configDirectory> <configDirectory>${basedir}/docs</configDirectory>
<sourceDirectory>${basedir}/docs</sourceDirectory> <sourceDirectory>${basedir}/docs</sourceDirectory>
@ -342,7 +358,8 @@
<configuration> <configuration>
<sourcepath-includes> <sourcepath-includes>
<sourcepath-include> <sourcepath-include>
<!-- Include the "com.external:external" artifact on the sourcepath. --> <!-- Include the "com.external:external" artifact on
the sourcepath. -->
<groupId>org.gcube.social-networking</groupId> <groupId>org.gcube.social-networking</groupId>
<artifactId>social-service-model</artifactId> <artifactId>social-service-model</artifactId>
</sourcepath-include> </sourcepath-include>
@ -365,7 +382,8 @@
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>aspectj-maven-plugin</artifactId> <artifactId>aspectj-maven-plugin</artifactId>
</plugin> </plugin>
<!-- Copy Enunciate Documentation from your-application/docs to your-application.war --> <!-- Copy Enunciate Documentation from your-application/docs to
your-application.war -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId> <artifactId>maven-resources-plugin</artifactId>
@ -381,8 +399,10 @@
<outputDirectory>target</outputDirectory> <outputDirectory>target</outputDirectory>
<resources> <resources>
<resource> <resource>
<targetPath>${project.build.directory}/${project.artifactId}-${project.version}/api-docs</targetPath> <targetPath>
<directory>${project.build.directory}/api-docs</directory> ${project.build.directory}/${project.artifactId}-${project.version}/api-docs</targetPath>
<directory>
${project.build.directory}/api-docs</directory>
<filtering>true</filtering> <filtering>true</filtering>
</resource> </resource>
</resources> </resources>