"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "openmeetings-web/pom.xml" between
apache-openmeetings-6.1.0-src.tar.gz and apache-openmeetings-6.2.0-src.tar.gz

About: OpenMeetings is a browser-based software that allows you to set up instantly a conference in the Web. You can use your microphone or webcam, share documents on a white board, share your screen or record meetings. Source code.

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-web</artifactId> <artifactId>openmeetings-web</artifactId>
<packaging>war</packaging> <packaging>war</packaging>
<name>Openmeetings Web</name> <name>Openmeetings Web</name>
<description>Module for all Wicket based UI OpenMeetings components</desc ription> <description>Module for all Wicket based UI OpenMeetings components</desc ription>
<properties> <properties>
<old-backups.dir>${project.build.directory}/test-data</old-backup s.dir> <old-backups.dir>${project.build.directory}/test-data</old-backup s.dir>
<site.basedir>${project.parent.basedir}</site.basedir> <site.basedir>${project.parent.basedir}</site.basedir>
<autoModuleName>apache.openmeetings.web</autoModuleName> <autoModuleName>apache.openmeetings.web</autoModuleName>
skipping to change at line 49 skipping to change at line 49
<id>mysql</id> <id>mysql</id>
<properties> <properties>
<db>mysql</db> <db>mysql</db>
<db_user>om_db_admin</db_user> <db_user>om_db_admin</db_user>
<db_pass>12345</db_pass> <db_pass>12345</db_pass>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifac tId> <artifactId>mysql-connector-java</artifac tId>
<version>${mysql.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
</profile> </profile>
<profile> <profile>
<id>mssql</id> <id>mssql</id>
<properties> <properties>
<db>mssql</db> <db>mssql</db>
<db_user>sa</db_user> <db_user>sa</db_user>
<db_pass>ass</db_pass> <db_pass>ass</db_pass>
</properties> </properties>
skipping to change at line 190 skipping to change at line 189
<environmentVariables> <environmentVariables>
<outDir>${project .build.directory}/generated-sources/js/org/apache/openmeetings/web/room/wb/</out Dir> <outDir>${project .build.directory}/generated-sources/js/org/apache/openmeetings/web/room/wb/</out Dir>
</environmentVariables> </environmentVariables>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>
<groupId>com.samaxes.maven</groupId> <groupId>com.samaxes.maven</groupId>
<artifactId>minify-maven-plugin</artifactId> <artifactId>minify-maven-plugin</artifactId>
<version>${minify-maven-plugin.version}</version>
<dependencies>
<dependency>
<groupId>com.google.javascript</g
roupId>
<artifactId>closure-compiler</art
ifactId>
<version>v20170521</version>
</dependency>
</dependencies>
<executions> <executions>
<execution> <execution>
<id>theme-minify</id> <id>theme-minify</id>
<goals> <goals>
<goal>minify</goal> <goal>minify</goal>
</goals> </goals>
<configuration> <configuration>
<charset>UTF-8</charset> <charset>UTF-8</charset>
<cssSourceFiles> <cssSourceFiles>
<cssSourceFile>ra w-variables.css</cssSourceFile> <cssSourceFile>ra w-variables.css</cssSourceFile>
skipping to change at line 485 skipping to change at line 476
<current_openmeetings_log_dir>${p roject.build.directory}</current_openmeetings_log_dir> <current_openmeetings_log_dir>${p roject.build.directory}</current_openmeetings_log_dir>
<current_openmeetings_context_nam e>openmeetings</current_openmeetings_context_name> <current_openmeetings_context_nam e>openmeetings</current_openmeetings_context_name>
</systemPropertyVariables> </systemPropertyVariables>
<additionalClasspathElements> <additionalClasspathElements>
<additionalClasspathElement>${pro ject.build.directory}/test-root/WEB-INF/classes</additionalClasspathElement> <additionalClasspathElement>${pro ject.build.directory}/test-root/WEB-INF/classes</additionalClasspathElement>
</additionalClasspathElements> </additionalClasspathElements>
<skip>${maven.test.skip}</skip> <skip>${maven.test.skip}</skip>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactI
d>
<version>${jetty.version}</version>
<configuration>
<systemProperties>
<systemProperty>
<name>current_ope
nmeetings_log_dir</name>
<value>${project.
build.directory}</value>
</systemProperty>
<systemProperty>
<name>maven.proje
ct.build.directory.test-classes</name>
<value>${project.
basedir}/src/test/resources</value>
</systemProperty>
</systemProperties>
<webApp>
<contextPath>/openmeeting
s</contextPath>
<descriptor>${project.bas
edir}/src/test/jetty/web.xml</descriptor>
</webApp>
<jettyXml>${project.basedir}/src/
test/jetty/jetty.xml,${project.basedir}/src/test/jetty/jetty-ssl.xml,${project.b
asedir}/src/test/jetty/jetty-http.xml,${project.basedir}/src/test/jetty/jetty-ht
tps.xml</jettyXml>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build> </build>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.openmeetings</groupId> <groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-util</artifactId> <artifactId>openmeetings-util</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.openmeetings</groupId> <groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-db</artifactId> <artifactId>openmeetings-db</artifactId>
</dependency> </dependency>
skipping to change at line 540 skipping to change at line 505
<groupId>org.apache.openmeetings</groupId> <groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-service</artifactId> <artifactId>openmeetings-service</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.openmeetings</groupId> <groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-webservice</artifactId> <artifactId>openmeetings-webservice</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.webjars</groupId> <groupId>org.webjars</groupId>
<artifactId>jasny-bootstrap</artifactId> <artifactId>jasny-bootstrap</artifactId>
<version>${jasny-bootstrap.version}</version>
<exclusions>
<exclusion>
<groupId>org.webjars</groupId>
<artifactId>bootstrap</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId> <artifactId>spring-core</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId> <artifactId>spring-orm</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wicketstuff</groupId> <groupId>org.wicketstuff</groupId>
<artifactId>wicketstuff-dashboard-core</artifactId> <artifactId>wicketstuff-dashboard-core</artifactId>
<version>${wicketstuff.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.wicket</groupId> <groupId>org.apache.wicket</groupId>
<artifactId>wicket-auth-roles</artifactId> <artifactId>wicket-auth-roles</artifactId>
<version>${wicket.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.wicket</groupId> <groupId>org.apache.wicket</groupId>
<artifactId>wicket-native-websocket-javax</artifactId> <artifactId>wicket-native-websocket-javax</artifactId>
<version>${wicket.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.wicket</groupId> <groupId>org.apache.wicket</groupId>
<artifactId>wicket-devutils</artifactId> <artifactId>wicket-devutils</artifactId>
<version>${wicket.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.googlecode.wicket-jquery-ui</groupId> <groupId>com.googlecode.wicket-jquery-ui</groupId>
<artifactId>wicket-jquery-ui-core</artifactId> <artifactId>wicket-jquery-ui-core</artifactId>
<version>${wicket-jquery-ui.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.googlecode.wicket-jquery-ui</groupId> <groupId>com.googlecode.wicket-jquery-ui</groupId>
<artifactId>wicket-jquery-ui</artifactId> <artifactId>wicket-jquery-ui</artifactId>
<version>${wicket-jquery-ui.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.googlecode.wicket-jquery-ui</groupId> <groupId>com.googlecode.wicket-jquery-ui</groupId>
<artifactId>wicket-jquery-ui-calendar</artifactId> <artifactId>wicket-jquery-ui-calendar</artifactId>
<version>${wicket-jquery-ui.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.googlecode.wicket-jquery-ui</groupId> <groupId>com.googlecode.wicket-jquery-ui</groupId>
<artifactId>wicket-jquery-ui-plugins</artifactId> <artifactId>wicket-jquery-ui-plugins</artifactId>
<version>${wicket-jquery-ui.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wicketstuff</groupId> <groupId>org.wicketstuff</groupId>
<artifactId>wicketstuff-urlfragment</artifactId> <artifactId>wicketstuff-urlfragment</artifactId>
<version>${wicketstuff.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wicketstuff</groupId> <groupId>org.wicketstuff</groupId>
<artifactId>wicketstuff-select2</artifactId> <artifactId>wicketstuff-select2</artifactId>
<version>${wicketstuff.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wicketstuff</groupId> <groupId>org.wicketstuff</groupId>
<artifactId>jqplot</artifactId> <artifactId>jqplot</artifactId>
<version>${wicketstuff.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>de.agilecoders.wicket</groupId> <groupId>de.agilecoders.wicket</groupId>
<artifactId>wicket-bootstrap-extensions</artifactId> <artifactId>wicket-bootstrap-extensions</artifactId>
<version>${wicket-bootstrap.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>de.agilecoders.wicket</groupId> <groupId>de.agilecoders.wicket</groupId>
<artifactId>wicket-bootstrap-themes</artifactId> <artifactId>wicket-bootstrap-themes</artifactId>
<version>${wicket-bootstrap.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.webjars</groupId> <groupId>org.webjars</groupId>
<artifactId>font-awesome</artifactId> <artifactId>font-awesome</artifactId>
<version>${font-awesome.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId> <artifactId>commons-lang3</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.prometheus</groupId> <groupId>io.prometheus</groupId>
<artifactId>simpleclient_servlet</artifactId> <artifactId>simpleclient_servlet</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.tomcat</groupId> <groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-catalina</artifactId> <artifactId>tomcat-catalina</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.webjars</groupId> <groupId>org.webjars</groupId>
<artifactId>jquery-ui-touch-punch</artifactId> <artifactId>jquery-ui-touch-punch</artifactId>
<version>0.2.3-2</version>
</dependency> </dependency>
<!-- Test dependencies --> <!-- Test dependencies -->
<dependency> <dependency>
<groupId>org.apache.openmeetings</groupId> <groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-util</artifactId> <artifactId>openmeetings-util</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<type>test-jar</type> <type>test-jar</type>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
skipping to change at line 670 skipping to change at line 613
<artifactId>cxf-rt-rs-client</artifactId> <artifactId>cxf-rt-rs-client</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.websocket</groupId> <groupId>javax.websocket</groupId>
<artifactId>javax.websocket-api</artifactId> <artifactId>javax.websocket-api</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.tomcat.embed</groupId> <groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-websocket</artifactId> <artifactId>tomcat-embed-websocket</artifactId>
<version>${tomcat.version}</version>
<scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.directory.server</groupId> <groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-test-framework</artifactId> <artifactId>apacheds-test-framework</artifactId>
<version>2.0.0.AM26</version>
<exclusions>
<exclusion>
<groupId>org.apache.directory.api</groupI
d>
<artifactId>api-ldap-schema-data</artifac
tId>
</exclusion>
</exclusions>
<scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.mockito</groupId> <groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId> <artifactId>mockito-inline</artifactId>
<scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.mockito</groupId> <groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId> <artifactId>mockito-junit-jupiter</artifactId>
<scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.junit.jupiter</groupId> <groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId> <artifactId>junit-jupiter-params</artifactId>
<scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>
 End of changes. 25 change blocks. 
85 lines changed or deleted 1 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)