[Jpackage-commits] dist/apacheds10/JPP-5 apacheds10-1.0.0-AbstractSarMojo.patch, NONE, 1.1 apacheds10-core-plugin-pom_xml.patch, NONE, 1.1 apacheds10-core-pom_xml.patch, NONE, 1.1 apacheds10-core-unit-pom_xml.patch, NONE, 1.1 apacheds10-kerberos-shared-pom_xml.patch, NONE, 1.1 apacheds10-pom_xml.patch, NONE, 1.1 apacheds10-protocol-ldap-pom_xml.patch, NONE, 1.1 apacheds10-protocol-shared-pom_xml.patch, NONE, 1.1 apacheds10-schema-archetype-pom_xml.patch, NONE, 1.1 apacheds10-server-jndi-pom_xml.patch, NONE, 1.1 apacheds10-server-main-pom_xml.patch, NONE, 1.1 apacheds10-server-sar-pom_xml.patch, NONE, 1.1 apacheds10-server-ssl-pom_xml.patch, NONE, 1.1 apacheds10-server-tools-pom_xml.patch, NONE, 1.1 apacheds10-server-unit-pom_xml.patch, NONE, 1.1 apacheds10-site_xml.patch, NONE, 1.1 apacheds10.spec, 1.2, 1.3 apacheds10-testcase-archetype-pom_xml.patch, NONE, 1.1

jpackage jpackage at ryu.zarb.org
Sun Feb 1 11:32:17 CET 2009


Update of /home/projects/jpackage/cvs/dist/apacheds10/JPP-5
In directory ryu.zarb.org:/tmp/cvs-serv11582

Modified Files:
	apacheds10.spec 
Added Files:
	apacheds10-1.0.0-AbstractSarMojo.patch 
	apacheds10-core-plugin-pom_xml.patch 
	apacheds10-core-pom_xml.patch 
	apacheds10-core-unit-pom_xml.patch 
	apacheds10-kerberos-shared-pom_xml.patch 
	apacheds10-pom_xml.patch 
	apacheds10-protocol-ldap-pom_xml.patch 
	apacheds10-protocol-shared-pom_xml.patch 
	apacheds10-schema-archetype-pom_xml.patch 
	apacheds10-server-jndi-pom_xml.patch 
	apacheds10-server-main-pom_xml.patch 
	apacheds10-server-sar-pom_xml.patch 
	apacheds10-server-ssl-pom_xml.patch 
	apacheds10-server-tools-pom_xml.patch 
	apacheds10-server-unit-pom_xml.patch apacheds10-site_xml.patch 
	apacheds10-testcase-archetype-pom_xml.patch 
Log Message:
1.0.2-3.jpp5

--- NEW FILE: apacheds10-protocol-ldap-pom_xml.patch ---
--- protocol-ldap/pom.xml.sav4	2007-05-26 03:57:12.000000000 +0200
+++ protocol-ldap/pom.xml	2008-06-06 12:47:12.000000000 +0200
@@ -20,6 +20,10 @@
     </dependency>
     <dependency>
       <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-asn1</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
       <artifactId>shared-asn1-codec</artifactId>
     </dependency>
     <dependency>

--- NEW FILE: apacheds10-pom_xml.patch ---
--- pom.xml.sav13	2007-05-26 03:57:12.000000000 +0200
+++ pom.xml	2008-06-06 14:13:55.000000000 +0200
@@ -197,6 +197,7 @@
       </modules>
       <build>
         <plugins>
+<!--
           <plugin>
             <artifactId>maven-gpg-plugin</artifactId>
             <version>1.0-alpha-3</version>
@@ -208,6 +209,7 @@
               </execution>
             </executions>
           </plugin>
+-->
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-source-plugin</artifactId>
@@ -225,6 +227,9 @@
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
             <version>2.2</version>
+            <configuration>
+              <aggregate>true</aggregate>
+            </configuration>
             <executions>
               <execution>
                 <id>attach-javadocs</id>

--- NEW FILE: apacheds10-testcase-archetype-pom_xml.patch ---
--- testcase-archetype/pom.xml.sav	2008-06-05 16:05:26.000000000 +0200
+++ testcase-archetype/pom.xml	2008-06-05 16:05:42.000000000 +0200
@@ -7,6 +7,6 @@
 
   <modelVersion>4.0.0</modelVersion>
   <artifactId>apacheds-testcase-archetype</artifactId>
