Author: veithen Date: Sun Dec 19 15:40:47 2010 New Revision: 1050879 URL: http://svn.apache.org/viewvc?rev=1050879&view=rev Log: Make sure that the right NOTICE file is included in Maven artifacts.
Added: axis/axis2/java/sandesha/trunk/modules/resource-bundle/ axis/axis2/java/sandesha/trunk/modules/resource-bundle/pom.xml (with props) axis/axis2/java/sandesha/trunk/modules/resource-bundle/src/ axis/axis2/java/sandesha/trunk/modules/resource-bundle/src/main/ axis/axis2/java/sandesha/trunk/modules/resource-bundle/src/main/resources/ axis/axis2/java/sandesha/trunk/modules/resource-bundle/src/main/resources/META-INF/ axis/axis2/java/sandesha/trunk/modules/resource-bundle/src/main/resources/META-INF/LICENSE.vm - copied unchanged from r1050874, axis/axis2/java/sandesha/trunk/LICENSE.txt axis/axis2/java/sandesha/trunk/modules/resource-bundle/src/main/resources/META-INF/NOTICE.vm - copied unchanged from r1050874, axis/axis2/java/sandesha/trunk/NOTICE.txt Modified: axis/axis2/java/sandesha/trunk/modules/client/pom.xml axis/axis2/java/sandesha/trunk/modules/core/pom.xml axis/axis2/java/sandesha/trunk/modules/interop/pom.xml axis/axis2/java/sandesha/trunk/modules/mar/pom.xml axis/axis2/java/sandesha/trunk/modules/persistence/pom.xml axis/axis2/java/sandesha/trunk/modules/policy/pom.xml axis/axis2/java/sandesha/trunk/modules/rampart-integration/pom.xml axis/axis2/java/sandesha/trunk/modules/samples/pom.xml axis/axis2/java/sandesha/trunk/pom.xml Modified: axis/axis2/java/sandesha/trunk/modules/client/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/client/pom.xml?rev=1050879&r1=1050878&r2=1050879&view=diff ============================================================================== --- axis/axis2/java/sandesha/trunk/modules/client/pom.xml (original) +++ axis/axis2/java/sandesha/trunk/modules/client/pom.xml Sun Dec 19 15:40:47 2010 @@ -43,6 +43,21 @@ <build> <plugins> <plugin> + <artifactId>maven-remote-resources-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>process</goal> + </goals> + <configuration> + <resourceBundles> + <resourceBundle>org.apache.sandesha2:sandesha2-resource-bundle:${project.version}</resourceBundle> + </resourceBundles> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> <version>1.4</version> Modified: axis/axis2/java/sandesha/trunk/modules/core/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/core/pom.xml?rev=1050879&r1=1050878&r2=1050879&view=diff ============================================================================== --- axis/axis2/java/sandesha/trunk/modules/core/pom.xml (original) +++ axis/axis2/java/sandesha/trunk/modules/core/pom.xml Sun Dec 19 15:40:47 2010 @@ -43,6 +43,21 @@ <build> <plugins> <plugin> + <artifactId>maven-remote-resources-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>process</goal> + </goals> + <configuration> + <resourceBundles> + <resourceBundle>org.apache.sandesha2:sandesha2-resource-bundle:${project.version}</resourceBundle> + </resourceBundles> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> <executions> Modified: axis/axis2/java/sandesha/trunk/modules/interop/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/interop/pom.xml?rev=1050879&r1=1050878&r2=1050879&view=diff ============================================================================== --- axis/axis2/java/sandesha/trunk/modules/interop/pom.xml (original) +++ axis/axis2/java/sandesha/trunk/modules/interop/pom.xml Sun Dec 19 15:40:47 2010 @@ -42,6 +42,21 @@ <build> <plugins> <plugin> + <artifactId>maven-remote-resources-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>process</goal> + </goals> + <configuration> + <resourceBundles> + <resourceBundle>org.apache.sandesha2:sandesha2-resource-bundle:${project.version}</resourceBundle> + </resourceBundles> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> <executions> Modified: axis/axis2/java/sandesha/trunk/modules/mar/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/mar/pom.xml?rev=1050879&r1=1050878&r2=1050879&view=diff ============================================================================== --- axis/axis2/java/sandesha/trunk/modules/mar/pom.xml (original) +++ axis/axis2/java/sandesha/trunk/modules/mar/pom.xml Sun Dec 19 15:40:47 2010 @@ -43,6 +43,21 @@ <build> <plugins> <plugin> + <artifactId>maven-remote-resources-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>process</goal> + </goals> + <configuration> + <resourceBundles> + <resourceBundle>org.apache.sandesha2:sandesha2-resource-bundle:${project.version}</resourceBundle> + </resourceBundles> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> <executions> Modified: axis/axis2/java/sandesha/trunk/modules/persistence/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/persistence/pom.xml?rev=1050879&r1=1050878&r2=1050879&view=diff ============================================================================== --- axis/axis2/java/sandesha/trunk/modules/persistence/pom.xml (original) +++ axis/axis2/java/sandesha/trunk/modules/persistence/pom.xml Sun Dec 19 15:40:47 2010 @@ -52,6 +52,21 @@ </testResources> <plugins> <plugin> + <artifactId>maven-remote-resources-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>process</goal> + </goals> + <configuration> + <resourceBundles> + <resourceBundle>org.apache.sandesha2:sandesha2-resource-bundle:${project.version}</resourceBundle> + </resourceBundles> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> <version>1.1</version> Modified: axis/axis2/java/sandesha/trunk/modules/policy/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/policy/pom.xml?rev=1050879&r1=1050878&r2=1050879&view=diff ============================================================================== --- axis/axis2/java/sandesha/trunk/modules/policy/pom.xml (original) +++ axis/axis2/java/sandesha/trunk/modules/policy/pom.xml Sun Dec 19 15:40:47 2010 @@ -43,6 +43,21 @@ <build> <plugins> <plugin> + <artifactId>maven-remote-resources-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>process</goal> + </goals> + <configuration> + <resourceBundles> + <resourceBundle>org.apache.sandesha2:sandesha2-resource-bundle:${project.version}</resourceBundle> + </resourceBundles> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> <version>1.4</version> Modified: axis/axis2/java/sandesha/trunk/modules/rampart-integration/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/rampart-integration/pom.xml?rev=1050879&r1=1050878&r2=1050879&view=diff ============================================================================== --- axis/axis2/java/sandesha/trunk/modules/rampart-integration/pom.xml (original) +++ axis/axis2/java/sandesha/trunk/modules/rampart-integration/pom.xml Sun Dec 19 15:40:47 2010 @@ -43,6 +43,21 @@ <build> <plugins> <plugin> + <artifactId>maven-remote-resources-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>process</goal> + </goals> + <configuration> + <resourceBundles> + <resourceBundle>org.apache.sandesha2:sandesha2-resource-bundle:${project.version}</resourceBundle> + </resourceBundles> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> <executions> Added: axis/axis2/java/sandesha/trunk/modules/resource-bundle/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/resource-bundle/pom.xml?rev=1050879&view=auto ============================================================================== --- axis/axis2/java/sandesha/trunk/modules/resource-bundle/pom.xml (added) +++ axis/axis2/java/sandesha/trunk/modules/resource-bundle/pom.xml Sun Dec 19 15:40:47 2010 @@ -0,0 +1,73 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + 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. +--> +<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"> + <parent> + <groupId>org.apache.sandesha2</groupId> + <artifactId>sandesha2-parent</artifactId> + <version>SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.apache.sandesha2</groupId> + <artifactId>sandesha2-resource-bundle</artifactId> + <packaging>jar</packaging> + <name>Sandesha2 - Resource bundle</name> + + <!-- This needs to be set explicitly because the project structure implies that the Maven calculated defaults are wrong --> + <scm> + <connection>scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/sandesha/trunk/modules/resource-bundle</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/sandesha/trunk/modules/resource-bundle</developerConnection> + <url>http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/resource-bundle</url> + </scm> + <!-- This also needs to be set explicitly because the Maven calculated URL would point to nowhere --> + <url>http://axis.apache.org/axis2/java/sandesha/</url> + + <build> + <plugins> + <plugin> + <artifactId>maven-remote-resources-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>bundle</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <executions> + <execution> + <phase>verify</phase> + <goals> + <goal>check</goal> + </goals> + <configuration> + <excludes> + <exclude>src/main/resources/META-INF/*.vm</exclude> + </excludes> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> Propchange: axis/axis2/java/sandesha/trunk/modules/resource-bundle/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Modified: axis/axis2/java/sandesha/trunk/modules/samples/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/samples/pom.xml?rev=1050879&r1=1050878&r2=1050879&view=diff ============================================================================== --- axis/axis2/java/sandesha/trunk/modules/samples/pom.xml (original) +++ axis/axis2/java/sandesha/trunk/modules/samples/pom.xml Sun Dec 19 15:40:47 2010 @@ -52,6 +52,21 @@ </resources> <plugins> <plugin> + <artifactId>maven-remote-resources-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>process</goal> + </goals> + <configuration> + <resourceBundles> + <resourceBundle>org.apache.sandesha2:sandesha2-resource-bundle:${project.version}</resourceBundle> + </resourceBundles> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> <version>1.1</version> Modified: axis/axis2/java/sandesha/trunk/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/pom.xml?rev=1050879&r1=1050878&r2=1050879&view=diff ============================================================================== --- axis/axis2/java/sandesha/trunk/pom.xml (original) +++ axis/axis2/java/sandesha/trunk/pom.xml Sun Dec 19 15:40:47 2010 @@ -352,6 +352,7 @@ </dependencyManagement> <modules> + <module>modules/resource-bundle</module> <!-- Must be first in the list! --> <module>modules/core</module> <module>modules/mar</module> <module>modules/client</module>