No commit message

symmetric-android/pom.xml

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+    <groupId>org.jumpmind.symmetric</groupId>
+    <artifactId>symmetric-android</artifactId>
+    <version>3.7.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
+    <name>android</name>
+    <parent>
+        <groupId>org.jumpmind.symmetric</groupId>
+        <artifactId>symmetric-parent</artifactId>
+        <version>3.7.0-SNAPSHOT</version>
+        <relativePath>../symmetric-parent/pom.xml</relativePath>
+    </parent>
+    <dependencies>
+        <dependency>
+            <groupId>com.google.android</groupId>
+            <artifactId>android</artifactId>
+            <version>2.1.2</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-android</artifactId>
+            <version>1.6.1-RC1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jumpmind.symmetric</groupId>
+            <artifactId>symmetric-core</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>net.sf.kxml</groupId>
+                    <artifactId>kxml2</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>javax.annotation</groupId>
+                    <artifactId>jsr250-api</artifactId>
+                </exclusion>                
+            </exclusions>
+        </dependency>
+    </dependencies>
+</project>

symmetric-assemble/build.gradle

@@ -2,15 +2,13 @@ buildscript {
     repositories {
         jcenter()
         maven { url 'http://repo.spring.io/plugins-release' }
-        mavenCentral()
     }
 
     dependencies {
         classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.2'
         classpath 'org.asciidoctor:asciidoctorj-pdf:1.5.0-alpha.6'
         classpath 'org.springframework.build.gradle:propdeps-plugin:0.0.7'
         classpath 'io.spring.gradle:docbook-reference-plugin:0.3.0'
-        classpath 'org.hibernate.build.gradle:gradle-animalSniffer-plugin:1.0.1.Final'
     }
 }
 
@@ -24,24 +22,14 @@ task generateJavadoc(type: Javadoc) {
 }
 
 subprojects { subproject ->
-
-    checkJava5Compat = checkJava5Compat.toBoolean()
-    if (checkJava5Compat) {
-        apply plugin: 'org.hibernate.build.gradle.animalSniffer'
-
-        dependencies {
-            animalSnifferSignature 'org.codehaus.mojo.signature:java15:1.0@signature'
-        }
-    }
-
     afterEvaluate {
         if(plugins.hasPlugin(JavaPlugin)) {
 
             // configuration here
             rootProject.tasks.generateJavadoc {
                 source += files(sourceSets.collect { srcSet -> srcSet.allJava })
                 classpath += files(sourceSets*.compileClasspath)
-            }                        
+            }
 
         }
     }    
@@ -77,7 +65,7 @@ project(":symmetric-wrapper") {
 project(':symmetric-util') {
     description = 'Utility classes that are used by several Symmetric libraries'
 
-    dependencies {        
+    dependencies {
         compile "commons-lang:commons-lang:$commonsLangVersion"
         compile "commons-io:commons-io:$commonsIoVersion"
         compile "commons-codec:commons-codec:$commonsCodecVersion"
@@ -220,8 +208,8 @@ project(':symmetric-server') {
             exclude group: 'com.fasterxml.jackson.core'
             exclude group: 'commons-codec'
         }
-        compile "javax.servlet:javax.servlet-api:$servletVersion"
-        provided "org.eclipse.jetty:jetty-annotations:$jettyVersion"
+        provided "javax.servlet:servlet-api:2.5"
+        provided "org.eclipse.jetty:jetty-server:$jettyVersion"
         provided "org.eclipse.jetty:jetty-servlets:$jettyVersion"
         provided "org.eclipse.jetty:jetty-webapp:$jettyVersion"
         provided "org.eclipse.jetty:jetty-jmx:$jettyVersion"

symmetric-assemble/common.gradle

@@ -48,7 +48,7 @@ subprojects { subproject ->
     apply plugin: 'propdeps'
     apply plugin: 'propdeps-maven'
     apply plugin: 'propdeps-eclipse'
-    apply plugin: 'maven'    
+    apply plugin: 'maven'
 
     configurations { deployerJars }
     configurations { testArtifacts.extendsFrom testRuntime }
@@ -137,18 +137,18 @@ subprojects { subproject ->
         mockitoVersion = '1.9.5'
         powerMockVersion = '1.5.3'
         mysqlVersion = '5.1.30'
-        servletVersion = '3.1.0'
+        servletVersion = '3.0.1'
         springVersion = '4.0.5.RELEASE'
         jtdsVersion = '1.2.8'
         bouncyCastleVersion = '140'
         animalSnifferVersion = '1.10'
         jnaVersion = '4.1.0'
-        jettyVersion = '9.2.11.v20150529'
+        jettyVersion = '7.6.3.v20120416'        
 
         env = System.getenv()
     }
 
-    dependencies {        
+    dependencies {
         compile "org.slf4j:slf4j-api:$slf4jVersion"
         compile "org.slf4j:jul-to-slf4j:$slf4jVersion"
         compile "org.slf4j:jcl-over-slf4j:$slf4jVersion"

symmetric-assemble/gradle.properties

@@ -1,5 +1,5 @@
 symAssembleDir=../symmetric-assemble
-version=3.8.x-SNAPSHOT
+version=3.7.x-SNAPSHOT
 scmVersion=?
 deployUser=?
 deployPassword=?
@@ -9,5 +9,4 @@ publishUser=?
 publishPassword=?
 publishServer=symmetricds.org
 sourceforgeUser=?
-sourceforgePassword=?
-checkJava5Compat=false
+sourceforgePassword=?