-  <packaging>maven-plugin</packaging>
+  <packaging>jar</packaging>
   <name>ApacheDS Testcase Archetype</name>
 </project>

--- NEW FILE: apacheds10-server-sar-pom_xml.patch ---
--- server-sar/pom.xml.sav	2006-10-02 07:05:26.000000000 +0200
+++ server-sar/pom.xml	2006-10-30 15:49:48.000000000 +0100
@@ -19,6 +19,11 @@
       <version>${pom.version}</version>
     </dependency>  
     <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-sar-plugin</artifactId>
+      <version>${pom.version}</version>
+    </dependency>  
+    <dependency>
       <groupId>org.apache.directory.daemon</groupId>
       <artifactId>daemon-bootstrappers</artifactId>
       <version>1.0.0</version>
@@ -29,6 +34,11 @@
       <version>3.2.3</version>
     </dependency>
     <dependency>
+      <groupId>jboss</groupId>
+      <artifactId>jboss-jmx</artifactId>
+      <version>3.2.3</version>
+    </dependency>
+    <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>nlog4j</artifactId>
       <version>1.2.25</version>

--- NEW FILE: apacheds10-site_xml.patch ---
--- src/site/site.xml.sav	2006-10-27 10:07:35.000000000 +0200
+++ src/site/site.xml	2006-10-27 10:08:06.000000000 +0200
@@ -8,6 +8,11 @@
   <bannerRight>
     <name>ApacheDS</name>
   </bannerRight>
+  <skin>
+    <groupId>JPP/maven2</groupId>
+    <artifactId>default-skin</artifactId>
+    <version>1.0</version>
+  </skin>
   <body>
     <links>
        <item name="ApacheDS" href="http://directory.apache.org/subprojects/apacheds/index.html"/>

--- NEW FILE: apacheds10-core-unit-pom_xml.patch ---
--- core-unit/pom.xml.sav	2008-06-05 20:58:43.000000000 +0200
+++ core-unit/pom.xml	2008-06-05 21:01:19.000000000 +0200
@@ -10,6 +10,18 @@
   <name>ApacheDS Core Unit</name>
   <packaging>jar</packaging>  
   <dependencies>
+
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-asn1</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>antlr</groupId>
+      <artifactId>antlr</artifactId>
+      <scope>test</scope>
+    </dependency>
+
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

--- NEW FILE: apacheds10-protocol-shared-pom_xml.patch ---
--- protocol-shared/pom.xml.sav	2006-10-25 23:17:04.000000000 +0200
+++ protocol-shared/pom.xml	2006-10-25 23:17:24.000000000 +0200
@@ -43,7 +43,6 @@
     <plugins>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.2</version>
         <configuration>
           <excludes>
             <exclude>**/Abstract*</exclude>

--- NEW FILE: apacheds10-schema-archetype-pom_xml.patch ---
--- schema-archetype/pom.xml.sav	2008-06-05 15:23:29.000000000 +0200
+++ schema-archetype/pom.xml	2008-06-05 15:23:47.000000000 +0200
@@ -7,6 +7,6 @@
 
   <modelVersion>4.0.0</modelVersion>
   <artifactId>apacheds-schema-archetype</artifactId>
-  <packaging>maven-plugin</packaging>
+  <packaging>jar</packaging>
   <name>ApacheDS Schema Archetype</name>
 </project>

--- NEW FILE: apacheds10-server-jndi-pom_xml.patch ---
--- server-jndi/pom.xml.sav	2008-06-10 13:18:49.000000000 +0200
+++ server-jndi/pom.xml	2008-06-10 13:19:26.000000000 +0200
@@ -16,6 +16,11 @@
   <packaging>jar</packaging>  
   <dependencies>
     <dependency>
+        <groupId>backport-util-concurrent</groupId>
+        <artifactId>backport-util-concurrent</artifactId>
+        <version>3.1</version>
+    </dependency>
+    <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>nlog4j</artifactId>
       <scope>provided</scope>

--- NEW FILE: apacheds10-server-ssl-pom_xml.patch ---
--- server-ssl/pom.xml.sav	2006-10-30 14:05:49.000000000 +0100
+++ server-ssl/pom.xml	2006-10-30 14:06:19.000000000 +0100
@@ -48,7 +48,6 @@
       <plugins>
         <plugin>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.2</version>
           <configuration>
             <excludes>
               <exclude>**/*ITest.java</exclude>
@@ -94,7 +93,6 @@
       <plugins>
         <plugin>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.2</version>
           <configuration>
             <excludes>
               <exclude>**/*PTest.java</exclude>
