Repository: openmeetings Updated Branches: refs/heads/3.3.x 490867710 -> 8ff6f2281
no jira: profile for mssql is added, mysql profile is simplified Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/8ff6f228 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/8ff6f228 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/8ff6f228 Branch: refs/heads/3.3.x Commit: 8ff6f2281163d0a56c2103b0d8784a53eb129072 Parents: 4908677 Author: Maxim Solodovnik <[email protected]> Authored: Thu Aug 24 13:02:03 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Thu Aug 24 13:02:27 2017 +0700 ---------------------------------------------------------------------- .../src/site/xdoc/BuildInstructions.xml | 14 ++++--------- openmeetings-web/pom.xml | 22 ++++++++++++++++++-- pom.xml | 11 ++-------- 3 files changed, 26 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8ff6f228/openmeetings-server/src/site/xdoc/BuildInstructions.xml ---------------------------------------------------------------------- diff --git a/openmeetings-server/src/site/xdoc/BuildInstructions.xml b/openmeetings-server/src/site/xdoc/BuildInstructions.xml index 486a155..c358d41 100644 --- a/openmeetings-server/src/site/xdoc/BuildInstructions.xml +++ b/openmeetings-server/src/site/xdoc/BuildInstructions.xml @@ -15,12 +15,10 @@ <document xmlns="http://maven.apache.org/XDOC/2.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd";> - <properties> <title>Build instructions</title> <author email="[email protected]">Apache OpenMeetings Team</author> </properties> - <body> <section name="Nightly Builds"> <p> @@ -30,7 +28,6 @@ </a> </p> </section> - <section name="How to Build a Distribution"> <div> <p>To build a binary release of OpenMeetings you need: </p> @@ -46,7 +43,6 @@ <p>Run the command: </p> <source><![CDATA[mvn clean install -P allModules]]></source> </section> - <section name="Run, Develop, Test"> <p> To develop Openmeetings you need to import maven project into Eclipse @@ -71,19 +67,19 @@ mvn install -P allModules -pl openmeetings-flash # compiles a comp <p>In case you would like to develop Openmeetings you need to run <i>"unpacked"</i> build: </p> <source> <![CDATA[ -mvn clean install -P allModules,unpacked,mysql,default-db-cred -DskipTests=true -Dwicket.mode=DEVELOPMENT +mvn clean install -P allModules,unpacked,mysql -DskipTests=true -Dwicket.mode=DEVELOPMENT ]]> </source> <p>After modifications are made you can run <i>"quick"</i> build: </p> <source> <![CDATA[ -mvn install -P allModules,quick,mysql,default-db-cred -pl openmeetings-web -pl openmeetings-server -Dwicket.mode=DEVELOPMENT +mvn install -P allModules,quick,mysql -pl openmeetings-web -pl openmeetings-server -Dwicket.mode=DEVELOPMENT ]]> </source> <p>Any number of projects can be specified during build: </p> <source> <![CDATA[ -mvn install -P allModules,quick,mysql,default-db-cred -pl openmeetings-util -pl openmeetings-db -pl openmeetings-core -pl openmeetings-install -pl openmeetings-service -pl openmeetings-web -pl openmeetings-server -pl openmeetings-webservice -Dwicket.mode=DEVELOPMENT +mvn install -P allModules,quick,mysql -pl openmeetings-util -pl openmeetings-db -pl openmeetings-core -pl openmeetings-install -pl openmeetings-service -pl openmeetings-web -pl openmeetings-server -pl openmeetings-webservice -Dwicket.mode=DEVELOPMENT ]]> </source> <div> @@ -99,7 +95,5 @@ mvn install -P allModules,quick,mysql,default-db-cred -pl openmeetings-util -pl </ul> </div> </section> - </body> - -</document> \ No newline at end of file +</document> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8ff6f228/openmeetings-web/pom.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/pom.xml b/openmeetings-web/pom.xml index 0ed826b..fa4ac15 100644 --- a/openmeetings-web/pom.xml +++ b/openmeetings-web/pom.xml @@ -16,8 +16,8 @@ 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";> + 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> @@ -31,6 +31,7 @@ <description>Module for all Wicket based UI OpenMeetings components</description> <properties> <mysql.version>5.1.43</mysql.version> + <mssql.version>6.2.1.jre8</mssql.version> <old-backups.dir>${project.build.directory}/test-data</old-backups.dir> <site.basedir>${project.parent.basedir}</site.basedir> </properties> @@ -39,6 +40,8 @@ <id>mysql</id> <properties> <db>mysql</db> + <db_user>root</db_user> + <db_pass></db_pass> </properties> <dependencies> <dependency> @@ -49,6 +52,21 @@ </dependencies> </profile> <profile> + <id>mssql</id> + <properties> + <db>mssql</db> + <db_user>sa</db_user> + <db_pass>ass</db_pass> + </properties> + <dependencies> + <dependency> + <groupId>com.microsoft.sqlserver</groupId> + <artifactId>mssql-jdbc</artifactId> + <version>${mssql.version}</version> + </dependency> + </dependencies> + </profile> + <profile> <id>Jenkins</id> <build> <plugins> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8ff6f228/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 1a380cb..3b801ab 100644 --- a/pom.xml +++ b/pom.xml @@ -16,8 +16,8 @@ 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";> + 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> @@ -89,13 +89,6 @@ </properties> </profile> <profile> - <id>default-db-cred</id> - <properties> - <db_user>root</db_user> - <db_pass></db_pass> - </properties> - </profile> - <profile> <id>rc</id> <build> <plugins>
