This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a commit to branch feature/OPENMEETINGS-2567-investigate-performance-monitoring in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit 390233f872040a4ed02be5ca8bf3fc5edea3b733 Author: Sebastian Wagner <[email protected]> AuthorDate: Wed Feb 3 11:11:49 2021 +1300 Update version to next dev snapshot. --- openmeetings-core/pom.xml | 6 ++--- openmeetings-db/pom.xml | 6 ++--- openmeetings-install/pom.xml | 6 ++--- openmeetings-screenshare/pom.xml | 8 +++--- openmeetings-server/pom.xml | 13 ++++----- openmeetings-service/pom.xml | 6 ++--- openmeetings-util/pom.xml | 6 ++--- openmeetings-web/pom.xml | 14 +++------- openmeetings-webservice/pom.xml | 6 ++--- pom.xml | 58 +++++++++++++++++++--------------------- 10 files changed, 52 insertions(+), 77 deletions(-) diff --git a/openmeetings-core/pom.xml b/openmeetings-core/pom.xml index b3d64af..217fa9e 100644 --- a/openmeetings-core/pom.xml +++ b/openmeetings-core/pom.xml @@ -15,14 +15,12 @@ See the License for the specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.openmeetings</groupId> <artifactId>openmeetings-parent</artifactId> - <version>5.1.0</version> + <version>5.2.0-SNAPSHOT</version> <relativePath>..</relativePath> </parent> <artifactId>openmeetings-core</artifactId> diff --git a/openmeetings-db/pom.xml b/openmeetings-db/pom.xml index 7e69a00..0bc8372 100644 --- a/openmeetings-db/pom.xml +++ b/openmeetings-db/pom.xml @@ -15,14 +15,12 @@ See the License for the specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.openmeetings</groupId> <artifactId>openmeetings-parent</artifactId> - <version>5.1.0</version> + <version>5.2.0-SNAPSHOT</version> <relativePath>..</relativePath> </parent> <artifactId>openmeetings-db</artifactId> diff --git a/openmeetings-install/pom.xml b/openmeetings-install/pom.xml index 672aa00..52aaec2 100644 --- a/openmeetings-install/pom.xml +++ b/openmeetings-install/pom.xml @@ -15,14 +15,12 @@ See the License for the specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.openmeetings</groupId> <artifactId>openmeetings-parent</artifactId> - <version>5.1.0</version> + <version>5.2.0-SNAPSHOT</version> <relativePath>..</relativePath> </parent> <artifactId>openmeetings-install</artifactId> diff --git a/openmeetings-screenshare/pom.xml b/openmeetings-screenshare/pom.xml index 56118a7..4f37d16 100644 --- a/openmeetings-screenshare/pom.xml +++ b/openmeetings-screenshare/pom.xml @@ -15,14 +15,12 @@ See the License for the specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.openmeetings</groupId> <artifactId>openmeetings-parent</artifactId> - <version>5.1.0</version> + <version>5.2.0-SNAPSHOT</version> <relativePath>..</relativePath> </parent> <artifactId>openmeetings-screenshare</artifactId> @@ -125,7 +123,7 @@ <keypass>${key.password}</keypass> <alias>${key.alias}</alias> <dname>cn=Sebastian Wagner, ou=technolog, o=openmeetings.apache.org, c=DE</dname> - <ext></ext> + <ext /> <validity>365</validity> <keyalg>RSA</keyalg> <keysize>4096</keysize> diff --git a/openmeetings-server/pom.xml b/openmeetings-server/pom.xml index e4cf2f4..6b9fdcb 100644 --- a/openmeetings-server/pom.xml +++ b/openmeetings-server/pom.xml @@ -15,14 +15,12 @@ See the License for the specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.openmeetings</groupId> <artifactId>openmeetings-parent</artifactId> - <version>5.1.0</version> + <version>5.2.0-SNAPSHOT</version> <relativePath>..</relativePath> </parent> <artifactId>openmeetings-server</artifactId> @@ -339,8 +337,7 @@ </goals> <configuration> <target> - <untar src="${server-file.dir}/apache-tomcat-${tomcat.version}.tar.gz" dest="${project.build.directory}" - compression="gzip" overwrite="true"/> + <untar src="${server-file.dir}/apache-tomcat-${tomcat.version}.tar.gz" dest="${project.build.directory}" compression="gzip" overwrite="true" /> </target> <skip>${om.quick.build}</skip> </configuration> @@ -351,7 +348,7 @@ <configuration> <target> <copy todir="../target/site" overwrite="true" force="true"> - <fileset dir="${project.build.directory}/site"/> + <fileset dir="${project.build.directory}/site" /> </copy> </target> <skip>${site.skip}</skip> @@ -366,7 +363,7 @@ <configuration> <target> <copy todir="../target/site" overwrite="true" force="true"> - <fileset dir="${project.build.directory}/site"/> + <fileset dir="${project.build.directory}/site" /> </copy> </target> <skip>${site.skip}</skip> diff --git a/openmeetings-service/pom.xml b/openmeetings-service/pom.xml index 0dc44ca..69fca68 100644 --- a/openmeetings-service/pom.xml +++ b/openmeetings-service/pom.xml @@ -15,14 +15,12 @@ See the License for the specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.openmeetings</groupId> <artifactId>openmeetings-parent</artifactId> - <version>5.1.0</version> + <version>5.2.0-SNAPSHOT</version> <relativePath>..</relativePath> </parent> <artifactId>openmeetings-service</artifactId> diff --git a/openmeetings-util/pom.xml b/openmeetings-util/pom.xml index ca8c7e5..880e7e3 100644 --- a/openmeetings-util/pom.xml +++ b/openmeetings-util/pom.xml @@ -15,14 +15,12 @@ See the License for the specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.openmeetings</groupId> <artifactId>openmeetings-parent</artifactId> - <version>5.1.0</version> + <version>5.2.0-SNAPSHOT</version> <relativePath>..</relativePath> </parent> <artifactId>openmeetings-util</artifactId> diff --git a/openmeetings-web/pom.xml b/openmeetings-web/pom.xml index 7370ea9..8fe2685 100644 --- a/openmeetings-web/pom.xml +++ b/openmeetings-web/pom.xml @@ -15,14 +15,12 @@ See the License for the specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.openmeetings</groupId> <artifactId>openmeetings-parent</artifactId> - <version>5.1.0</version> + <version>5.2.0-SNAPSHOT</version> <relativePath>..</relativePath> </parent> <artifactId>openmeetings-web</artifactId> @@ -497,9 +495,7 @@ <phase>generate-resources</phase> <configuration> <target> - <copy file="${project.basedir}/src/main/webapp/WEB-INF/classes/META-INF/${db}_persistence.xml" - tofile="${project.build.directory}/generated-res/persistence.xml" - overwrite="true" force="true"/> + <copy file="${project.basedir}/src/main/webapp/WEB-INF/classes/META-INF/${db}_persistence.xml" tofile="${project.build.directory}/generated-res/persistence.xml" overwrite="true" force="true" /> </target> </configuration> <goals> @@ -511,9 +507,7 @@ <phase>generate-test-resources</phase> <configuration> <target> - <copy file="${project.basedir}/src/main/webapp/WEB-INF/classes/META-INF/h2_persistence.xml" - tofile="${project.build.directory}/test-root/WEB-INF/classes/META-INF/persistence.xml" - overwrite="true" force="true"/> + <copy file="${project.basedir}/src/main/webapp/WEB-INF/classes/META-INF/h2_persistence.xml" tofile="${project.build.directory}/test-root/WEB-INF/classes/META-INF/persistence.xml" overwrite="true" force="true" /> </target> </configuration> <goals> diff --git a/openmeetings-webservice/pom.xml b/openmeetings-webservice/pom.xml index d887ac3..a5de7bf 100644 --- a/openmeetings-webservice/pom.xml +++ b/openmeetings-webservice/pom.xml @@ -15,14 +15,12 @@ See the License for the specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.openmeetings</groupId> <artifactId>openmeetings-parent</artifactId> - <version>5.1.0</version> + <version>5.2.0-SNAPSHOT</version> <relativePath>..</relativePath> </parent> <artifactId>openmeetings-webservice</artifactId> diff --git a/pom.xml b/pom.xml index c47ffc0..5ebedee 100644 --- a/pom.xml +++ b/pom.xml @@ -15,9 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache</groupId> @@ -26,7 +24,7 @@ </parent> <groupId>org.apache.openmeetings</groupId> <artifactId>openmeetings-parent</artifactId> - <version>5.1.0</version> + <version>5.2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>Openmeetings</name> <description>Parent project for all OpenMeetings Maven modules. Required to hold general settings</description> @@ -36,7 +34,7 @@ <wicket.configuration>DEPLOYMENT</wicket.configuration> <om.quick.build>false</om.quick.build> <om.notquick.build>true</om.notquick.build> - <logback.console></logback.console> + <logback.console /> <db>h2</db> <autoModuleName>apache.openmeetings.parent</autoModuleName> <jdk.version>11</jdk.version> @@ -125,8 +123,8 @@ <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis> <sonar.junit.reportPaths>target/surefire-reports</sonar.junit.reportPaths> <jacoco.binary.path>${project.basedir}/../target/jacoco.exec</jacoco.binary.path> - <db_user></db_user> - <db_pass></db_pass> + <db_user /> + <db_pass /> </properties> <url>https://openmeetings.apache.org</url> <inceptionYear>2012</inceptionYear> @@ -799,22 +797,22 @@ <version>${maven-checkstyle-plugin.version}</version> <configuration> <checkstyleRules> - <module name = "Checker"> - <property name="fileExtensions" value="java,js,css,xml"/> + <module name="Checker"> + <property name="fileExtensions" value="java,js,css,xml" /> <module name="NewlineAtEndOfFile"> - <property name="fileExtensions" value="java"/> + <property name="fileExtensions" value="java" /> </module> <module name="TreeWalker"> - <module name="UnusedImports"></module> + <module name="UnusedImports" /> <module name="RegexpSinglelineJava"> - <property name="format" value="^\t* "/> - <property name="message" value="Indent must use tab characters"/> - <property name="ignoreComments" value="true"/> + <property name="format" value="^\t* " /> + <property name="message" value="Indent must use tab characters" /> + <property name="ignoreComments" value="true" /> </module> </module> <module name="RegexpSingleline"> - <property name="format" value="\s+$"/> - <property name="message" value="Line has trailing spaces."/> + <property name="format" value="\s+$" /> + <property name="message" value="Line has trailing spaces." /> </module> </module> </checkstyleRules> @@ -907,7 +905,7 @@ <include>**/Test*.java</include> </includes> <excludes> - <exclude/> + <exclude /> </excludes> <argLine>@{argLine} --add-modules java.se --add-exports java.base/jdk.internal.ref=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.management/sun.management=ALL-UNNAMED --add-opens jdk.management/com.sun.management.internal=ALL-UNNAMED</argLine> </configuration> @@ -980,7 +978,7 @@ <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense"> <licenseFamilyCategory>MIT</licenseFamilyCategory> <licenseFamilyName>MIT</licenseFamilyName> - <notes></notes> + <notes /> <patterns> <pattern>Licensed MIT</pattern> <pattern>Licensed under MIT</pattern> @@ -993,7 +991,7 @@ <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense"> <licenseFamilyCategory>BSD</licenseFamilyCategory> <licenseFamilyName>BSD</licenseFamilyName> - <notes></notes> + <notes /> <patterns> <pattern>BSD-style license</pattern> </patterns> @@ -1426,7 +1424,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore></ignore> + <ignore /> </action> </pluginExecution> <pluginExecution> @@ -1439,7 +1437,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore></ignore> + <ignore /> </action> </pluginExecution> <pluginExecution> @@ -1454,7 +1452,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore></ignore> + <ignore /> </action> </pluginExecution> <pluginExecution> @@ -1467,7 +1465,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore></ignore> + <ignore /> </action> </pluginExecution> <pluginExecution> @@ -1480,7 +1478,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore></ignore> + <ignore /> </action> </pluginExecution> <pluginExecution> @@ -1493,7 +1491,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore></ignore> + <ignore /> </action> </pluginExecution> <pluginExecution> @@ -1507,7 +1505,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore></ignore> + <ignore /> </action> </pluginExecution> <pluginExecution> @@ -1520,7 +1518,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore></ignore> + <ignore /> </action> </pluginExecution> <pluginExecution> @@ -1533,7 +1531,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore></ignore> + <ignore /> </action> </pluginExecution> <pluginExecution> @@ -1546,7 +1544,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore></ignore> + <ignore /> </action> </pluginExecution> <pluginExecution> @@ -1559,7 +1557,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore></ignore> + <ignore /> </action> </pluginExecution> </pluginExecutions>