@@ -138,7 +136,6 @@
       <plugins>
         <plugin>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.2</version>
           <configuration>
             <systemProperties>
               <property>

--- NEW FILE: apacheds10-server-main-pom_xml.patch ---
--- server-main/pom.xml.sav	2006-10-02 06:05:31.000000000 +0200
+++ server-main/pom.xml	2006-10-26 15:03:41.000000000 +0200
@@ -12,6 +12,16 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-server-jndi</artifactId>
+      <version>${pom.version}</version>
+    </dependency>  
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-core</artifactId>
+      <version>${pom.version}</version>
+    </dependency>  
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-server-ssl</artifactId>
       <version>${pom.version}</version>
     </dependency>  
@@ -51,7 +61,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
       	<artifactId>maven-jar-plugin</artifactId>
-        <version>2.1</version>
       	<configuration>
       	  <archive>
       	    <manifest>
@@ -63,7 +72,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
       	<artifactId>maven-assembly-plugin</artifactId>
-      	<version>2.1</version>
       	<configuration>
       	  <archive>
       	    <manifest>

--- NEW FILE: apacheds10-1.0.0-AbstractSarMojo.patch ---
--- sar-plugin/src/main/java/org/apache/directory/server/plugin/sar/AbstractSarMojo.java.sav	2008-06-05 15:15:22.000000000 +0200
+++ sar-plugin/src/main/java/org/apache/directory/server/plugin/sar/AbstractSarMojo.java	2008-06-05 15:17:38.000000000 +0200
@@ -203,7 +203,9 @@
                                     getLog().info( "           ! skipping " + name );
                                     continue;
                                 }
