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 18:24:15 UTC
svn commit: r723379 - in
/webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH: pom.xml
src/main/assembly/bin.xml src/main/assembly/filter.properties
src/main/assembly/src.xml src/main/resources/META-INF/MANIFEST.MF
Author: bimargulies
Date: Thu Dec 4 09:24:15 2008
New Revision: 723379
URL: http://svn.apache.org/viewvc?rev=723379&view=rev
Log:
Address WSCOMMONS-407.
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
webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/src/main/assembly/filter.properties
webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/src/main/assembly/src.xml
webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/src/main/resources/META-INF/MANIFEST.MF
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=723379&r1=723378&r2=723379&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 09:24:15 2008
@@ -58,19 +58,11 @@
<url>http://www.apache.org/</url>
</organization>
<build>
-<!--
- this entry here is for the assembly plugin- For some reason the
- assembly plugin cannot override the filter properties (as explained
- in the docs) and also does not inherit the maven standard properties.
- This is the one that points to a separate filter props file.
- -->
- <filters>
- <filter>src/main/assembly/filter.properties</filter>
- </filters>
-<!-- adding relevant resources to the jar files -->
+ <!-- adding relevant resources to the jar files -->
<resources>
<resource>
<directory>src/main/resources</directory>
+ <filtering>true</filtering>
</resource>
</resources>
<testResources>
@@ -89,7 +81,7 @@
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
- <manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
+ <manifestFile>target/classes/META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
</plugin>
@@ -117,7 +109,7 @@
</plugin>
<plugin>
<artifactId>maven-release-plugin</artifactId>
- <version>2.0-beta-8</version>
+ <version>2.0-beta-8</version>
<configuration>
<tagBase>https://svn.apache.org/repos/asf/webservices/commons/tags/XmlSchema</tagBase>
<useReleaseProfiles>false</useReleaseProfiles>
@@ -428,9 +420,4 @@
<url>scpexe://people.apache.org/www/ws.apache.org/commons/XmlSchema</url>
</site>
</distributionManagement>
- <properties>
-<!-- should the osgi version be the same as the artifact id ?? -->
- <xmlschema.osgi.version>1.4</xmlschema.osgi.version>
- <bundle.plugin.version>1.4.0</bundle.plugin.version>
- </properties>
</project>
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=723379&r1=723378&r2=723379&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 09:24:15 2008
@@ -21,6 +21,7 @@
<id>bin</id>
<formats>
<format>zip</format>
+ <format>dir</format>
</formats>
<includeSiteDirectory>false</includeSiteDirectory>
<fileSets>
Modified: webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/src/main/assembly/filter.properties
URL: http://svn.apache.org/viewvc/webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/src/main/assembly/filter.properties?rev=723379&r1=723378&r2=723379&view=diff
==============================================================================
--- webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/src/main/assembly/filter.properties (original)
+++ webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/src/main/assembly/filter.properties Thu Dec 4 09:24:15 2008
@@ -1,25 +0,0 @@
-#
-# ~ 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.
-#
-# This entry here is for the assembly plugin- For some reason
-# the assembly plugin cannot override the filter properties (as explained
-# in the docs) and also does not inherit the maven standard properties. This
-# is the one that points to a separate filter props file
-#
-
-version = 1.4.3
\ No newline at end of file
Modified: webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/src/main/assembly/src.xml?rev=723379&r1=723378&r2=723379&view=diff
==============================================================================
--- webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/src/main/assembly/src.xml (original)
+++ webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/src/main/assembly/src.xml Thu Dec 4 09:24:15 2008
@@ -21,6 +21,7 @@
<id>src</id>
<formats>
<format>zip</format>
+ <format>dir</format>
</formats>
<fileSets>
<fileSet>
Modified: webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/src/main/resources/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/src/main/resources/META-INF/MANIFEST.MF?rev=723379&r1=723378&r2=723379&view=diff
==============================================================================
--- webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/src/main/resources/META-INF/MANIFEST.MF (original)
+++ webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/src/main/resources/META-INF/MANIFEST.MF Thu Dec 4 09:24:15 2008
@@ -15,7 +15,7 @@
org.apache.ws.commons.schema.utils,
org.apache.ws.commons.schema.constants,
org.apache.ws.commons.schema.extensions
-Bundle-Version: 1.4.3
+Bundle-Version: ${project.version}
Bundle-Name: XmlSchema
Bundle-DocURL: http://www.apache.org/
Bundle-ManifestVersion: 2