You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commons-dev@ws.apache.org by bi...@apache.org on 2008/12/04 19:05:18 UTC

svn commit: r723387 - in /webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH: pom.xml src/main/assembly/bin.xml

Author: bimargulies
Date: Thu Dec  4 10:05:18 2008
New Revision: 723387

URL: http://svn.apache.org/viewvc?rev=723387&view=rev
Log:
Keep trying to get the pom right.

Modified:
    webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/pom.xml
    webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/src/main/assembly/bin.xml

Modified: webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/pom.xml
URL: http://svn.apache.org/viewvc/webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/pom.xml?rev=723387&r1=723386&r2=723387&view=diff
==============================================================================
--- webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/pom.xml (original)
+++ webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/pom.xml Thu Dec  4 10:05:18 2008
@@ -85,6 +85,25 @@
           </archive>
         </configuration>
       </plugin>
+      <plugin>	 
+        <artifactId>maven-remote-resources-plugin</artifactId>
+        <version>1.0</version>
+        <executions>
+            <execution>
+                <goals>
+                    <goal>process</goal>
+                </goals>
+                <configuration>
+                    <resourceBundles>
+                        <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
+                    </resourceBundles>
+                    <properties>
+                        <projectName>Apache WebServices - XmlSchema</projectName>
+                    </properties>
+                </configuration>
+            </execution>
+        </executions>
+      </plugin>
       <plugin>
         <artifactId>maven-antrun-plugin</artifactId>
         <version>1.1</version>
@@ -152,6 +171,30 @@
         </configuration>
       </plugin>
       <plugin>
+        <artifactId>maven-site-plugin</artifactId>
+         <executions>
+           <execution>
+             <id>site</id>
+             <phase>package</phase>
+             <goals>
+               <goal>site</goal>
+             </goals>
+           </execution>
+         </executions>
+       </plugin>
+       <plugin>
+         <artifactId>maven-assembly-plugin</artifactId>
+         <executions>
+           <execution>
+             <id>single</id>
+             <phase>package</phase>
+             <goals>
+               <goal>single</goal>
+             </goals>
+           </execution>
+         </executions>
+       </plugin>
+      <plugin>
         <artifactId>maven-source-plugin</artifactId>
         <executions>
           <execution>
@@ -179,14 +222,11 @@
       <build>
         <plugins>
 <!--
-						We want to sign the artifact, the POM, and all attached artifacts
-					-->
+    We want to sign the artifact, the POM, and all attached artifacts
+-->
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-gpg-plugin</artifactId>
-            <configuration>
-              <passphrase>${gpg.passphrase}</passphrase>
-            </configuration>
             <executions>
               <execution>
                 <goals>
@@ -196,8 +236,32 @@
             </executions>
           </plugin>
 <!--
-						We want to deploy the artifact to a staging location for perusal
-					-->
+    We want to deploy the artifact to a staging location for perusal
+-->
+          <plugin>
+            <artifactId>maven-site-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>site</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>site</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <artifactId>maven-assembly-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>single</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>single</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
           <plugin>
             <inherited>true</inherited>
             <groupId>org.apache.maven.plugins</groupId>

Modified: webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/src/main/assembly/bin.xml?rev=723387&r1=723386&r2=723387&view=diff
==============================================================================
--- webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/src/main/assembly/bin.xml (original)
+++ webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/src/main/assembly/bin.xml Thu Dec  4 10:05:18 2008
@@ -1,52 +1,62 @@
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements. See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership. The ASF licenses this file
-  ~ to you 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.
-  -->
-
-<assembly>
-    <id>bin</id>
-    <formats>
-        <format>zip</format>
-        <format>dir</format>
-    </formats>
-    <includeSiteDirectory>false</includeSiteDirectory>
-    <fileSets>
-        <fileSet>
-            <includes>
-                <include>*.txt</include>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements. See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership. The ASF licenses this file
+  ~ to you 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.
+  -->
+
+<assembly>
+    <id>bin</id>
+    <formats>
+        <format>zip</format>
+        <format>dir</format>
+    </formats>
+    <includeSiteDirectory>false</includeSiteDirectory>
+    <fileSets>
+        <fileSet>
+            <includes>
+                <include>*.txt</include>
             </includes>
 			<!-- Note that we exclude these txt files and later copy them with
 				 filteres -->
  			<excludes>
                 <exclude>README.txt</exclude>
 			    <exclude>RELEASE-NOTE.txt</exclude>
-            </excludes>
-        </fileSet>
-        <fileSet>
-            <directory>target</directory>
-            <outputDirectory></outputDirectory>
-            <includes>
-                <include>*.jar</include>
-            </includes>
-            <!-- exclude sources -->
-             <excludes>
-                <exclude>*-sources.jar</exclude>
-            </excludes>
-        </fileSet>
+            </excludes>
+        </fileSet>
+        <fileSet>
+            <directory>target</directory>
+            <outputDirectory></outputDirectory>
+            <includes>
+                <include>*.jar</include>
+            </includes>
+            <!-- exclude sources -->
+             <excludes>
+                <exclude>*-sources.jar</exclude>
+            </excludes>
+        </fileSet>
+       <fileSet>
+         <directory>target/maven-shared-archive-resources/META-INF</directory>
+         <outputDirectory>.</outputDirectory>
+         <includes>
+             <include>*</include>
+         </includes>
+         <excludes>
+             <exclude>DEPENDENCIES</exclude>
+         </excludes>
+     </fileSet>
     </fileSets>
     <files>
 	<file>
@@ -59,10 +69,10 @@
       <outputDirectory>/</outputDirectory>
       <filtered>true</filtered>
     </file>
- </files>
-    <dependencySets>
-        <dependencySet>
-            <outputDirectory>/lib</outputDirectory>
-        </dependencySet>
-    </dependencySets>
-</assembly>
+ </files>
+    <dependencySets>
+        <dependencySet>
+            <outputDirectory>/lib</outputDirectory>
+        </dependencySet>
+    </dependencySets>
+</assembly>