-                                zos.putNextEntry(ze);
+                                ZipEntry tmpEntry = new ZipEntry(ze);
+                                tmpEntry.setCompressedSize(-1);
+                                zos.putNextEntry(tmpEntry);
                                 IOUtil.copy(zis, zos);
                             }
                         } finally {

--- NEW FILE: apacheds10-core-plugin-pom_xml.patch ---
--- core-plugin/pom.xml.sav	2006-10-02 06:05:31.000000000 +0200
+++ core-plugin/pom.xml	2008-06-05 13:33:43.000000000 +0200
@@ -39,13 +39,23 @@
       <artifactId>velocity-dep</artifactId>
       <version>1.4</version>
     </dependency>
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+      <version>3.1</version>
+    </dependency>
+    <dependency>
+      <groupId>avalon</groupId>
+      <artifactId>logkit</artifactId>
+      <version>2.1</version>
+    </dependency>
   </dependencies>
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-antlr-plugin</artifactId>
-        <version>2.0-beta-1</version>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>antlr-maven-plugin</artifactId>
+        <version>2.0</version>
         <configuration>
           <grammars>openldap.g</grammars>
         </configuration>
@@ -60,7 +70,6 @@
 
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.2</version>
         <configuration>
           <excludes>
             <exclude>**/Abstract*</exclude>

--- NEW FILE: apacheds10-server-unit-pom_xml.patch ---
--- server-unit/pom.xml.sav	2006-10-02 06:05:31.000000000 +0200
+++ server-unit/pom.xml	2006-10-27 09:38:44.000000000 +0200
@@ -40,13 +40,17 @@
       <artifactId>apacheds-core-unit</artifactId>
       <version>${pom.version}</version>
     </dependency>  
+    <dependency>
+      <groupId>backport-util-concurrent</groupId>
+      <artifactId>backport-util-concurrent</artifactId>
+      <version>2.2</version>
+    </dependency>
   </dependencies>
 
   <build>
     <plugins>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.2</version>
         <configuration>
           <excludes>
             <exclude>**/Abstract*</exclude>
@@ -66,7 +70,6 @@
         <plugins>
             <plugin>
               <artifactId>maven-surefire-plugin</artifactId>
-              <version>2.2</version>
               <configuration>
                 <excludes>
                   <!-- TODO

--- NEW FILE: apacheds10-kerberos-shared-pom_xml.patch ---
--- kerberos-shared/pom.xml.sav	2006-10-26 00:39:51.000000000 +0200
+++ kerberos-shared/pom.xml	2006-10-26 00:41:10.000000000 +0200
@@ -28,6 +28,11 @@
       <artifactId>apacheds-protocol-shared</artifactId>
       <version>${pom.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-asn1</artifactId>
+      <version>0.9.5.5</version>
+    </dependency>
   </dependencies>
 </project>
 

--- NEW FILE: apacheds10-core-pom_xml.patch ---
--- core/pom.xml.sav1	2007-05-26 03:57:12.000000000 +0200
+++ core/pom.xml	2008-06-05 19:54:16.000000000 +0200
@@ -16,6 +16,12 @@
   </description>
   <dependencies>
     <dependency>
+      <groupId>antlr</groupId>
+      <artifactId>antlr</artifactId>
+      <version>2.7.7</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
       <scope>test</scope>
@@ -30,10 +36,25 @@
       <artifactId>jdbm</artifactId>
     </dependency>
     <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+      <version>3.1</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <version>2.1</version>
+    </dependency>
+    <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-core-shared</artifactId>
       <version>${pom.version}</version>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+    </dependency>
   </dependencies>
   <build>
     <plugins>

--- NEW FILE: apacheds10-server-tools-pom_xml.patch ---
--- server-tools/pom.xml.sav	2006-10-26 16:43:29.000000000 +0200
+++ server-tools/pom.xml	2006-10-26 16:43:55.000000000 +0200
@@ -40,7 +40,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>2.1</version>
         <configuration>
           <archive>
             <manifestFile>src/main/manifest/MANIFEST.MF</manifestFile>

Index: apacheds10.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/apacheds10/JPP-5/apacheds10.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** apacheds10.spec	15 Jul 2008 17:46:56 -0000	1.2
--- apacheds10.spec	1 Feb 2009 10:32:15 -0000	1.3
***************
*** 1,3 ****
! # Copyright (c) 2000-2008, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2009, JPackage Project
  # All rights reserved.
  #
***************
*** 37,41 ****
  Name:           apacheds10
  Version:        1.0.2
! Release:        2%{dist}
  Epoch:          0
  Group:          Applications/Internet
--- 37,41 ----
  Name:           apacheds10
  Version:        1.0.2
! Release:        3%{dist}
  Epoch:          0
  Group:          Applications/Internet
***************
*** 55,79 ****
  
  
! Patch0:         apacheds-core-plugin-pom_xml.patch
! Patch1:         apacheds-core-pom_xml.patch
! Patch2:         apacheds-core-unit-pom_xml.patch
! Patch3:         apacheds-protocol-shared-pom_xml.patch
! Patch4:         apacheds-protocol-ldap-pom_xml.patch
! Patch5:         apacheds-kerberos-shared-pom_xml.patch
! Patch6:         apacheds-server-main-pom_xml.patch
! Patch7:         apacheds-server-jndi-pom_xml.patch
! Patch8:         apacheds-server-tools-pom_xml.patch
! Patch9:         apacheds-server-unit-pom_xml.patch
! Patch10:        apacheds-site_xml.patch
! Patch11:        apacheds-server-sar-pom_xml.patch
! Patch12:        apacheds-server-ssl-pom_xml.patch
! Patch13:        apacheds-pom_xml.patch
! Patch14:        apacheds-1.0.0-AbstractSarMojo.patch
! Patch15:        apacheds-schema-archetype-pom_xml.patch
! Patch16:        apacheds-testcase-archetype-pom_xml.patch
! 
  
- #Vendor:         JPackage Project
- #Distribution:   JPackage
  BuildRequires:  jpackage-utils >= 0:1.7.5
  BuildRequires:  java-devel = 0:1.5.0
--- 55,76 ----
  
  
! Patch0:         %{name}-core-plugin-pom_xml.patch
! Patch1:         %{name}-core-pom_xml.patch
! Patch2:         %{name}-core-unit-pom_xml.patch
! Patch3:         %{name}-protocol-shared-pom_xml.patch
! Patch4:         %{name}-protocol-ldap-pom_xml.patch
! Patch5:         %{name}-kerberos-shared-pom_xml.patch
! Patch6:         %{name}-server-main-pom_xml.patch
! Patch7:         %{name}-server-jndi-pom_xml.patch
! Patch8:         %{name}-server-tools-pom_xml.patch
! Patch9:         %{name}-server-unit-pom_xml.patch
! Patch10:        %{name}-site_xml.patch
! Patch11:        %{name}-server-sar-pom_xml.patch
! Patch12:        %{name}-server-ssl-pom_xml.patch
! Patch13:        %{name}-pom_xml.patch
! Patch14:        %{name}-1.0.0-AbstractSarMojo.patch
! Patch15:        %{name}-schema-archetype-pom_xml.patch
! Patch16:        %{name}-testcase-archetype-pom_xml.patch
  
  BuildRequires:  jpackage-utils >= 0:1.7.5
  BuildRequires:  java-devel = 0:1.5.0
***************
*** 102,106 ****
  BuildRequires:  apacheds-shared-asn1-codec
  BuildRequires:  backport-util-concurrent
! BuildRequires:  bouncycastle-jdk1.5
  BuildRequires:  excalibur-avalon-logkit
  BuildRequires:  jakarta-commons-cli
--- 99,103 ----
  BuildRequires:  apacheds-shared-asn1-codec
  BuildRequires:  backport-util-concurrent
! BuildRequires:  bouncycastle
  BuildRequires:  excalibur-avalon-logkit
  BuildRequires:  jakarta-commons-cli
***************
*** 241,245 ****
  Requires:       %{name}-protocol-shared = %{epoch}:%{version}-%{release}
  Requires:       apacheds-shared-asn1
! Requires:       bouncycastle-jdk1.5
  Requires:       mina10 >= 0:1.0.2
  Requires:       mina10-filter-ssl >= 0:1.0.2
--- 238,242 ----
  Requires:       %{name}-protocol-shared = %{epoch}:%{version}-%{release}
  Requires:       apacheds-shared-asn1
! Requires:       bouncycastle
  Requires:       mina10 >= 0:1.0.2
  Requires:       mina10-filter-ssl >= 0:1.0.2
***************
*** 369,373 ****
  Requires:       %{name}-server-jndi = %{epoch}:%{version}-%{release}
  Requires:       apacheds-daemon10-bootstrappers
! Requires:       jakarta-commons-daemon-jsvc
  Requires:       jakarta-commons-logging
  Requires:       nlog4j
--- 366,370 ----
  Requires:       %{name}-server-jndi = %{epoch}:%{version}-%{release}
  Requires:       apacheds-daemon10-bootstrappers
! #Requires:       jakarta-commons-daemon-jsvc
  Requires:       jakarta-commons-logging
  Requires:       nlog4j
***************
*** 499,503 ****
  mkdir -p m2_repo/repository/JPP/lcrypto-jdk14/131
  pushd m2_repo/repository/JPP/
! ln -sf $(build-classpath bouncycastle/lcrypto) lcrypto-jdk14.jar
  popd
  
--- 496,500 ----
  mkdir -p m2_repo/repository/JPP/lcrypto-jdk14/131
  pushd m2_repo/repository/JPP/
! ln -sf $(build-classpath bcprov) lcrypto-jdk14.jar
  popd
  
***************
*** 505,514 ****
  ln -s %{_javadir} external_repo/JPP
  
! export JAVA_HOME=%{_jvmdir}/java-1.5.0
  export MAVEN_OPTS="-Xmx512m"
  export M2SETTINGS=$(pwd)/maven2-settings.xml
  export MAVEN_REPO_LOCAL=`pwd`/m2_repo/repository
! #export MAVEN_OPTS="-Dmaven.repo.local=$MAVEN_REPO_LOCAL -Dmaven2.jpp.mode=true -Dmaven.test.failure.ignore=true -Djava.awt.headless=true"
! ##export MAVEN_OPTS="-Dmaven.repo.local=$MAVEN_REPO_LOCAL -Dmaven2.jpp.mode=true -Djava.awt.headless=true -Dintegration"
  pushd sar-plugin
  mvn-jpp -e \
--- 502,511 ----
  ln -s %{_javadir} external_repo/JPP
  
! #export JAVA_HOME=%{_jvmdir}/java-1.5.0
  export MAVEN_OPTS="-Xmx512m"
  export M2SETTINGS=$(pwd)/maven2-settings.xml
  export MAVEN_REPO_LOCAL=`pwd`/m2_repo/repository
! 
! 
  pushd sar-plugin
  mvn-jpp -e \
***************
*** 1247,1250 ****
--- 1244,1251 ----
  
  %changelog
+ * Mon Feb 02 2009 Ralph Apel <r.apel at r-apel.de> 0:1.0.2-3.jpp5
+ - (B)R bouncycastle instead of bouncycastle-jdk1.5
+ - Don't Require jakarta-commons-daemon-jsvc
+ 
  * Tue Jul 15 2008 Ralph Apel <r.apel at r-apel.de> 0:1.0.2-2.jpp5
  - Fix pom file names




More information about the JPackage-commits mailing list