It's a bit more difficult than that because our notice file (NOTICE.txt) contains some Axis2 specific entries (copyright notices for IBM, WSO2, etc.) that are not present in the default one (META-INF/NOTICE).
Andreas On Sun, Mar 14, 2010 at 20:54, Davanum Srinivas <[email protected]> wrote: > Hi Andreas, > > +1 to leave it to version 6. > > thanks, > dims > > PS: my email java-dev@ will probably bounce as i am no longer in any > of the axis/ws mailing lists. > > On Sun, Mar 14, 2010 at 2:40 PM, Andreas Veithen > <[email protected]> wrote: >> Dims, >> >> Upgrading org.apache:apache from 3 to 6 causes our JARs to include two >> sets of legal files: >> >> LICENSE.txt >> META-INF/DEPENDENCIES >> META-INF/LICENSE >> META-INF/NOTICE >> NOTICE.txt >> >> The reason is that version 6 configures an execution of the >> maven-remote-resources-plugin with >> org.apache:apache-jar-resource-bundle:1.4 as resource bundle. Since we >> also add our own files, we now end up with two sets of files. Which >> one should we keep? >> >> Andreas >> >> On Mon, Nov 9, 2009 at 19:48, <[email protected]> wrote: >>> Author: dims >>> Date: Mon Nov 9 18:48:36 2009 >>> New Revision: 834175 >>> >>> URL: http://svn.apache.org/viewvc?rev=834175&view=rev >>> Log: >>> - Update versions of some plugins >>> - Avoid http redirects caused by >>> https://maven-repository.dev.java.net/nonav/repository/ >>> - Fix packaging entry for idea and eclipse plugins >>> >>> >>> Modified: >>> webservices/axis2/trunk/java/modules/parent/pom.xml >>> webservices/axis2/trunk/java/modules/samples/java_first_jaxws/pom.xml >>> webservices/axis2/trunk/java/modules/samples/jaxws-samples/pom.xml >>> webservices/axis2/trunk/java/modules/tool/axis2-ant-plugin/pom.xml >>> >>> webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/pom.xml >>> >>> webservices/axis2/trunk/java/modules/tool/axis2-eclipse-service-plugin/pom.xml >>> webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/pom.xml >>> >>> Modified: webservices/axis2/trunk/java/modules/parent/pom.xml >>> URL: >>> http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/parent/pom.xml?rev=834175&r1=834174&r2=834175&view=diff >>> ============================================================================== >>> --- webservices/axis2/trunk/java/modules/parent/pom.xml (original) >>> +++ webservices/axis2/trunk/java/modules/parent/pom.xml Mon Nov 9 18:48:36 >>> 2009 >>> @@ -25,7 +25,7 @@ >>> <parent> >>> <groupId>org.apache</groupId> >>> <artifactId>apache</artifactId> >>> - <version>3</version> >>> + <version>6</version> >>> </parent> >>> <modelVersion>4.0.0</modelVersion> >>> <groupId>org.apache.axis2</groupId> >>> @@ -125,7 +125,7 @@ >>> <maven.antrun.version>1.1</maven.antrun.version> >>> <maven.archiver.version>2.2</maven.archiver.version> >>> <maven.artifact.version>2.0.8</maven.artifact.version> >>> - <maven.plugin.version>2.3</maven.plugin.version> >>> + <maven.plugin.version>2.5</maven.plugin.version> >>> <maven.plugin.testing.version>1.1</maven.plugin.testing.version> >>> <maven.version>2.0.7</maven.version> >>> <plexus.utils.version>1.4.9</plexus.utils.version> >>> @@ -1225,7 +1225,7 @@ >>> </plugin> >>> <plugin> >>> <artifactId>maven-plugin-plugin</artifactId> >>> - <version>2.3</version> >>> + <version>2.5</version> >>> </plugin> >>> <plugin> >>> <artifactId>maven-rar-plugin</artifactId> >>> >>> Modified: >>> webservices/axis2/trunk/java/modules/samples/java_first_jaxws/pom.xml >>> URL: >>> http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/samples/java_first_jaxws/pom.xml?rev=834175&r1=834174&r2=834175&view=diff >>> ============================================================================== >>> --- webservices/axis2/trunk/java/modules/samples/java_first_jaxws/pom.xml >>> (original) >>> +++ webservices/axis2/trunk/java/modules/samples/java_first_jaxws/pom.xml >>> Mon Nov 9 18:48:36 2009 >>> @@ -275,8 +275,8 @@ >>> </repository> >>> <repository> >>> <id>java.net</id> >>> - >>> <url>https://maven-repository.dev.java.net/nonav/repository/</url> >>> - <layout>legacy</layout> >>> + <url>http://download.java.net/maven/2/</url> >>> + <layout>default</layout> >>> <snapshots> >>> <enabled>false</enabled> >>> </snapshots> >>> >>> Modified: webservices/axis2/trunk/java/modules/samples/jaxws-samples/pom.xml >>> URL: >>> http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/samples/jaxws-samples/pom.xml?rev=834175&r1=834174&r2=834175&view=diff >>> ============================================================================== >>> --- webservices/axis2/trunk/java/modules/samples/jaxws-samples/pom.xml >>> (original) >>> +++ webservices/axis2/trunk/java/modules/samples/jaxws-samples/pom.xml Mon >>> Nov 9 18:48:36 2009 >>> @@ -271,17 +271,17 @@ >>> <url>http://www.apache.org/dist/java-repository/</url> >>> <layout>legacy</layout> >>> </repository> >>> - <repository> >>> - <id>java.net</id> >>> - >>> <url>https://maven-repository.dev.java.net/nonav/repository/</url> >>> - <layout>legacy</layout> >>> - <snapshots> >>> - <enabled>false</enabled> >>> - </snapshots> >>> - <releases> >>> - <enabled>true</enabled> >>> - </releases> >>> - </repository> >>> + <repository> >>> + <id>java.net</id> >>> + <url>http://download.java.net/maven/2/</url> >>> + <layout>default</layout> >>> + <snapshots> >>> + <enabled>false</enabled> >>> + </snapshots> >>> + <releases> >>> + <enabled>true</enabled> >>> + </releases> >>> + </repository> >>> </repositories> >>> >>> </project> >>> >>> Modified: webservices/axis2/trunk/java/modules/tool/axis2-ant-plugin/pom.xml >>> URL: >>> http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/axis2-ant-plugin/pom.xml?rev=834175&r1=834174&r2=834175&view=diff >>> ============================================================================== >>> --- webservices/axis2/trunk/java/modules/tool/axis2-ant-plugin/pom.xml >>> (original) >>> +++ webservices/axis2/trunk/java/modules/tool/axis2-ant-plugin/pom.xml Mon >>> Nov 9 18:48:36 2009 >>> @@ -30,7 +30,6 @@ >>> </parent> >>> <artifactId>axis2-ant-plugin</artifactId> >>> <name>Apache Axis2 - tool - Ant Plugin</name> >>> - <packaging>maven-plugin</packaging> >>> <description>The Axis 2 Plugin for Ant Tasks.</description> >>> <dependencies> >>> <dependency> >>> >>> Modified: >>> webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/pom.xml >>> URL: >>> http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/pom.xml?rev=834175&r1=834174&r2=834175&view=diff >>> ============================================================================== >>> --- >>> webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/pom.xml >>> (original) >>> +++ >>> webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/pom.xml >>> Mon Nov 9 18:48:36 2009 >>> @@ -30,7 +30,6 @@ >>> </parent> >>> <artifactId>axis2.eclipse.codegen.plugin</artifactId> >>> <name>Apache Axis2 - tool - Eclipse Codegen Plugin</name> >>> - <packaging>maven-plugin</packaging> >>> <description>The Axis 2 Eclipse Codegen Plugin for wsdl2java and >>> java2wsdl</description> >>> <dependencies> >>> <dependency> >>> >>> Modified: >>> webservices/axis2/trunk/java/modules/tool/axis2-eclipse-service-plugin/pom.xml >>> URL: >>> http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/axis2-eclipse-service-plugin/pom.xml?rev=834175&r1=834174&r2=834175&view=diff >>> ============================================================================== >>> --- >>> webservices/axis2/trunk/java/modules/tool/axis2-eclipse-service-plugin/pom.xml >>> (original) >>> +++ >>> webservices/axis2/trunk/java/modules/tool/axis2-eclipse-service-plugin/pom.xml >>> Mon Nov 9 18:48:36 2009 >>> @@ -30,7 +30,6 @@ >>> </parent> >>> <artifactId>axis2.eclipse.service.plugin</artifactId> >>> <name>Apache Axis2 - tool - Eclipse service Plugin</name> >>> - <packaging>maven-plugin</packaging> >>> <description>The Axis 2 Eclipse Service Plugin for Service archive >>> creation</description> >>> <dependencies> >>> <dependency> >>> >>> Modified: >>> webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/pom.xml >>> URL: >>> http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/pom.xml?rev=834175&r1=834174&r2=834175&view=diff >>> ============================================================================== >>> --- webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/pom.xml >>> (original) >>> +++ webservices/axis2/trunk/java/modules/tool/axis2-idea-plugin/pom.xml Mon >>> Nov 9 18:48:36 2009 >>> @@ -29,7 +29,6 @@ >>> <relativePath>../../parent/pom.xml</relativePath> >>> </parent> >>> <artifactId>axis2-idea-plugin</artifactId> >>> - <packaging>maven-plugin</packaging> >>> <name>Apache Axis2 - tool - Intellij IDEA Plugin</name> >>> <description> >>> A Intellij IDEA plugin for Service Archive creation and Code >>> Generation >>> >>> >>> >> > > > > -- > Davanum Srinivas :: http://davanum.wordpress.com > --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
