santuario-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r999104 - in /santuario/trunk: build.xml pom.xml
Date Mon, 20 Sep 2010 20:35:19 GMT
Author: coheigea
Date: Mon Sep 20 20:35:19 2010
New Revision: 999104

URL: http://svn.apache.org/viewvc?rev=999104&view=rev
Log:
Some build fixes...
 - Changed build.xml to pick up junit 3.8.2 instead of 4.8.1. Junit 4.8.1 is not compatible
with JDK 1.4.x. Also, I added the xml-apis jar to the endorsed directory to fix a NPE.
 - Updated maven plugin version in the pom, and changed the bundle plugin to export the version
number.
 - Keeping Junit 4.8.1 in the pom as I can't get the involved setup regarding endorsed libraries
working with 3.8.2.

Modified:
    santuario/trunk/build.xml
    santuario/trunk/pom.xml

Modified: santuario/trunk/build.xml
URL: http://svn.apache.org/viewvc/santuario/trunk/build.xml?rev=999104&r1=999103&r2=999104&view=diff
==============================================================================
--- santuario/trunk/build.xml (original)
+++ santuario/trunk/build.xml Mon Sep 20 20:35:19 2010
@@ -62,7 +62,7 @@
     <property name="lib.xalan.3"        value="${dir.libs}/xml-apis-1.3.03.jar" />
     <property name="lib.xerces.1"       value="${dir.libs}/xercesImpl-2.9.1.jar" />
     <property name="lib.jce"            value="${dir.libs}/${jce.provider.prefix}-${jce.provider.jar}"
/>
-    <property name="lib.junit"		value="${dir.libs}/junit-4.8.1.jar" />
+    <property name="lib.junit"		value="${dir.libs}/junit-3.8.2.jar" />
     <property name="lib.clover"		value="${dir.libs}/clover.jar" />
 
     <!-- XML Security libraries (for bin distribution) -->
@@ -346,6 +346,7 @@
 	    <available file="data/com/ibm/xss4j-20030127/enveloped-rsa.sig" property="ibm.available"/>
         <copy file="${lib.xalan.1}" todir="${dir.build.libs2}"/>
         <copy file="${lib.xalan.2}" todir="${dir.build.libs2}"/>
+        <copy file="${lib.xalan.3}" todir="${dir.build.libs2}"/>
         <copy file="${lib.logging.api}" todir="${dir.build.libs2}"/>
         <copy file="${lib.junit}" todir="${dir.build.libs2}"/>
         <copy file="${jar.library}" todir="${dir.build.libs2}"/>
@@ -389,6 +390,7 @@
         <mkdir dir="${dir.build.junit.html}"/>
         <copy file="${lib.xalan.1}" todir="${dir.build.libs2}"/>
         <copy file="${lib.xalan.2}" todir="${dir.build.libs2}"/>
+        <copy file="${lib.xalan.3}" todir="${dir.build.libs2}"/>
         <copy file="${lib.logging.api}" todir="${dir.build.libs2}"/>
         <copy file="${lib.junit}" todir="${dir.build.libs2}"/>
         <copy file="${jar.library}" todir="${dir.build.libs2}"/>

Modified: santuario/trunk/pom.xml
URL: http://svn.apache.org/viewvc/santuario/trunk/pom.xml?rev=999104&r1=999103&r2=999104&view=diff
==============================================================================
--- santuario/trunk/pom.xml (original)
+++ santuario/trunk/pom.xml Mon Sep 20 20:35:19 2010
@@ -40,11 +40,11 @@
     <mailingLists>
         <mailingList>
             <name>XML Security Developer List</name>
-            <subscribe>security-dev-subscribe@xml.apache.org</subscribe>
+            <subscribe>dev-subscribe@santuario.apache.org</subscribe>
             <unsubscribe>
-                security-dev-unsubscribe@xml.apache.org
+                dev-unsubscribe@santuario.apache.org
             </unsubscribe>
-            <post>security-dev@xml.apache.org</post>
+            <post>dev@santuario.apache.org</post>
             <archive>
                 http://news.gmane.org/thread.php?group=gmane.text.xml.security.devel 
             </archive>
@@ -95,12 +95,12 @@
     </licenses>
     <scm>
         <connection>
-            scm:svn:http://svn.apache.org/repos/asf/xml/security/trunk
+            scm:svn:http://svn.apache.org/repos/asf/santuario/trunk
         </connection>
         <developerConnection>
-            scm:svn:https://svn.apache.org/repos/asf/xml/security/trunk
+            scm:svn:https://svn.apache.org/repos/asf/santuario/trunk
         </developerConnection>
-        <url>http://svn.apache.org/viewvc/xml/security/trunk</url>
+        <url>http://svn.apache.org/viewvc/santuario/trunk</url>
     </scm>
     <organization>
         <name>The Apache Software Foundation</name>
@@ -140,6 +140,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.1</version>
                 <configuration>
                     <source>1.4</source>
                     <target>1.4</target>
@@ -149,6 +150,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
+                <version>2.1</version>
                 <executions>
                     <execution>
                         <id>copy-dependencies</id>
@@ -169,6 +171,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
+                <version>2.3.1</version>
                 <executions>
                     <execution>
                         <phase>test-compile</phase>
@@ -187,7 +190,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.4.0</version>
+                <version>1.4.3</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
@@ -200,9 +203,9 @@
                         <Specification-Version>${pom.version}</Specification-Version>
 
                         <Export-Package>
-                              org.apache.xml.security.*,
-                              javax.xml.crypto.*,
-                              org.jcp.xml.dsig.internal.*,
+                              org.apache.xml.security.*;version="${pom.version}",
+                              javax.xml.crypto.*;version="${pom.version}",
+                              org.jcp.xml.dsig.internal.*;version="${pom.version}",
                         </Export-Package>
                         <Import-Package>
                               !org.apache.xml.security.*,
@@ -220,7 +223,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-source-plugin</artifactId>
-                    <version>2.0.4</version>
+                    <version>2.1.2</version>
                     <executions>
                         <execution>
                             <goals>
@@ -236,7 +239,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.5</version>
+                    <version>2.6</version>
                     <configuration>
                         <reportFormat>brief</reportFormat>
                         <useFile>false</useFile>



Mime
View raw message