master default branch (#7)

* master default branch

* changed docker image name

* fix on travis scripts

* Update share-distribution.xml

* Update deploy_k8s.sh

* Update delete-env.sh
This commit is contained in:
pieCit87
2021-04-08 10:18:16 +03:00
committed by GitHub
parent 3700f7d5f2
commit ae1fd13de4

View File

@@ -7,7 +7,7 @@
<parent> <parent>
<artifactId>alfresco-share-parent</artifactId> <artifactId>alfresco-share-parent</artifactId>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<version>7.0.1-SNAPSHOT</version> <version>11.1-SNAPSHOT</version>
</parent> </parent>
<dependencies> <dependencies>
@@ -17,14 +17,14 @@
<version>${dependency.alfresco-community-repo.version}</version> <version>${dependency.alfresco-community-repo.version}</version>
<scope>provided</scope> <scope>provided</scope>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-core</artifactId> <artifactId>alfresco-core</artifactId>
</exclusion> </exclusion>
<!-- SHA-2432 --> <!-- SHA-2432 -->
<exclusion> <exclusion>
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId> <artifactId>jstl</artifactId>
</exclusion> </exclusion>
<exclusion> <exclusion>
<groupId>commons-collections</groupId> <groupId>commons-collections</groupId>
@@ -76,14 +76,14 @@
<groupId>dom4j</groupId> <groupId>dom4j</groupId>
<artifactId>dom4j</artifactId> <artifactId>dom4j</artifactId>
</exclusion> </exclusion>
<exclusion>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-core</artifactId>
</exclusion>
<!-- SHA-2432 -->
<exclusion> <exclusion>
<groupId>javax.servlet</groupId> <groupId>org.alfresco</groupId>
<artifactId>jstl</artifactId> <artifactId>alfresco-core</artifactId>
</exclusion>
<!-- SHA-2432 -->
<exclusion>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
</exclusion> </exclusion>
<exclusion> <exclusion>
<groupId>commons-collections</groupId> <groupId>commons-collections</groupId>
@@ -117,17 +117,17 @@
<version>${dependency.spring.version}</version> <version>${dependency.spring.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<!-- <dependency> <!-- <dependency>
<groupId>org.postgresql</groupId> <groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId> <artifactId>postgresql</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId> <artifactId>mysql-connector-java</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
--> -->
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId> <artifactId>javax.servlet-api</artifactId>
@@ -137,19 +137,19 @@
<!-- SHA-2432 --> <!-- SHA-2432 -->
<dependency> <dependency>
<groupId>org.apache.taglibs</groupId> <groupId>org.apache.taglibs</groupId>
<artifactId>taglibs-standard-spec</artifactId> <artifactId>taglibs-standard-spec</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.taglibs</groupId> <groupId>org.apache.taglibs</groupId>
<artifactId>taglibs-standard-impl</artifactId> <artifactId>taglibs-standard-impl</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.taglibs</groupId> <groupId>org.apache.taglibs</groupId>
<artifactId>taglibs-standard-jstlel</artifactId> <artifactId>taglibs-standard-jstlel</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>
@@ -197,22 +197,22 @@
<Build-Revision>${bamboo_repository_revision_number}</Build-Revision> <Build-Revision>${bamboo_repository_revision_number}</Build-Revision>
</manifestEntries> </manifestEntries>
</archive> </archive>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<executions> <executions>
<execution> <execution>
<id>default-test</id> <id>default-test</id>
<!-- No unit tests in this project - all tests are integration tests --> <!-- No unit tests in this project - all tests are integration tests -->
<configuration> <configuration>
<includes> <includes>
<include>nothing</include> <include>nothing</include>
</includes> </includes>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
@@ -229,20 +229,20 @@
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<executions> <executions>
<execution> <execution>
<id>integration-tests</id> <id>integration-tests</id>
<goals> <goals>
<goal>test</goal> <goal>test</goal>
</goals> </goals>
<configuration> <configuration>
<includes combine.self="override"> <includes combine.self="override">
<include>**/*Test.java</include> <include>**/*Test.java</include>
</includes> </includes>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</profile> </profile>
</profiles> </profiles>
</project> </project>