pom.xml (apache-openmeetings-6.1.0-src) | : | pom.xml (apache-openmeetings-6.2.0-src) | ||
---|---|---|---|---|
skipping to change at line 25 | skipping to change at line 25 | |||
See the License for the specific language governing permissions and | See the License for the specific language governing permissions and | |||
limitations under the License. | limitations under the License. | |||
--> | --> | |||
<project xmlns="http://maven.apache.org/POM/4.0.0" | <project xmlns="http://maven.apache.org/POM/4.0.0" | |||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | |||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://mave n.apache.org/maven-v4_0_0.xsd"> | xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://mave n.apache.org/maven-v4_0_0.xsd"> | |||
<modelVersion>4.0.0</modelVersion> | <modelVersion>4.0.0</modelVersion> | |||
<parent> | <parent> | |||
<groupId>org.apache.openmeetings</groupId> | <groupId>org.apache.openmeetings</groupId> | |||
<artifactId>openmeetings-parent</artifactId> | <artifactId>openmeetings-parent</artifactId> | |||
<version>6.1.0</version> | <version>6.2.0</version> | |||
<relativePath>..</relativePath> | <relativePath>..</relativePath> | |||
</parent> | </parent> | |||
<artifactId>openmeetings-server</artifactId> | <artifactId>openmeetings-server</artifactId> | |||
<packaging>jar</packaging> | <packaging>jar</packaging> | |||
<name>Openmeetings Server</name> | <name>Openmeetings Server</name> | |||
<description>Module for OpenMeetings server assembly</description> | <description>Module for OpenMeetings server assembly</description> | |||
<properties> | <properties> | |||
<server.dir>${project.build.directory}/apache-tomcat-${tomcat.ver sion}</server.dir> | <server.dir>${project.build.directory}/apache-tomcat-${tomcat.ver sion}</server.dir> | |||
<languages.dir>../openmeetings-web/src/main/java/org/apache/openm eetings/web/app</languages.dir> | <languages.dir>../openmeetings-web/src/main/java/org/apache/openm eetings/web/app</languages.dir> | |||
<assembly.finalName>apache-openmeetings-${project.version}</assem bly.finalName> | <assembly.finalName>apache-openmeetings-${project.version}</assem bly.finalName> | |||
skipping to change at line 49 | skipping to change at line 49 | |||
<dist.om.dir>${dist.webapps}/openmeetings</dist.om.dir> | <dist.om.dir>${dist.webapps}/openmeetings</dist.om.dir> | |||
<om.webapp>webapps/openmeetings</om.webapp> | <om.webapp>webapps/openmeetings</om.webapp> | |||
<root.webapp>webapps/ROOT</root.webapp> | <root.webapp>webapps/ROOT</root.webapp> | |||
<server-file.dir>web-server</server-file.dir> | <server-file.dir>web-server</server-file.dir> | |||
<autoModuleName>apache.openmeetings.server</autoModuleName> | <autoModuleName>apache.openmeetings.server</autoModuleName> | |||
</properties> | </properties> | |||
<url>https://openmeetings.apache.org</url> | <url>https://openmeetings.apache.org</url> | |||
<scm> | <scm> | |||
<connection>scm:git:https://github.com/apache/openmeetings.git</c onnection> | <connection>scm:git:https://github.com/apache/openmeetings.git</c onnection> | |||
<developerConnection>scm:git:https://github.com/apache/openmeetin gs.git</developerConnection> | <developerConnection>scm:git:https://github.com/apache/openmeetin gs.git</developerConnection> | |||
<url>https://github.com/apache/openmeetings/tree/6.1.0</url> | <url>https://github.com/apache/openmeetings/tree/6.2.0</url> | |||
<tag>HEAD</tag> | <tag>HEAD</tag> | |||
</scm> | </scm> | |||
<profiles> | <profiles> | |||
<profile> | <profile> | |||
<id>quick</id> | <id>quick</id> | |||
<properties> | <properties> | |||
<assembly.finalName>server</assembly.finalName> | <assembly.finalName>server</assembly.finalName> | |||
<assembly.descriptor>quick</assembly.descriptor> | <assembly.descriptor>quick</assembly.descriptor> | |||
<site.skip>true</site.skip> | <site.skip>true</site.skip> | |||
</properties> | </properties> | |||
skipping to change at line 122 | skipping to change at line 122 | |||
<assembly.finalName>server</assembly.finalName> | <assembly.finalName>server</assembly.finalName> | |||
<assembly.descriptor>unpacked</assembly.descripto r> | <assembly.descriptor>unpacked</assembly.descripto r> | |||
<src.pack.skip>true</src.pack.skip> | <src.pack.skip>true</src.pack.skip> | |||
<logback.console><![CDATA[<appender-ref ref="CONS OLE" />]]></logback.console> | <logback.console><![CDATA[<appender-ref ref="CONS OLE" />]]></logback.console> | |||
</properties> | </properties> | |||
</profile> | </profile> | |||
<profile> | <profile> | |||
<id>prepare-web-server</id> | <id>prepare-web-server</id> | |||
<activation> | <activation> | |||
<file> | <file> | |||
<missing>web-server/apache-tomcat-9.0.50. tar.gz</missing> <!-- TODO should be in-sync with global property --> | <missing>web-server/apache-tomcat-9.0.54. tar.gz</missing> <!-- TODO should be in-sync with global property --> | |||
</file> | </file> | |||
</activation> | </activation> | |||
<build> | <build> | |||
<plugins> | <plugins> | |||
<plugin> | <plugin> | |||
<groupId>org.codehaus.mojo</group Id> | <groupId>org.codehaus.mojo</group Id> | |||
<artifactId>wagon-maven-plugin</a rtifactId> | <artifactId>wagon-maven-plugin</a rtifactId> | |||
<executions> | <executions> | |||
<execution> | <execution> | |||
<id>download-web- server</id> | <id>download-web- server</id> | |||
skipping to change at line 155 | skipping to change at line 155 | |||
</plugin> | </plugin> | |||
</plugins> | </plugins> | |||
</build> | </build> | |||
</profile> | </profile> | |||
</profiles> | </profiles> | |||
<build> | <build> | |||
<plugins> | <plugins> | |||
<plugin> | <plugin> | |||
<groupId>org.codehaus.mojo</groupId> | <groupId>org.codehaus.mojo</groupId> | |||
<artifactId>exec-maven-plugin</artifactId> | <artifactId>exec-maven-plugin</artifactId> | |||
<version>${exec-maven-plugin.version}</version> | ||||
<executions> | <executions> | |||
<execution> | <execution> | |||
<id>generate-configs-xml-site</id > | <id>generate-configs-xml-site</id > | |||
<phase>pre-site</phase> | <phase>pre-site</phase> | |||
<goals> | <goals> | |||
<goal>java</goal> | <goal>java</goal> | |||
</goals> | </goals> | |||
</execution> | </execution> | |||
<execution> | <execution> | |||
<id>generate-configs-xml-build</i d> | <id>generate-configs-xml-build</i d> | |||
End of changes. 4 change blocks. | ||||
4 lines changed or deleted | 3 lines changed or added |