0002954: Publish the symmetric-pro to maven. Include all web content so

a gradle/maven project can easily embed SymmetricDS Pro
JumpMind · Jan 6, 2017 · 4b58765 · 4b58765
1 parent 90df458
commit 4b58765
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 19 deletions.
diff --git a/symmetric-assemble/asciidoc.gradle b/symmetric-assemble/asciidoc.gradle
@@ -69,7 +69,7 @@ task generateDocs(type: Copy) {
 
     destinationDir = file("$buildDir/doc")
     if (project.properties.containsKey('pro')) {
-        destinationDir = file(rootProject.buildDir.path + "/../../symmetric-pro/src/main/webapp/doc")
+        destinationDir = file(rootProject.buildDir.path + "/../../symmetric-pro/src/main/resources/VAADIN/doc")
     }
 
     into('html') {

diff --git a/symmetric-assemble/build.gradle b/symmetric-assemble/build.gradle
@@ -16,6 +16,10 @@ buildscript {
 project.buildDir='target'
 apply from: symAssembleDir + '/common.gradle'
 
+if (project.properties.containsKey('pro')) {
+    install.enabled = false
+    uploadArchives.enabled = false
+}
 
 task generateJavadoc(type: Javadoc) {
     destinationDir = new File(buildDir, 'doc/javadoc')
@@ -37,13 +41,6 @@ subprojects { subproject ->
         }
     }  
 
-    publishing {
-        publications {
-            mavenJava(MavenPublication) {
-               from components.java
-            }
-        }
-    }  
 }
 
 project(":symmetric-csv") {

diff --git a/symmetric-assemble/common.gradle b/symmetric-assemble/common.gradle
@@ -17,7 +17,6 @@ dependencies {
 allprojects {
 
     apply plugin: 'eclipse-wtp'
-    apply plugin: 'maven-publish'
 
     group = 'org.jumpmind.symmetric'
 
@@ -85,7 +84,22 @@ subprojects { subproject ->
 
     sourceCompatibility=1.6
     targetCompatibility=1.6
-
+
+    javadoc {
+        failOnError = false
+    }
+
+    install.enabled = !project.properties.containsKey('pro')
+    uploadArchives.enabled = !project.properties.containsKey('pro')
+
+
+    task sourcesJar(type: Jar, dependsOn:classes) {
+        classifier = 'sources'
+        from sourceSets.main.allSource
+    }
+
+    artifacts { archives sourcesJar }    
+
     uploadArchives {
         repositories.mavenDeployer {
             configuration = configurations.deployerJars
@@ -95,13 +109,6 @@ subprojects { subproject ->
         }
     }
 
-    task sourcesJar(type: Jar, dependsOn:classes) {
-        classifier = 'sources'
-        from sourceSets.main.allSource
-    }
-
-    artifacts { archives sourcesJar }
-
     task deploy {
         description 'Shortcut for Maven users'
         dependsOn tasks.uploadArchives

diff --git a/symmetric-util/src/main/java/org/jumpmind/properties/EnvironmentSpecificProperties.java b/symmetric-util/src/main/java/org/jumpmind/properties/EnvironmentSpecificProperties.java
@@ -37,7 +37,6 @@
  * any properties whose prefix matches any combination of supplied environment
  * tokens. Any matches it finds, it removes the prefix and keeps a reference to
  * the new property.
- * <p/>
  */
 public class EnvironmentSpecificProperties extends TypedProperties {
 

diff --git a/symmetric-util/src/main/java/org/jumpmind/util/AppUtils.java b/symmetric-util/src/main/java/org/jumpmind/util/AppUtils.java
@@ -154,7 +154,7 @@ public static String getIpAddress() {
     }
 
     /**
-     * This method will return the timezone in RFC822 format. </p> The format
+     * This method will return the timezone in RFC822 format. <p> The format
      * ("-+HH:MM") has advantages over the older timezone codes ("AAA"). The
      * difference of 5 hours from GMT is obvious with "-05:00" but only implied
      * with "EST". There is no ambiguity saying "-06:00", but you don't know if