geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jensde...@apache.org
Subject [24/24] incubator-geode git commit: GEODE-14: Updates for producing artifacts
Date Tue, 29 Dec 2015 21:11:18 GMT
GEODE-14: Updates for producing artifacts


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/18be1c05
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/18be1c05
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/18be1c05

Branch: refs/heads/feature/GEODE-14
Commit: 18be1c059ef67982ba81f7ce54b23a82b7252188
Parents: 65a0328
Author: Jens Deppe <jdeppe@pivotal.io>
Authored: Tue Dec 29 13:10:33 2015 -0800
Committer: Jens Deppe <jdeppe@pivotal.io>
Committed: Tue Dec 29 13:10:33 2015 -0800

----------------------------------------------------------------------
 build.gradle                                    | 15 +++++++++++++
 .../gemfire-modules-assembly/build.gradle       |  2 ++
 .../gemfire-modules-hibernate/build.gradle      |  4 ++++
 extensions/gemfire-modules-session/build.gradle | 22 +++++++++++++++++++-
 extensions/gemfire-modules-tomcat7/build.gradle |  7 +++----
 extensions/gemfire-modules/build.gradle         |  7 +++----
 6 files changed, 48 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/18be1c05/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 6f81c6f..2248658 100755
--- a/build.gradle
+++ b/build.gradle
@@ -479,6 +479,21 @@ subprojects {
     description 'Run this task before checking in code to validate changes. This task combines
the following tasks: build, integrationTest, and distributedTest'
   }
 
+  task modulesDist(dependsOn: [ ':extensions/gemfire-modules-assembly:dist' ])
+
+  task modulesTest(dependsOn: [
+      ':extensions/gemfire-modules:test',
+      ':extensions/gemfire-modules:test',
+      ':extensions/gemfire-modules-tomcat7:test',
+      ':extensions/gemfire-modules-session:test',
+      ':extensions/gemfire-modules-hibernate:test',
+      ':extensions/gemfire-modules:integrationTest',
+      ':extensions/gemfire-modules:integrationTest',
+      ':extensions/gemfire-modules-tomcat7:integrationTest',
+      ':extensions/gemfire-modules-session:integrationTest',
+      ':extensions/gemfire-modules-hibernate:integrationTest',
+  ])
+
   check.dependsOn checkMissedTests, rat
   combineReports.mustRunAfter check, test, integrationTest, distributedTest, checkMissedTests
   build.finalizedBy combineReports

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/18be1c05/extensions/gemfire-modules-assembly/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/gemfire-modules-assembly/build.gradle b/extensions/gemfire-modules-assembly/build.gradle
index fc487a5..6995fb7 100644
--- a/extensions/gemfire-modules-assembly/build.gradle
+++ b/extensions/gemfire-modules-assembly/build.gradle
@@ -32,6 +32,8 @@ dependencies {
   servletApiDeps 'javax.servlet:servlet-api:2.5'
 }
 
+jar.enabled = false
+
 def configureTcServerAssembly = {
   archiveName = "Apache_Geode_Modules-${version}-tcServer.zip"
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/18be1c05/extensions/gemfire-modules-hibernate/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/gemfire-modules-hibernate/build.gradle b/extensions/gemfire-modules-hibernate/build.gradle
index 370c220..928e8bf 100644
--- a/extensions/gemfire-modules-hibernate/build.gradle
+++ b/extensions/gemfire-modules-hibernate/build.gradle
@@ -15,6 +15,10 @@
  * limitations under the License.
  */
 
+jar {
+  baseName = 'gemfire-modules-hibernate'
+}
+
 dependencies {
   compile project(':extensions/gemfire-modules')
   compile 'org.hibernate:hibernate-core:3.5.0-Final'

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/18be1c05/extensions/gemfire-modules-session/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/gemfire-modules-session/build.gradle b/extensions/gemfire-modules-session/build.gradle
index 430199b..71d59dc 100644
--- a/extensions/gemfire-modules-session/build.gradle
+++ b/extensions/gemfire-modules-session/build.gradle
@@ -28,4 +28,24 @@ dependencies {
   testCompile(group: 'org.eclipse.jetty', name: 'jetty-servlet', version: project.'jetty.version',
classifier: 'tests')
 
   provided project(path: ':gemfire-junit', configuration: 'testOutput')
-}
\ No newline at end of file
+}
+
+jar {
+  include '**/session/filter/**/*'
+  include '**/session/installer/**/*'
+  includeEmptyDirs = false
+  baseName = 'gemfire-modules-session-external'
+
+  manifest {
+    attributes 'Main-Class': 'com.gemstone.gemfire.modules.session.installer.Installer'
+  }
+}
+
+task internalJar(type: Jar) {
+  from sourceSets.main.output
+  include '**/internal/**/*'
+  includeEmptyDirs = false
+  baseName = 'gemfire-modules-session'
+}
+
+assemble.dependsOn(internalJar)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/18be1c05/extensions/gemfire-modules-tomcat7/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/gemfire-modules-tomcat7/build.gradle b/extensions/gemfire-modules-tomcat7/build.gradle
index 7750069..10b8803 100644
--- a/extensions/gemfire-modules-tomcat7/build.gradle
+++ b/extensions/gemfire-modules-tomcat7/build.gradle
@@ -22,11 +22,10 @@ test  {
       into 'build/test/tomcat/'
     }
   }
+}
 
-  testLogging {
-    events 'passed', 'skipped', 'failed'
-    exceptionFormat = 'full'
-  }
+jar {
+  baseName = 'gemfire-modules-tomcat7'
 }
 
 dependencies {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/18be1c05/extensions/gemfire-modules/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/gemfire-modules/build.gradle b/extensions/gemfire-modules/build.gradle
index 6a44cff..1d45ab8 100644
--- a/extensions/gemfire-modules/build.gradle
+++ b/extensions/gemfire-modules/build.gradle
@@ -22,11 +22,10 @@ test  {
       into 'build/test/tomcat/'
     }
   }
+}
 
-  testLogging {
-    events 'passed', 'skipped', 'failed'
-    exceptionFormat = 'full'
-  }
+jar {
+  baseName = 'gemfire-modules'
 }
 
 dependencies {


Mime
View raw message