You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by jb...@apache.org on 2014/05/31 06:49:15 UTC
svn commit: r1598807 - in /aries/trunk: tutorials/ util/ util/util-r42/
util/util/ versioning/ versioning/versioning-checker/
versioning/versioning-plugin/ web/ web/web-itests/ web/web-urlhandler/
Author: jbonofre
Date: Sat May 31 04:49:14 2014
New Revision: 1598807
URL: http://svn.apache.org/r1598807
Log:
Merge branch 'ARIES-1006' into trunk
Modified:
aries/trunk/tutorials/pom.xml
aries/trunk/util/pom.xml
aries/trunk/util/util-r42/pom.xml
aries/trunk/util/util/pom.xml
aries/trunk/versioning/pom.xml
aries/trunk/versioning/versioning-checker/pom.xml
aries/trunk/versioning/versioning-plugin/pom.xml
aries/trunk/web/pom.xml
aries/trunk/web/web-itests/pom.xml
aries/trunk/web/web-urlhandler/pom.xml
Modified: aries/trunk/tutorials/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/tutorials/pom.xml?rev=1598807&r1=1598806&r2=1598807&view=diff
==============================================================================
--- aries/trunk/tutorials/pom.xml (original)
+++ aries/trunk/tutorials/pom.xml Sat May 31 04:49:14 2014
@@ -1,19 +1,21 @@
<?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.
+ 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">
@@ -21,17 +23,17 @@
<parent>
<groupId>org.apache.aries</groupId>
- <artifactId>java5-parent</artifactId>
- <version>1.0.0</version>
+ <artifactId>parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
</parent>
-
-
+
<groupId>org.apache.aries.tutorials</groupId>
<artifactId>tutorials</artifactId>
<version>0.1-SNAPSHOT</version>
<name>Apache Aries Tutorials</name>
<packaging>pom</packaging>
-
+
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/tutorials</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/tutorials</developerConnection>
@@ -48,7 +50,7 @@
<ariesUtilVersion>0.1-SNAPSHOT</ariesUtilVersion>
<ariesWebVersion>0.1-SNAPSHOT</ariesWebVersion>
</properties>
-
+
<dependencyManagement>
<dependencies>
<dependency>
@@ -109,13 +111,13 @@
<artifactId>geronimo-jta_1.1_spec</artifactId>
<version>1.1.1</version>
</dependency>
-<!--
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_1.0_spec</artifactId>
- <version>1.1.2</version>
- </dependency>
--->
+ <!--
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jpa_1.0_spec</artifactId>
+ <version>1.1.2</version>
+ </dependency>
+ -->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_2.0_spec</artifactId>
Modified: aries/trunk/util/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/util/pom.xml?rev=1598807&r1=1598806&r2=1598807&view=diff
==============================================================================
--- aries/trunk/util/pom.xml (original)
+++ aries/trunk/util/pom.xml Sat May 31 04:49:14 2014
@@ -1,3 +1,4 @@
+<?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
@@ -17,18 +18,19 @@
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.aries</groupId>
- <artifactId>java5-parent</artifactId>
- <version>1.0.0</version>
- <relativePath />
+ <artifactId>parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
</parent>
<artifactId>org.apache.aries.util-parent</artifactId>
<packaging>pom</packaging>
<version>1.1.1-SNAPSHOT</version>
-
<name>Apache Aries Util</name>
<description>
This bundle contains the OSGi common util for Apache Aries
@@ -44,6 +46,5 @@
<module>util-r42</module>
<module>util</module>
</modules>
-
</project>
Modified: aries/trunk/util/util-r42/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/util/util-r42/pom.xml?rev=1598807&r1=1598806&r2=1598807&view=diff
==============================================================================
--- aries/trunk/util/util-r42/pom.xml (original)
+++ aries/trunk/util/util-r42/pom.xml Sat May 31 04:49:14 2014
@@ -1,3 +1,4 @@
+<?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
@@ -17,12 +18,14 @@
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.aries</groupId>
- <artifactId>java5-parent</artifactId>
- <version>1.0.0</version>
- <relativePath />
+ <artifactId>parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<artifactId>org.apache.aries.util-r42</artifactId>
@@ -35,49 +38,52 @@
<!-- no scm info since this and the util project must be built together to produce the util bundle -->
<!--<properties>-->
- <!--<!– Export package versions are maintained in packageinfo files –>-->
+ <!--<!– Export package versions are maintained in packageinfo files –>-->
- <!--<aries.osgi.export.pkg>-->
- <!--org.apache.aries.util;-->
- <!--org.apache.aries.util.tracker;-->
- <!--org.apache.aries.util.nls;-->
- <!--org.apache.aries.util.io;-->
- <!--org.apache.aries.util.service.registry;-->
- <!--org.apache.aries.util.manifest;-->
- <!--org.apache.aries.util.filesystem;-->
- <!--</aries.osgi.export.pkg>-->
- <!--<aries.osgi.import.pkg>-->
- <!--!org.apache.aries.util*,-->
- <!--org.osgi.framework.hooks.bundle;resolution:=optional,-->
- <!--org.osgi.framework.launch;resolution:=optional,-->
- <!--org.osgi.framework.wiring.*;resolution:=optional,-->
- <!--org.osgi.service.framework;resolution:=optional,-->
- <!--org.eclipse.osgi.internal.loader;resolution:=optional,-->
- <!--org.eclipse.osgi.framework.internal.core;resolution:=optional,-->
- <!--org.eclipse.osgi.framework.adaptor;resolution:=optional,-->
- <!--*-->
- <!--</aries.osgi.import.pkg>-->
- <!--<aries.osgi.private.pkg>-->
- <!--org.apache.aries.util.internal,-->
- <!--org.apache.aries.util.filesystem.impl,-->
- <!--org.apache.aries.util.tracker.hook-->
- <!--</aries.osgi.private.pkg>-->
+ <!--<aries.osgi.export.pkg>-->
+ <!--org.apache.aries.util;-->
+ <!--org.apache.aries.util.tracker;-->
+ <!--org.apache.aries.util.nls;-->
+ <!--org.apache.aries.util.io;-->
+ <!--org.apache.aries.util.service.registry;-->
+ <!--org.apache.aries.util.manifest;-->
+ <!--org.apache.aries.util.filesystem;-->
+ <!--</aries.osgi.export.pkg>-->
+ <!--<aries.osgi.import.pkg>-->
+ <!--!org.apache.aries.util*,-->
+ <!--org.osgi.framework.hooks.bundle;resolution:=optional,-->
+ <!--org.osgi.framework.launch;resolution:=optional,-->
+ <!--org.osgi.framework.wiring.*;resolution:=optional,-->
+ <!--org.osgi.service.framework;resolution:=optional,-->
+ <!--org.eclipse.osgi.internal.loader;resolution:=optional,-->
+ <!--org.eclipse.osgi.framework.internal.core;resolution:=optional,-->
+ <!--org.eclipse.osgi.framework.adaptor;resolution:=optional,-->
+ <!--*-->
+ <!--</aries.osgi.import.pkg>-->
+ <!--<aries.osgi.private.pkg>-->
+ <!--org.apache.aries.util.internal,-->
+ <!--org.apache.aries.util.filesystem.impl,-->
+ <!--org.apache.aries.util.tracker.hook-->
+ <!--</aries.osgi.private.pkg>-->
<!--</properties>-->
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
+ <version>4.2.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
+ <version>4.2.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse</groupId>
<artifactId>osgi</artifactId>
+ <version>3.5.0.v20090520</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -92,4 +98,5 @@
<scope>test</scope>
</dependency>
</dependencies>
+
</project>
Modified: aries/trunk/util/util/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/util/util/pom.xml?rev=1598807&r1=1598806&r2=1598807&view=diff
==============================================================================
--- aries/trunk/util/util/pom.xml (original)
+++ aries/trunk/util/util/pom.xml Sat May 31 04:49:14 2014
@@ -1,3 +1,4 @@
+<?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
@@ -17,12 +18,14 @@
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.aries</groupId>
- <artifactId>java5-parent</artifactId>
- <version>1.0.0</version>
- <relativePath />
+ <artifactId>parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<artifactId>org.apache.aries.util</artifactId>
@@ -37,7 +40,6 @@
<properties>
<!-- Export package versions are maintained in packageinfo files -->
-
<aries.osgi.export.pkg>
org.apache.aries.util*;-split-package:=merge-first
</aries.osgi.export.pkg>
@@ -69,7 +71,6 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>4.3.1</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -80,6 +81,7 @@
<dependency>
<groupId>org.eclipse</groupId>
<artifactId>osgi</artifactId>
+ <version>3.5.0.v20090520</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -96,31 +98,31 @@
</dependencies>
<build>
- <plugins>
-<!-- Configure the javadoc plugin to also include the r42 javadoc -->
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.8.1</version>
- <executions>
- <execution>
- <id>javadoc-jar</id>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- <configuration>
- <excludePackageNames>*.impl:*.internal</excludePackageNames>
- <!-- switch on dependency-driven aggregation -->
- <includeDependencySources>true</includeDependencySources>
-
- <dependencySourceIncludes>
- <dependencySourceInclude>org.apache.aries:*util*</dependencySourceInclude>
- </dependencySourceIncludes>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
+ <plugins>
+ <!-- Configure the javadoc plugin to also include the r42 javadoc -->
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.8.1</version>
+ <executions>
+ <execution>
+ <id>javadoc-jar</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <excludePackageNames>*.impl:*.internal</excludePackageNames>
+ <!-- switch on dependency-driven aggregation -->
+ <includeDependencySources>true</includeDependencySources>
+
+ <dependencySourceIncludes>
+ <dependencySourceInclude>org.apache.aries:*util*</dependencySourceInclude>
+ </dependencySourceIncludes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.aries.versioning</groupId>
<artifactId>org.apache.aries.versioning.plugin</artifactId>
<version>0.1.0</version>
@@ -136,7 +138,8 @@
</configuration>
</execution>
</executions>
- </plugin>
+ </plugin>
</plugins>
</build>
+
</project>
Modified: aries/trunk/versioning/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/versioning/pom.xml?rev=1598807&r1=1598806&r2=1598807&view=diff
==============================================================================
--- aries/trunk/versioning/pom.xml (original)
+++ aries/trunk/versioning/pom.xml Sat May 31 04:49:14 2014
@@ -16,13 +16,16 @@
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">
+-->
+<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.aries</groupId>
- <artifactId>java5-parent</artifactId>
- <version>1.0.0</version>
- <relativePath />
+ <artifactId>parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.versioning</groupId>
@@ -34,9 +37,9 @@
OSGi Semantic Versioning Checker
</description>
-
<modules>
<module>versioning-checker</module>
<module>versioning-plugin</module>
- </modules>
+ </modules>
+
</project>
Modified: aries/trunk/versioning/versioning-checker/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/versioning/versioning-checker/pom.xml?rev=1598807&r1=1598806&r2=1598807&view=diff
==============================================================================
--- aries/trunk/versioning/versioning-checker/pom.xml (original)
+++ aries/trunk/versioning/versioning-checker/pom.xml Sat May 31 04:49:14 2014
@@ -1,3 +1,4 @@
+<?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
@@ -17,19 +18,20 @@
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/xsd/maven-4.0.0.xsd">
+
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.aries</groupId>
- <artifactId>java5-parent</artifactId>
- <version>1.0.0</version>
- <relativePath />
+ <artifactId>parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
+
<groupId>org.apache.aries.versioning</groupId>
<artifactId>org.apache.aries.versioning.checker</artifactId>
<version>0.2.1-SNAPSHOT</version>
<packaging>bundle</packaging>
-
<name>org.apache.aries.versioning.checker</name>
<url>http://maven.apache.org</url>
@@ -58,7 +60,6 @@
</properties>
<dependencies>
-
<!-- Dependency on other Aries module bundles -->
<dependency>
<groupId>org.apache.aries</groupId>
@@ -72,7 +73,6 @@
<version>0.3</version>
</dependency>
-
<!--External dependencies. Versions may be specified in default parent -->
<dependency>
<groupId>junit</groupId>
@@ -101,4 +101,5 @@
<scope>test</scope>
</dependency>
</dependencies>
+
</project>
Modified: aries/trunk/versioning/versioning-plugin/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/versioning/versioning-plugin/pom.xml?rev=1598807&r1=1598806&r2=1598807&view=diff
==============================================================================
--- aries/trunk/versioning/versioning-plugin/pom.xml (original)
+++ aries/trunk/versioning/versioning-plugin/pom.xml Sat May 31 04:49:14 2014
@@ -1,27 +1,45 @@
-<?xml version="1.0"?>
+<?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/xsd/maven-4.0.0.xsd">
+
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.aries</groupId>
- <artifactId>java5-parent</artifactId>
- <version>1.0.0</version>
- <relativePath />
+ <artifactId>parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
+
<groupId>org.apache.aries.versioning</groupId>
<artifactId>org.apache.aries.versioning.plugin</artifactId>
<version>0.2.1-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>org.apache.aries.versioning.plugin Maven Mojo</name>
-
-
-
+
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/versioning/versioning-plugin</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/versioning/versioning-plugin</developerConnection>
<url>http://svn.apache.org/viewvc/aries/trunk/versioning/versioning-plugin</url>
</scm>
-
-
+
<dependencies>
<dependency>
<groupId>org.apache.aries.versioning</groupId>
@@ -71,7 +89,7 @@
<version>3.8.1</version>
<scope>test</scope>
</dependency>
-
+
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
@@ -90,6 +108,7 @@
<version>1.4</version>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -97,7 +116,6 @@
<version>3.2</version>
<configuration>
<goalPrefix>asv</goalPrefix>
- <useJava5>true</useJava5>
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
</configuration>
<executions>
@@ -111,4 +129,5 @@
</plugin>
</plugins>
</build>
+
</project>
Modified: aries/trunk/web/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/web/pom.xml?rev=1598807&r1=1598806&r2=1598807&view=diff
==============================================================================
--- aries/trunk/web/pom.xml (original)
+++ aries/trunk/web/pom.xml Sat May 31 04:49:14 2014
@@ -1,3 +1,4 @@
+<?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
@@ -17,14 +18,16 @@
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>
- <artifactId>java5-parent</artifactId>
<groupId>org.apache.aries</groupId>
- <version>1.0.0</version>
- <relativePath />
+ <artifactId>parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.aries.web</groupId>
<artifactId>web</artifactId>
<packaging>pom</packaging>
Modified: aries/trunk/web/web-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/web/web-itests/pom.xml?rev=1598807&r1=1598806&r2=1598807&view=diff
==============================================================================
--- aries/trunk/web/web-itests/pom.xml (original)
+++ aries/trunk/web/web-itests/pom.xml Sat May 31 04:49:14 2014
@@ -1,26 +1,32 @@
+<?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.
+ 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.aries</groupId>
- <artifactId>java5-parent</artifactId>
- <version>1.0.0</version>
- <relativePath />
+ <artifactId>parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.aries.web</groupId>
<artifactId>org.apache.aries.web.itests</artifactId>
@@ -28,12 +34,12 @@
<name>Apache Aries Web integration tests</name>
<version>1.0.1-SNAPSHOT</version>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/web/web-itests</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/web/web-itests</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/web/web-itests</url>
- </scm>
-
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/web/web-itests</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/web/web-itests</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/web/web-itests</url>
+ </scm>
+
<properties>
<exam.version>3.4.0</exam.version>
<url.version>1.6.0</url.version>
@@ -41,7 +47,7 @@
<dependencies>
<dependency>
- <groupId>org.ow2.asm</groupId>
+ <groupId>org.ow2.asm</groupId>
<artifactId>asm-all</artifactId>
<version>4.0</version>
</dependency>
@@ -63,27 +69,27 @@
<version>1.0.0</version>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.configadmin</artifactId>
- <version>1.2.4</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.core</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.configadmin</artifactId>
+ <version>1.2.4</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
-
+
<dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
<scope>test</scope>
<version>1.0.0</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.aries.proxy</groupId>
<artifactId>org.apache.aries.proxy</artifactId>
@@ -96,7 +102,7 @@
<scope>test</scope>
<version>1.0.0</version>
</dependency>
-
+
<!-- pax exam -->
<dependency>
<groupId>org.slf4j</groupId>
@@ -150,10 +156,10 @@
<artifactId>tinybundles</artifactId>
<version>2.0.0</version>
<exclusions>
- <exclusion>
- <artifactId>org.osgi.core</artifactId>
- <groupId>org.osgi</groupId>
- </exclusion>
+ <exclusion>
+ <artifactId>org.osgi.core</artifactId>
+ <groupId>org.osgi</groupId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -183,7 +189,7 @@
<version>1.2</version>
<executions>
<execution>
- <phase>generate-resources</phase>
+ <phase>generate-resources</phase>
<id>generate-depends-file</id>
<goals>
<goal>generate-depends-file</goal>
@@ -228,4 +234,5 @@
</build>
</profile>
</profiles>
+
</project>
Modified: aries/trunk/web/web-urlhandler/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/web/web-urlhandler/pom.xml?rev=1598807&r1=1598806&r2=1598807&view=diff
==============================================================================
--- aries/trunk/web/web-urlhandler/pom.xml (original)
+++ aries/trunk/web/web-urlhandler/pom.xml Sat May 31 04:49:14 2014
@@ -1,3 +1,4 @@
+<?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
@@ -17,13 +18,15 @@
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.aries</groupId>
- <artifactId>java5-parent</artifactId>
- <version>1.0.0</version>
- <relativePath />
+ <artifactId>parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.aries.web</groupId>
<artifactId>org.apache.aries.web.urlhandler</artifactId>
@@ -31,23 +34,22 @@
<version>1.0.1-SNAPSHOT</version>
<name>Apache Aries Web Url handler</name>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/web/web-urlhandler</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/web/web-urlhandler</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/web/web-urlhandler</url>
- </scm>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/web/web-urlhandler</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/web/web-urlhandler</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/web/web-urlhandler</url>
+ </scm>
- <properties>
+ <properties>
<!-- Export package versions are maintained in packageinfo files -->
-
- <aries.osgi.export.pkg>
- org.apache.aries.web.converter;provide:=true
- </aries.osgi.export.pkg>
- <aries.osgi.private.pkg>
- org.apache.aries.web.converter.impl,
- org.apache.aries.web.url
- </aries.osgi.private.pkg>
- </properties>
+ <aries.osgi.export.pkg>
+ org.apache.aries.web.converter;provide:=true
+ </aries.osgi.export.pkg>
+ <aries.osgi.private.pkg>
+ org.apache.aries.web.converter.impl,
+ org.apache.aries.web.url
+ </aries.osgi.private.pkg>
+ </properties>
<dependencies>
<dependency>
@@ -61,7 +63,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.ow2.asm</groupId>
+ <groupId>org.ow2.asm</groupId>
<artifactId>asm-all</artifactId>
<version>4.0</version>
</dependency>
@@ -72,6 +74,7 @@
<version>1.0.0</version>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>