Author: gtrasuk
Date: Thu Aug  8 03:58:21 2013
New Revision: 1511568

URL: http://svn.apache.org/r1511568
Log:

Fix RIVER-424.
Add pom file for jsk-policy, and add jsk-policy to the deploy_river.groovy 
script.


Added:
    river/jtsk/branches/2.2/poms/jsk-policy.pom
Modified:
    river/jtsk/branches/2.2/poms/deploy_river.groovy

Modified: river/jtsk/branches/2.2/poms/deploy_river.groovy
URL: 
http://svn.apache.org/viewvc/river/jtsk/branches/2.2/poms/deploy_river.groovy?rev=1511568&r1=1511567&r2=1511568&view=diff
==============================================================================
--- river/jtsk/branches/2.2/poms/deploy_river.groovy (original)
+++ river/jtsk/branches/2.2/poms/deploy_river.groovy Thu Aug  8 03:58:21 2013
@@ -16,11 +16,16 @@
  */
 String version = "2.2.1"
 String rootDir = ".."
+String repositoryId="apache.releases.https"
+String 
repositoryURL="https://repository.apache.org/service/local/staging/deploy/maven2";
+//String repositoryURL="file:///Users/trasukg/mvn-repo"
+String passphrase="Insert passphrase here..."
         
 ["net.jini:jsk-platform":"lib",
  "net.jini:jsk-lib":"lib",
  "net.jini:jsk-dl":"lib-dl",
  "net.jini:jsk-resources":"lib",
+ "net.jini:jsk-policy":"lib",
  "net.jini.lookup:serviceui":"lib",
  "org.apache.river:fiddler":"lib",
  "org.apache.river:fiddler-dl":"lib-dl",
@@ -34,13 +39,14 @@ String rootDir = ".."
  "org.apache.river:outrigger-dl":"lib-dl",
  "org.apache.river:reggie":"lib",
  "org.apache.river:reggie-dl":"lib-dl",
- "org.apache.river:start":"lib"].each {artifact, subDir ->
+ "org.apache.river:start":"lib"
+].each {artifact, subDir ->
     
     String[] parts = artifact.split(":")
     String gId = parts[0]
     String aId = parts[1]
     String dir = rootDir+"/"+subDir
-    String deployCommand = "mvn deploy:deploy-file "+
+    /*String deployCommand = "mvn deploy:deploy-file "+
                            "-DrepositoryId=apache.releases.https "+
                            "-Dversion=${version} "+
                            "-DgeneratePom=false -Dpackaging=jar "+
@@ -49,9 +55,41 @@ String rootDir = ".."
                            "-Dfile=${dir}/${aId}.jar "+
                            "-DpomFile=./${aId}.pom "+
                            
"-Durl=https://repository.apache.org/service/local/staging/deploy/maven2";
+    */
+    def deployCommand = [\
+        "mvn",
+        "gpg:sign-and-deploy-file",
+        "-DpomFile=${aId}.pom",
+        "-Dfile=${dir}/${aId}.jar",
+        "-DrepositoryId=${repositoryId}",
+       "-Durl=${repositoryURL}",
+        "-Dgpg.useAgent=false",
+       "[email protected]",
+        "-Dgpg.passphrase=${passphrase}"
+    ]
+    /*
+       
+        /*"-Drepository=${repository} " +
+       
+       
+    */
+/*
+"mvn gpg:sign-and-deploy-file " +
+       "-Dpassphrase='situation business offensive persion want comprehension 
product features' " +
+       "-DpomFile=./${aId}.pom " +
+       "-Dfile=${dir}/${aId}.jar " + 
+       "-DrepositoryId=${repository} " +
+       "-Durl=${repositoryURL}"
+*/
+    /* First make sure the jar file contains the LICENSE file */
+    def p="jar uvf ${dir}/${aId}.jar -C .. LICENSE".execute()
+    p.consumeProcessOutputStream(System.out)
+    p.consumeProcessErrorStream(System.err)
+    p.waitFor()
+    
     println deployCommand
     Process process = deployCommand.execute()
     process.consumeProcessOutputStream(System.out)
     process.consumeProcessErrorStream(System.err)
     process.waitFor()
-}
\ No newline at end of file
+}

Added: river/jtsk/branches/2.2/poms/jsk-policy.pom
URL: 
http://svn.apache.org/viewvc/river/jtsk/branches/2.2/poms/jsk-policy.pom?rev=1511568&view=auto
==============================================================================
--- river/jtsk/branches/2.2/poms/jsk-policy.pom (added)
+++ river/jtsk/branches/2.2/poms/jsk-policy.pom Thu Aug  8 03:58:21 2013
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (C) 2013 the original author or authors.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ 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";>
+    
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>net.jini</groupId>
+    <artifactId>jsk-policy</artifactId>
+    <version>2.2.1</version>
+    <url>http://river.apache.org</url>
+    <description></description>
+
+       <licenses>
+           <license>
+               <name>The Apache Software License, Version 2.0</name>
+               <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+           </license>
+       </licenses>
+  
+       <organization>
+        <name>The Apache Software Foundation</name>
+        <url>http://www.apache.org/</url>
+    </organization>
+
+</project>


Reply via email to