branch feature 23186
This commit is contained in:
parent
b3c7121138
commit
0e7299f104
|
|
@ -1 +1,2 @@
|
|||
/target/
|
||||
/docs/
|
||||
|
|
|
|||
|
|
@ -1,5 +1,9 @@
|
|||
# Changelog
|
||||
|
||||
## [v2.6.0-SNAPSHOT] - 2022-04-06
|
||||
|
||||
- Feature #23186, Full notifications support for social service
|
||||
|
||||
## [v2.5.0] - 2022-04-06
|
||||
|
||||
- enunciate integration
|
||||
|
|
|
|||
17
README.md
17
README.md
|
|
@ -17,14 +17,15 @@
|
|||
|
||||
See [Releases](https://code-repo.d4science.org/gCubeSystem/social-networking-library-ws/releases).
|
||||
|
||||
|
||||
## Authors
|
||||
|
||||
* **Costantino Perciante** - [ISTI-CNR Infrascience Group](http://nemis.isti.cnr.it/groups/infrascience)
|
||||
* **Massimiliano Assante** ([ORCID](https://orcid.org/0000-0002-3761-1492)) - [ISTI-CNR Infrascience Group](https://www.isti.cnr.it/People/M.Assante)
|
||||
* **Costantino Perciante**
|
||||
|
||||
## Maintainers
|
||||
|
||||
* **Lucio Lelii** - [ISTI-CNR Infrascience Group](http://nemis.isti.cnr.it/groups/infrascience)
|
||||
* **Massimiliano Assante** - [ISTI-CNR Infrascience Group](http://nemis.isti.cnr.it/groups/infrascience)
|
||||
* **Massimiliano Assante** ([ORCID](https://orcid.org/0000-0002-3761-1492)) - [ISTI-CNR Infrascience Group](https://www.isti.cnr.it/People/M.Assante)
|
||||
|
||||
## License
|
||||
|
||||
|
|
@ -37,12 +38,4 @@ open-source software toolkit used for building and operating Hybrid Data
|
|||
Infrastructures enabling the dynamic deployment of Virtual Research Environments
|
||||
by favouring the realisation of reuse oriented policies.
|
||||
|
||||
The projects leading to this software have received funding from a series of European Union programmes including:
|
||||
|
||||
- the Sixth Framework Programme for Research and Technological Development
|
||||
- DILIGENT (grant no. 004260);
|
||||
- the Seventh Framework Programme for research, technological development and demonstration
|
||||
- D4Science (grant no. 212488), D4Science-II (grant no.239019), ENVRI (grant no. 283465), EUBrazilOpenBio (grant no. 288754), iMarine(grant no. 283644);
|
||||
- the H2020 research and innovation programme
|
||||
- BlueBRIDGE (grant no. 675680), EGIEngage (grant no. 654142), ENVRIplus (grant no. 654182), Parthenos (grant no. 654119), SoBigData (grant no. 654024),DESIRA (grant no. 818194), ARIADNEplus (grant no. 823914), RISIS2 (grant no. 824091), PerformFish (grant no. 727610), AGINFRAplus (grant no. 731001);
|
||||
|
||||
The projects leading to this software have received funding from a series of European Union programmes see [FUNDING.md](FUNDING.md)
|
||||
|
|
@ -7,11 +7,19 @@
|
|||
pattern="org.gcube.portal.social.networking.ws.docs.DocsGenerator" />
|
||||
</api-classes>
|
||||
<modules>
|
||||
<jackson1 disabled="true"/>
|
||||
<jackson1 disabled="true" />
|
||||
<gwt-json-overlay disabled="true" />
|
||||
<php-json-client disabled="true" />
|
||||
<ruby-json-client disabled="true" />
|
||||
<java-json-client disabled="true" />
|
||||
<java-json-client jarName="social-service-client.jar"
|
||||
bundleSourcesWithClasses="true" groupId="org.gcube.social-networking"
|
||||
artifactId="auto-social-client" javac-source="1.8" javac-target="1.8">
|
||||
<package-conversions>
|
||||
<convert
|
||||
from="org.gcube.portal.social.networking.ws"
|
||||
to="org.gcube.social.client" />
|
||||
</package-conversions>
|
||||
</java-json-client>
|
||||
<javascript-client disabled="true" />
|
||||
<docs docsDir="${project.build.directory}" docsSubdir="docs" />
|
||||
<docs
|
||||
|
|
@ -19,6 +27,6 @@
|
|||
<additional-css
|
||||
file="css/d4science_enunciate_custom.css" />
|
||||
</docs>
|
||||
<swagger basePath="/${project.artifactId}/rest"/>
|
||||
<swagger basePath="/${project.artifactId}/rest" />
|
||||
</modules>
|
||||
</enunciate>
|
||||
30
pom.xml
30
pom.xml
|
|
@ -12,7 +12,7 @@
|
|||
<groupId>org.gcube.portal</groupId>
|
||||
<artifactId>social-networking-library-ws</artifactId>
|
||||
<packaging>war</packaging>
|
||||
<version>2.5.0</version>
|
||||
<version>2.6.0-SNAPSHOT</version>
|
||||
<name>social-networking-library-ws</name>
|
||||
<description>Rest interface for the social networking library.</description>
|
||||
<properties>
|
||||
|
|
@ -50,7 +50,6 @@
|
|||
<version>${enunciate.version}</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>com.webcohesion.enunciate</groupId>
|
||||
<artifactId>enunciate-rt-util</artifactId>
|
||||
|
|
@ -70,7 +69,7 @@
|
|||
<version>3.20-geoapi-3.0</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<!-- ebd enunciate deps -->
|
||||
<!-- end enunciate deps -->
|
||||
<dependency>
|
||||
<groupId>net.sf.ehcache</groupId>
|
||||
<artifactId>ehcache</artifactId>
|
||||
|
|
@ -138,6 +137,10 @@
|
|||
<groupId>javax.ws.rs</groupId>
|
||||
<artifactId>jsr311-api</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>org.mortbay.jetty</groupId>
|
||||
<artifactId>servlet-api</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<dependency>
|
||||
|
|
@ -295,29 +298,12 @@
|
|||
<version>4.3</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
<!-- <finalName>${project.name}</finalName> -->
|
||||
<finalName>${project.name}</finalName>
|
||||
<plugins>
|
||||
<!-- <plugin> -->
|
||||
<!-- <groupId>org.apache.maven.plugins</groupId> -->
|
||||
<!-- <artifactId>maven-javadoc-plugin</artifactId> -->
|
||||
<!-- <configuration> -->
|
||||
<!-- <additionalparam>-Xdoclint:none</additionalparam> -->
|
||||
<!-- <additionalJOption>-Xdoclint:none</additionalJOption> -->
|
||||
<!-- </configuration> -->
|
||||
<!-- <version>3.1.0</version> -->
|
||||
<!-- <executions> -->
|
||||
<!-- <execution> -->
|
||||
<!-- <id>generate-doc</id> -->
|
||||
<!-- <phase>install</phase> -->
|
||||
<!-- <goals> -->
|
||||
<!-- <goal>jar</goal> -->
|
||||
<!-- </goals> -->
|
||||
<!-- </execution> -->
|
||||
<!-- </executions> -->
|
||||
<!-- </plugin> -->
|
||||
<!-- Enunciate Maven plugin -->
|
||||
<plugin>
|
||||
<groupId>com.webcohesion.enunciate</groupId>
|
||||
|
|
|
|||
Loading…
Reference in New Issue