You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2015/12/16 00:53:17 UTC
svn commit: r1720279 - in /axis/axis2/java/core/trunk: ./
modules/distribution/ modules/distribution/src/main/assembly/
modules/samples/ modules/samples/java_first_jaxws/
modules/samples/jaxws-addressbook/ modules/samples/jaxws-calculator/
modules/samp...
Author: veithen
Date: Tue Dec 15 23:53:16 2015
New Revision: 1720279
URL: http://svn.apache.org/viewvc?rev=1720279&view=rev
Log:
Get rid of the 'everything' profile and always include all modules in the build (but don't deploy them all).
Added:
axis/axis2/java/core/trunk/modules/samples/pom.xml (with props)
Modified:
axis/axis2/java/core/trunk/modules/distribution/pom.xml
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
axis/axis2/java/core/trunk/modules/samples/ (props changed)
axis/axis2/java/core/trunk/modules/samples/java_first_jaxws/pom.xml
axis/axis2/java/core/trunk/modules/samples/jaxws-addressbook/pom.xml
axis/axis2/java/core/trunk/modules/samples/jaxws-calculator/pom.xml
axis/axis2/java/core/trunk/modules/samples/jaxws-interop/pom.xml
axis/axis2/java/core/trunk/modules/samples/jaxws-samples/pom.xml
axis/axis2/java/core/trunk/modules/samples/jaxws-version/pom.xml
axis/axis2/java/core/trunk/pom.xml
Modified: axis/axis2/java/core/trunk/modules/distribution/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/distribution/pom.xml?rev=1720279&r1=1720278&r2=1720279&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/distribution/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/distribution/pom.xml Tue Dec 15 23:53:16 2015
@@ -445,7 +445,7 @@
<configuration>
<projectsDirectory>${project.build.directory}/axis2-${project.version}/samples</projectsDirectory>
<pomIncludes>
- <pomInclude>*/pom.xml</pomInclude>
+ <pomInclude>pom.xml</pomInclude>
</pomIncludes>
<streamLogs>true</streamLogs>
</configuration>
Modified: axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml?rev=1720279&r1=1720278&r2=1720279&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml (original)
+++ axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml Tue Dec 15 23:53:16 2015
@@ -124,6 +124,7 @@
<directory>../../modules/samples</directory>
<outputDirectory>samples</outputDirectory>
<includes>
+ <include>pom.xml</include>
<include>databinding/**/*</include>
<include>faulthandling/**/*</include>
<include>jaxws-calculator/**/*</include>
Propchange: axis/axis2/java/core/trunk/modules/samples/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Dec 15 23:53:16 2015
@@ -1 +1,2 @@
*.iml
+target
Modified: axis/axis2/java/core/trunk/modules/samples/java_first_jaxws/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/samples/java_first_jaxws/pom.xml?rev=1720279&r1=1720278&r2=1720279&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/samples/java_first_jaxws/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/samples/java_first_jaxws/pom.xml Tue Dec 15 23:53:16 2015
@@ -21,10 +21,13 @@
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">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.axis2.examples</groupId>
+ <parent>
+ <groupId>org.apache.axis2.examples</groupId>
+ <artifactId>samples</artifactId>
+ <version>1.7.0-SNAPSHOT</version>
+ </parent>
<artifactId>java_first_jaxws</artifactId>
<name>JAXWS - Starting from Java Example</name>
- <version>1.7.0-SNAPSHOT</version>
<packaging>war</packaging>
<inceptionYear>2004</inceptionYear>
@@ -158,14 +161,4 @@
</testResource>
</testResources>
</build>
- <repositories>
- <repository>
- <id>apache.snapshots</id>
- <name>Apache Snapshot Repository</name>
- <url>http://repository.apache.org/snapshots</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
</project>
Modified: axis/axis2/java/core/trunk/modules/samples/jaxws-addressbook/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/samples/jaxws-addressbook/pom.xml?rev=1720279&r1=1720278&r2=1720279&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/samples/jaxws-addressbook/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/samples/jaxws-addressbook/pom.xml Tue Dec 15 23:53:16 2015
@@ -20,10 +20,13 @@
<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">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.axis2.samples</groupId>
+ <parent>
+ <groupId>org.apache.axis2.examples</groupId>
+ <artifactId>samples</artifactId>
+ <version>1.7.0-SNAPSHOT</version>
+ </parent>
<artifactId>jaxws-addressbook</artifactId>
<packaging>jar</packaging>
- <version>1.7.0-SNAPSHOT</version>
<name>JAXWS Addressbook Service</name>
<build>
<sourceDirectory>src</sourceDirectory>
@@ -134,14 +137,4 @@
<version>1.7.0-SNAPSHOT</version>
</dependency>
</dependencies>
- <repositories>
- <repository>
- <id>apache.snapshots</id>
- <name>Apache Snapshot Repository</name>
- <url>http://repository.apache.org/snapshots</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
</project>
Modified: axis/axis2/java/core/trunk/modules/samples/jaxws-calculator/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/samples/jaxws-calculator/pom.xml?rev=1720279&r1=1720278&r2=1720279&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/samples/jaxws-calculator/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/samples/jaxws-calculator/pom.xml Tue Dec 15 23:53:16 2015
@@ -20,10 +20,13 @@
<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">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.axis2.samples</groupId>
+ <parent>
+ <groupId>org.apache.axis2.examples</groupId>
+ <artifactId>samples</artifactId>
+ <version>1.7.0-SNAPSHOT</version>
+ </parent>
<artifactId>jaxws-calculator</artifactId>
<packaging>jar</packaging>
- <version>1.7.0-SNAPSHOT</version>
<name>JAXWS Calculator Service</name>
<build>
<sourceDirectory>src</sourceDirectory>
@@ -81,14 +84,4 @@
<version>1.7.0-SNAPSHOT</version>
</dependency>
</dependencies>
- <repositories>
- <repository>
- <id>apache.snapshots</id>
- <name>Apache Snapshot Repository</name>
- <url>http://repository.apache.org/snapshots</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
</project>
Modified: axis/axis2/java/core/trunk/modules/samples/jaxws-interop/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/samples/jaxws-interop/pom.xml?rev=1720279&r1=1720278&r2=1720279&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/samples/jaxws-interop/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/samples/jaxws-interop/pom.xml Tue Dec 15 23:53:16 2015
@@ -20,10 +20,13 @@
<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">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.axis2.samples</groupId>
+ <parent>
+ <groupId>org.apache.axis2.examples</groupId>
+ <artifactId>samples</artifactId>
+ <version>1.7.0-SNAPSHOT</version>
+ </parent>
<artifactId>jaxws-interop</artifactId>
<packaging>jar</packaging>
- <version>1.7.0-SNAPSHOT</version>
<name>JAXWS Interop Sample</name>
<build>
<sourceDirectory>src</sourceDirectory>
@@ -62,14 +65,4 @@
<version>1.7.0-SNAPSHOT</version>
</dependency>
</dependencies>
- <repositories>
- <repository>
- <id>apache.snapshots</id>
- <name>Apache Snapshot Repository</name>
- <url>http://repository.apache.org/snapshots</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
</project>
Modified: axis/axis2/java/core/trunk/modules/samples/jaxws-samples/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/samples/jaxws-samples/pom.xml?rev=1720279&r1=1720278&r2=1720279&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/samples/jaxws-samples/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/samples/jaxws-samples/pom.xml Tue Dec 15 23:53:16 2015
@@ -21,10 +21,13 @@
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">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.axis2.examples</groupId>
+ <parent>
+ <groupId>org.apache.axis2.examples</groupId>
+ <artifactId>samples</artifactId>
+ <version>1.7.0-SNAPSHOT</version>
+ </parent>
<artifactId>jaxws-samples</artifactId>
<name>JAXWS Samples - Echo, Ping, MTOM</name>
- <version>1.7.0-SNAPSHOT</version>
<packaging>war</packaging>
<dependencies>
<dependency>
@@ -171,14 +174,4 @@
</testResource>
</testResources>
</build>
- <repositories>
- <repository>
- <id>apache.snapshots</id>
- <name>Apache Snapshot Repository</name>
- <url>http://repository.apache.org/snapshots</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
</project>
Modified: axis/axis2/java/core/trunk/modules/samples/jaxws-version/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/samples/jaxws-version/pom.xml?rev=1720279&r1=1720278&r2=1720279&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/samples/jaxws-version/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/samples/jaxws-version/pom.xml Tue Dec 15 23:53:16 2015
@@ -20,9 +20,12 @@
<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">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.axis2.examples</groupId>
+ <parent>
+ <groupId>org.apache.axis2.examples</groupId>
+ <artifactId>samples</artifactId>
+ <version>1.7.0-SNAPSHOT</version>
+ </parent>
<artifactId>jaxws-version</artifactId>
- <version>1.7.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Apache Axis2 -JAXWS Version Service</name>
<build>
@@ -50,14 +53,4 @@
<version>${project.version}</version>
</dependency>
</dependencies>
- <repositories>
- <repository>
- <id>apache.snapshots</id>
- <name>Apache Snapshot Repository</name>
- <url>http://repository.apache.org/snapshots</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
</project>
Added: axis/axis2/java/core/trunk/modules/samples/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/samples/pom.xml?rev=1720279&view=auto
==============================================================================
--- axis/axis2/java/core/trunk/modules/samples/pom.xml (added)
+++ axis/axis2/java/core/trunk/modules/samples/pom.xml Tue Dec 15 23:53:16 2015
@@ -0,0 +1,63 @@
+<!--
+ ~ 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">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-parent</artifactId>
+ <version>1.7.0-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
+ </parent>
+ <groupId>org.apache.axis2.examples</groupId>
+ <artifactId>samples</artifactId>
+ <name>Samples parent POM</name>
+ <packaging>pom</packaging>
+ <modules>
+ <module>java_first_jaxws</module>
+ <module>jaxws-addressbook</module>
+ <module>jaxws-calculator</module>
+ <module>jaxws-interop</module>
+ <module>jaxws-samples</module>
+ <module>jaxws-version</module>
+ </modules>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <repositories>
+ <repository>
+ <!-- Necessary because the samples are copied into the binary distribution -->
+ <id>apache.snapshots</id>
+ <name>Apache Snapshot Repository</name>
+ <url>http://repository.apache.org/snapshots</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
+ </repositories>
+</project>
Propchange: axis/axis2/java/core/trunk/modules/samples/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: axis/axis2/java/core/trunk/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/pom.xml?rev=1720279&r1=1720278&r2=1720279&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/pom.xml (original)
+++ axis/axis2/java/core/trunk/pom.xml Tue Dec 15 23:53:16 2015
@@ -93,31 +93,12 @@
<module>modules/transport/testkit</module>
<module>modules/transport/udp</module>
<module>modules/transport/xmpp</module>
+ <module>modules/distribution</module>
+ <module>modules/samples</module>
</modules>
<profiles>
<profile>
- <!-- This profile needs to be activated when doing the release:prepare
- (by adding -Peverything) to make sure that the release plugin updates
- the version numbers of all relevant submodules. It must contain
- all modules not built by default, i.e. the set of modules used
- by this profile must be the union of the module sets of all
- other profiles. -->
- <id>everything</id>
- <modules>
- <module>modules/distribution</module>
- <module>modules/samples/java_first_jaxws</module>
- <module>modules/samples/jaxws-addressbook</module>
- <module>modules/samples/jaxws-calculator</module>
- <module>modules/samples/jaxws-interop</module>
- <module>modules/samples/jaxws-samples</module>
- <module>modules/samples/jaxws-version</module>
- </modules>
- </profile>
- <profile>
<id>apache-release</id>
- <modules>
- <module>modules/distribution</module>
- </modules>
<build>
<plugins>
<plugin>