This is an automated email from the ASF dual-hosted git repository.
shuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/unomi.git
The following commit(s) were added to refs/heads/master by this push:
new 0b96154 - Update copyrights from 2019 to 2020 - Add new profile to
easily deactivate integration and performance tests - Add SHA512 checksum
generation for package
0b96154 is described below
commit 0b9615456f4ed349f7fcaed6b4bf71f4e27f285d
Author: Serge Huber <[email protected]>
AuthorDate: Wed May 6 09:24:40 2020 +0200
- Update copyrights from 2019 to 2020
- Add new profile to easily deactivate integration and performance tests
- Add SHA512 checksum generation for package
---
NOTICE | 2 +-
NOTICE.template | 2 +-
buildAndRunNoTests.sh | 2 +-
itests/pom.xml | 174 ++++++++++++++++++++------------------
package/pom.xml | 30 +++++++
package/src/main/resources/NOTICE | 2 +-
performance-tests/pom.xml | 84 ++++++++++--------
7 files changed, 173 insertions(+), 123 deletions(-)
diff --git a/NOTICE b/NOTICE
index 26aa3d4..273ee58 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
Apache Unomi
-Copyright 2015-2019 The Apache Software Foundation
+Copyright 2015-2020 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
diff --git a/NOTICE.template b/NOTICE.template
index ea88cc6..602667b 100644
--- a/NOTICE.template
+++ b/NOTICE.template
@@ -1,5 +1,5 @@
Apache Unomi
-Copyright 2016 The Apache Software Foundation
+Copyright 2015-2020 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
diff --git a/buildAndRunNoTests.sh b/buildAndRunNoTests.sh
index 9ec4e3e..427e7a2 100755
--- a/buildAndRunNoTests.sh
+++ b/buildAndRunNoTests.sh
@@ -23,7 +23,7 @@ PROGNAME=`basename "$0"`
if [ -f "$DIRNAME/setenv.sh" ]; then
. "$DIRNAME/setenv.sh"
fi
-mvn clean install -P \!integration-tests,\!performance-tests,rat -DskipTests
+mvn clean install -P \!integration-tests,\!performance-tests,rat,\!run-tests
-DskipTests
if [ $? -ne 0 ]
then
exit 1;
diff --git a/itests/pom.xml b/itests/pom.xml
index a1448ca..cbe15ee 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -129,87 +129,95 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <!-- Needed if you use versionAsInProject() -->
- <plugin>
- <groupId>org.apache.servicemix.tooling</groupId>
- <artifactId>depends-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-depends-file</id>
- <goals>
- <goal>generate-depends-file</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>com.github.alexcojocaru</groupId>
- <artifactId>elasticsearch-maven-plugin</artifactId>
- <!-- REPLACE THE FOLLOWING WITH THE PLUGIN VERSION YOU NEED -->
- <version>6.16</version>
- <configuration>
- <clusterName>contextElasticSearchITests</clusterName>
- <transportPort>9500</transportPort>
- <httpPort>9400</httpPort>
- <version>${elasticsearch.version}</version>
- <autoCreateIndex>true</autoCreateIndex>
- <timeout>120</timeout>
- <environmentVariables>
- <ES_JAVA_OPTS>-Xms2g -Xmx2g</ES_JAVA_OPTS>
- </environmentVariables>
- <instanceSettings>
- <properties>
-
<cluster.routing.allocation.disk.threshold_enabled>false</cluster.routing.allocation.disk.threshold_enabled>
- </properties>
- </instanceSettings>
- </configuration>
- <executions>
- <!--
- The elasticsearch maven plugin goals are by default
bound to the
- pre-integration-test and post-integration-test phases
- -->
- <execution>
- <id>start-elasticsearch</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>runforked</goal>
- </goals>
- </execution>
- <execution>
- <id>stop-elasticsearch</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>stop</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <version>3.0.0-M4</version>
- <configuration>
- <includes>
- <include>**/*AllITs.java</include>
- </includes>
- </configuration>
- <executions>
- <execution>
- <id>integration-test</id>
- <goals>
- <goal>integration-test</goal>
- </goals>
- </execution>
- <execution>
- <id>verify</id>
- <goals>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <profiles>
+ <profile>
+ <id>run-tests</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <!-- Needed if you use versionAsInProject() -->
+ <plugin>
+ <groupId>org.apache.servicemix.tooling</groupId>
+ <artifactId>depends-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-depends-file</id>
+ <goals>
+ <goal>generate-depends-file</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>com.github.alexcojocaru</groupId>
+ <artifactId>elasticsearch-maven-plugin</artifactId>
+ <!-- REPLACE THE FOLLOWING WITH THE PLUGIN VERSION YOU
NEED -->
+ <version>6.16</version>
+ <configuration>
+
<clusterName>contextElasticSearchITests</clusterName>
+ <transportPort>9500</transportPort>
+ <httpPort>9400</httpPort>
+ <version>${elasticsearch.version}</version>
+ <autoCreateIndex>true</autoCreateIndex>
+ <timeout>120</timeout>
+ <environmentVariables>
+ <ES_JAVA_OPTS>-Xms2g -Xmx2g</ES_JAVA_OPTS>
+ </environmentVariables>
+ <instanceSettings>
+ <properties>
+
<cluster.routing.allocation.disk.threshold_enabled>false</cluster.routing.allocation.disk.threshold_enabled>
+ </properties>
+ </instanceSettings>
+ </configuration>
+ <executions>
+ <!--
+ The elasticsearch maven plugin goals are by
default bound to the
+ pre-integration-test and post-integration-test
phases
+ -->
+ <execution>
+ <id>start-elasticsearch</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>runforked</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>stop-elasticsearch</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>stop</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>3.0.0-M4</version>
+ <configuration>
+ <includes>
+ <include>**/*AllITs.java</include>
+ </includes>
+ </configuration>
+ <executions>
+ <execution>
+ <id>integration-test</id>
+ <goals>
+ <goal>integration-test</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>verify</id>
+ <goals>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
\ No newline at end of file
diff --git a/package/pom.xml b/package/pom.xml
index d8b0b65..37a048f 100644
--- a/package/pom.xml
+++ b/package/pom.xml
@@ -359,6 +359,36 @@
<javase>1.8</javase>
</configuration>
</plugin>
+ <plugin>
+ <groupId>net.nicoulaj.maven.plugins</groupId>
+ <artifactId>checksum-maven-plugin</artifactId>
+ <version>1.7</version>
+ <executions>
+ <execution>
+ <id>source-release-checksum</id>
+ <goals>
+ <goal>files</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <algorithms>
+ <algorithm>SHA-512</algorithm>
+ </algorithms>
+ <csvSummary>false</csvSummary>
+ <fileSets>
+ <fileSet>
+ <directory>${project.build.directory}</directory>
+ <includes>
+
<include>${project.artifactId}-${project.version}.zip</include>
+
<include>${project.artifactId}-${project.version}.tar*</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+ <failIfNoFiles>false</failIfNoFiles><!-- usually, no file
to do checksum: don't consider error -->
+ </configuration>
+ </plugin>
+
</plugins>
</build>
diff --git a/package/src/main/resources/NOTICE
b/package/src/main/resources/NOTICE
index 709796f..3b82f79 100644
--- a/package/src/main/resources/NOTICE
+++ b/package/src/main/resources/NOTICE
@@ -1,5 +1,5 @@
Apache Unomi
-Copyright 2015-2019 The Apache Software Foundation
+Copyright 2015-2020 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
diff --git a/performance-tests/pom.xml b/performance-tests/pom.xml
index 526d4f6..bd4b660 100644
--- a/performance-tests/pom.xml
+++ b/performance-tests/pom.xml
@@ -117,6 +117,54 @@
</dependencies>
+ <profiles>
+ <profile>
+ <id>run-tests</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.servicemix.tooling</groupId>
+ <artifactId>depends-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-depends-file</id>
+ <goals>
+ <goal>generate-depends-file</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>net.alchim31.maven</groupId>
+ <artifactId>scala-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>testCompile</goal>
+ </goals>
+ <configuration>
+ <args>
+ <arg>-target:jvm-1.7</arg>
+ <arg>-deprecation</arg>
+ <arg>-feature</arg>
+ <arg>-unchecked</arg>
+
<arg>-language:implicitConversions</arg>
+ <arg>-language:postfixOps</arg>
+ </args>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+
+ </build>
+ </profile>
+ </profiles>
+
<build>
<testSourceDirectory>src/test/scala</testSourceDirectory>
<pluginManagement>
@@ -128,41 +176,5 @@
</plugin>
</plugins>
</pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.servicemix.tooling</groupId>
- <artifactId>depends-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-depends-file</id>
- <goals>
- <goal>generate-depends-file</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>net.alchim31.maven</groupId>
- <artifactId>scala-maven-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>testCompile</goal>
- </goals>
- <configuration>
- <args>
- <arg>-target:jvm-1.7</arg>
- <arg>-deprecation</arg>
- <arg>-feature</arg>
- <arg>-unchecked</arg>
- <arg>-language:implicitConversions</arg>
- <arg>-language:postfixOps</arg>
- </args>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
</build>
</project>
\ No newline at end of file
