gCubeSystem
/
gcube-portal-bundle
15
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed deprecated home library dependency

This commit is contained in:
Massimiliano Assante 2022-01-31 11:34:35 +01:00
parent 5e2f174c8b
commit b683d04362
4 changed files with 12 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.DS_Store vendored Normal file
View File

Binary file not shown.

4
CHANGELOG.md
View File

@ -4,6 +4,10 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [v5.1.0-SNAPSHOT] - 2021-06-24
- Removed deprecated home library dependency
## [v5.0.2] - 2021-06-24 ## [v5.0.2] - 2021-06-24
- Added support for authorization common AccessToken provider and common-gcube-calls in CP - Added support for authorization common AccessToken provider and common-gcube-calls in CP

30
distro/descriptor.xml
View File

@ -1,30 +0,0 @@
<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
<id>portal</id>
<formats>
<format>tar.gz</format>
</formats>
<baseDirectory>/</baseDirectory>
<fileSets>
<fileSet>
<directory>${distroDirectory}</directory>
<outputDirectory>/META-INF</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<includes>
<include>README</include>
<include>LICENSE</include>
<include>changelog.xml</include>
</includes>
<fileMode>755</fileMode>
<filtered>true</filtered>
</fileSet>
<fileSet>
<directory>Portal-Bundle</directory>
<outputDirectory>/</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<fileMode>755</fileMode>
</fileSet>
</fileSets>
</assembly>

121
pom.xml
View File

@ -10,7 +10,7 @@
</parent> </parent>
<groupId>org.gcube.distribution</groupId> <groupId>org.gcube.distribution</groupId>
<artifactId>gcube-portal-bundle</artifactId> <artifactId>gcube-portal-bundle</artifactId>
<version>5.0.2</version> <version>5.1.0-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<scm> <scm>
<connection>scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</connection> <connection>scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</connection>
@ -47,7 +47,6 @@
registry-publisher,common-authorization,authorization-client,document-store-lib, registry-publisher,common-authorization,authorization-client,document-store-lib,
accounting-lib,threadlocal-vars-cleaner,common-generic-clients, accounting-lib,threadlocal-vars-cleaner,common-generic-clients,
event-publisher-library,event-publisher-portal,oidc-library,oidc-library-portal,common-gcube-calls</fws-artifactsid> event-publisher-library,event-publisher-portal,oidc-library,oidc-library-portal,common-gcube-calls</fws-artifactsid>
<hl-artifactsid>home-library,home-library-model,home-library-jcr,jackrabbit-jcr-commons,jackrabbit-jcr-rmi-custom,jcr</hl-artifactsid>
<snl-artifactsid>social-networking-library,notifications-common-library,tour-manager</snl-artifactsid> <snl-artifactsid>social-networking-library,notifications-common-library,tour-manager</snl-artifactsid>
<ep-artifactsid>gcube-login-portlet,gcube-loggedin,UsersManagementPortlet,register-vre-users,resource-management-portlet,service-endpoint-editor</ep-artifactsid> <ep-artifactsid>gcube-login-portlet,gcube-loggedin,UsersManagementPortlet,register-vre-users,resource-management-portlet,service-endpoint-editor</ep-artifactsid>
<custom-plugins-artifactsid>gcube-responsive-theme,session-timeout-hook, <custom-plugins-artifactsid>gcube-responsive-theme,session-timeout-hook,
@ -59,7 +58,7 @@
<dependency> <dependency>
<groupId>org.gcube.distribution</groupId> <groupId>org.gcube.distribution</groupId>
<artifactId>maven-portal-bom</artifactId> <artifactId>maven-portal-bom</artifactId>
<version>3.6.3</version> <version>3.7.0-SNAPSHOT</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>
@ -67,6 +66,12 @@
</dependencyManagement> </dependencyManagement>
<build> <build>
<plugins> <plugins>
<plugin>
<!-- https://mvnrepository.com/artifact/org.codehaus.gmaven/groovy-maven-plugin -->
<groupId>org.codehaus.gmaven</groupId>
<artifactId>groovy-maven-plugin</artifactId>
<version>2.1.1</version>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId> <artifactId>maven-dependency-plugin</artifactId>
@ -101,21 +106,6 @@
<useBaseVersion>true</useBaseVersion> <useBaseVersion>true</useBaseVersion>
</configuration> </configuration>
</execution> </execution>
<execution>
<id>copy-dependencies-home-library</id>
<phase>compile</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<outputDirectory>${basedir}/Portal-Bundle/gCube/lib/_home-library</outputDirectory>
<includeArtifactIds>${hl-artifactsid}</includeArtifactIds>
<overWriteIfNewer>true</overWriteIfNewer>
<excludeTypes>gar, tar.gz</excludeTypes>
<stripVersion>false</stripVersion>
<useBaseVersion>true</useBaseVersion>
</configuration>
</execution>
<execution> <execution>
<id>copy-dependencies-social-networking-library</id> <id>copy-dependencies-social-networking-library</id>
<phase>compile</phase> <phase>compile</phase>
@ -248,25 +238,6 @@
</replacements> </replacements>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
<descriptor>distro/descriptor.xml</descriptor>
</descriptors>
</configuration>
<executions>
<execution>
<id>portal</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins> </plugins>
</build> </build>
<!-- Transitives to be excluded --> <!-- Transitives to be excluded -->
@ -497,82 +468,6 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<!-- End FWS --> <!-- End FWS -->
<!-- Home Library -->
<dependency>
<groupId>org.gcube.common</groupId>
<artifactId>home-library</artifactId>
<scope>provided</scope>
<exclusions>
<exclusion>
<artifactId>cxf-rt-rs-client</artifactId>
<groupId>org.apache.cxf</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.gcube.common</groupId>
<artifactId>home-library-model</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.gcube.common</groupId>
<artifactId>home-library-jcr</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>gov.nih.imagej</groupId>
<artifactId>imagej</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.lowagie</groupId>
<artifactId>itext</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-commons</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.gcube.externals</groupId>
<artifactId>jackrabbit-jcr-rmi-custom</artifactId>
</dependency>
<dependency>
<groupId>javax.jcr</groupId>
<artifactId>jcr</artifactId>
</dependency>
<dependency>
<groupId>org.jfile</groupId>
<artifactId>jfile</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>xmlpull</groupId>
<artifactId>xmlpull</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>xpp3</groupId>
<artifactId>xpp3_min</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
<scope>provided</scope>
</dependency>
<!-- End Home Library -->
<!-- Social Networking Library --> <!-- Social Networking Library -->
<dependency> <dependency>
<groupId>org.gcube.portal</groupId> <groupId>org.gcube.portal</groupId>