You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by cu...@apache.org on 2012/04/03 12:49:47 UTC
svn commit: r1308814 - in /aries/branches/1.0-prototype: ./ application/
application/application-api/
application/application-api/src/main/java/org/apache/aries/application/management/
application/application-api/src/main/java/org/apache/aries/applicat...
Author: cumminsh
Date: Tue Apr 3 10:49:45 2012
New Revision: 1308814
URL: http://svn.apache.org/viewvc?rev=1308814&view=rev
Log:
Checkpoint: moving parent to 1.0.0-SNAPSHOT, and also util (but not util's dependers'
Modified:
aries/branches/1.0-prototype/ (props changed)
aries/branches/1.0-prototype/application/application-api/pom.xml
aries/branches/1.0-prototype/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationContext.java (props changed)
aries/branches/1.0-prototype/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationEvent.java (props changed)
aries/branches/1.0-prototype/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationListener.java (props changed)
aries/branches/1.0-prototype/application/application-api/src/main/java/org/apache/aries/application/management/spi/runtime/AriesApplicationContextManager.java (props changed)
aries/branches/1.0-prototype/application/application-utils/src/main/java/org/apache/aries/application/utils/management/SimpleBundleInfo.java (props changed)
aries/branches/1.0-prototype/application/pom.xml
aries/branches/1.0-prototype/blueprint/blueprint-cm/src/main/java/org/apache/aries/ (props changed)
aries/branches/1.0-prototype/blueprint/blueprint-cm/src/main/resources/org/apache/aries/ (props changed)
aries/branches/1.0-prototype/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/RecipeBuilder.java (props changed)
aries/branches/1.0-prototype/blueprint/blueprint-core/src/main/resources/org/apache/aries/ (props changed)
aries/branches/1.0-prototype/blueprint/blueprint-sample/ (props changed)
aries/branches/1.0-prototype/blueprint/pom.xml
aries/branches/1.0-prototype/eba-maven-plugin/pom.xml
aries/branches/1.0-prototype/ejb/pom.xml
aries/branches/1.0-prototype/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintMetadataMBean.java (props changed)
aries/branches/1.0-prototype/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintStateMBean.java (props changed)
aries/branches/1.0-prototype/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/Item.java (props changed)
aries/branches/1.0-prototype/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/JmxConstants.java (props changed)
aries/branches/1.0-prototype/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/Activator.java (props changed)
aries/branches/1.0-prototype/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadata.java (props changed)
aries/branches/1.0-prototype/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintState.java (props changed)
aries/branches/1.0-prototype/jmx/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadataTest.java (props changed)
aries/branches/1.0-prototype/jmx/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/blueprint/impl/BlueprintStateTest.java (props changed)
aries/branches/1.0-prototype/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java (props changed)
aries/branches/1.0-prototype/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/ (props changed)
aries/branches/1.0-prototype/jmx/pom.xml
aries/branches/1.0-prototype/jndi/ (props changed)
aries/branches/1.0-prototype/jndi/pom.xml
aries/branches/1.0-prototype/jpa/pom.xml
aries/branches/1.0-prototype/parent/default-parent/java5-parent/pom.xml
aries/branches/1.0-prototype/parent/default-parent/java6-parent/pom.xml
aries/branches/1.0-prototype/parent/default-parent/pom.xml
aries/branches/1.0-prototype/parent/pom.xml
aries/branches/1.0-prototype/proxy/pom.xml
aries/branches/1.0-prototype/quiesce/pom.xml
aries/branches/1.0-prototype/samples/pom.xml
aries/branches/1.0-prototype/sandbox/jmx-next/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintMetadataMBean.java (props changed)
aries/branches/1.0-prototype/sandbox/jmx-next/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintStateMBean.java (props changed)
aries/branches/1.0-prototype/sandbox/jmx-next/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/Item.java (props changed)
aries/branches/1.0-prototype/sandbox/jmx-next/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/JmxConstants.java (props changed)
aries/branches/1.0-prototype/sandbox/jmx-next/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/Activator.java (props changed)
aries/branches/1.0-prototype/sandbox/jmx-next/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadata.java (props changed)
aries/branches/1.0-prototype/sandbox/jmx-next/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintState.java (props changed)
aries/branches/1.0-prototype/sandbox/jmx-next/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadataTest.java (props changed)
aries/branches/1.0-prototype/sandbox/jmx-next/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/blueprint/impl/BlueprintStateTest.java (props changed)
aries/branches/1.0-prototype/sandbox/jmx-next/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java (props changed)
aries/branches/1.0-prototype/sandbox/jmx-next/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/ (props changed)
aries/branches/1.0-prototype/spi-fly/pom.xml
aries/branches/1.0-prototype/subsystem/pom.xml
aries/branches/1.0-prototype/testsupport/pom.xml
aries/branches/1.0-prototype/testsupport/testsupport-unit/pom.xml
aries/branches/1.0-prototype/testsupport/testsupport-unit/src/main/java/org/apache/aries/mocks/ (props changed)
aries/branches/1.0-prototype/testsupport/testsupport-unit/src/main/java/org/apache/aries/unittest/ (props changed)
aries/branches/1.0-prototype/transaction/pom.xml
aries/branches/1.0-prototype/tutorials/pom.xml
aries/branches/1.0-prototype/util/pom.xml
aries/branches/1.0-prototype/util/util-r42/pom.xml
aries/branches/1.0-prototype/util/util-r42/src/test/java/org/apache/aries/util/VersionRangeTest.java (props changed)
aries/branches/1.0-prototype/util/util/pom.xml
aries/branches/1.0-prototype/versioning/pom.xml
aries/branches/1.0-prototype/web/pom.xml
Propchange: aries/branches/1.0-prototype/
------------------------------------------------------------------------------
Merged /aries/trunk:r1307761
Modified: aries/branches/1.0-prototype/application/application-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/application/application-api/pom.xml?rev=1308814&r1=1308813&r2=1308814&view=diff
==============================================================================
--- aries/branches/1.0-prototype/application/application-api/pom.xml (original)
+++ aries/branches/1.0-prototype/application/application-api/pom.xml Tue Apr 3 10:49:45 2012
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>java5-parent</artifactId>
- <version>0.5</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath />
</parent>
Propchange: aries/branches/1.0-prototype/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationContext.java
------------------------------------------------------------------------------
Merged /aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationContext.java:r1307761
Propchange: aries/branches/1.0-prototype/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationEvent.java
------------------------------------------------------------------------------
Merged /aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationEvent.java:r1307761
Propchange: aries/branches/1.0-prototype/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationListener.java
------------------------------------------------------------------------------
Merged /aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationListener.java:r1307761
Propchange: aries/branches/1.0-prototype/application/application-api/src/main/java/org/apache/aries/application/management/spi/runtime/AriesApplicationContextManager.java
------------------------------------------------------------------------------
Merged /aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/runtime/AriesApplicationContextManager.java:r1307761
Propchange: aries/branches/1.0-prototype/application/application-utils/src/main/java/org/apache/aries/application/utils/management/SimpleBundleInfo.java
------------------------------------------------------------------------------
Merged /aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/management/SimpleBundleInfo.java:r1307761
Modified: aries/branches/1.0-prototype/application/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/application/pom.xml?rev=1308814&r1=1308813&r2=1308814&view=diff
==============================================================================
--- aries/branches/1.0-prototype/application/pom.xml (original)
+++ aries/branches/1.0-prototype/application/pom.xml Tue Apr 3 10:49:45 2012
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>java6-parent</artifactId>
- <version>0.5</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath />
</parent>
Propchange: aries/branches/1.0-prototype/blueprint/blueprint-cm/src/main/java/org/apache/aries/
------------------------------------------------------------------------------
Merged /aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries:r1307761
Propchange: aries/branches/1.0-prototype/blueprint/blueprint-cm/src/main/resources/org/apache/aries/
------------------------------------------------------------------------------
Merged /aries/trunk/blueprint/blueprint-cm/src/main/resources/org/apache/aries:r1307761
Propchange: aries/branches/1.0-prototype/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/RecipeBuilder.java
------------------------------------------------------------------------------
Merged /aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/RecipeBuilder.java:r1307761
Propchange: aries/branches/1.0-prototype/blueprint/blueprint-core/src/main/resources/org/apache/aries/
------------------------------------------------------------------------------
Merged /aries/trunk/blueprint/blueprint-core/src/main/resources/org/apache/aries:r1307761
Propchange: aries/branches/1.0-prototype/blueprint/blueprint-sample/
------------------------------------------------------------------------------
Merged /aries/trunk/blueprint/blueprint-sample:r1307761
Modified: aries/branches/1.0-prototype/blueprint/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/blueprint/pom.xml?rev=1308814&r1=1308813&r2=1308814&view=diff
==============================================================================
--- aries/branches/1.0-prototype/blueprint/pom.xml (original)
+++ aries/branches/1.0-prototype/blueprint/pom.xml Tue Apr 3 10:49:45 2012
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>java5-parent</artifactId>
- <version>0.5</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath/>
</parent>
Modified: aries/branches/1.0-prototype/eba-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/eba-maven-plugin/pom.xml?rev=1308814&r1=1308813&r2=1308814&view=diff
==============================================================================
--- aries/branches/1.0-prototype/eba-maven-plugin/pom.xml (original)
+++ aries/branches/1.0-prototype/eba-maven-plugin/pom.xml Tue Apr 3 10:49:45 2012
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>java5-parent</artifactId>
- <version>0.5</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath />
</parent>
Modified: aries/branches/1.0-prototype/ejb/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/ejb/pom.xml?rev=1308814&r1=1308813&r2=1308814&view=diff
==============================================================================
--- aries/branches/1.0-prototype/ejb/pom.xml (original)
+++ aries/branches/1.0-prototype/ejb/pom.xml Tue Apr 3 10:49:45 2012
@@ -21,7 +21,7 @@
<parent>
<artifactId>java5-parent</artifactId>
<groupId>org.apache.aries</groupId>
- <version>0.5</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath />
</parent>
<modelVersion>4.0.0</modelVersion>
Propchange: aries/branches/1.0-prototype/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintMetadataMBean.java
------------------------------------------------------------------------------
Merged /aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintMetadataMBean.java:r1307761
Propchange: aries/branches/1.0-prototype/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintStateMBean.java
------------------------------------------------------------------------------
Merged /aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintStateMBean.java:r1307761
Propchange: aries/branches/1.0-prototype/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/Item.java
------------------------------------------------------------------------------
Merged /aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/Item.java:r1307761
Propchange: aries/branches/1.0-prototype/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/JmxConstants.java
------------------------------------------------------------------------------
Merged /aries/trunk/jmx/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/JmxConstants.java:r1307761
Propchange: aries/branches/1.0-prototype/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/Activator.java
------------------------------------------------------------------------------
Merged /aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/Activator.java:r1307761
Propchange: aries/branches/1.0-prototype/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadata.java
------------------------------------------------------------------------------
Merged /aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadata.java:r1307761
Propchange: aries/branches/1.0-prototype/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintState.java
------------------------------------------------------------------------------
Merged /aries/trunk/jmx/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintState.java:r1307761
Propchange: aries/branches/1.0-prototype/jmx/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadataTest.java
------------------------------------------------------------------------------
Merged /aries/trunk/jmx/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadataTest.java:r1307761
Propchange: aries/branches/1.0-prototype/jmx/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/blueprint/impl/BlueprintStateTest.java
------------------------------------------------------------------------------
Merged /aries/trunk/jmx/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/blueprint/impl/BlueprintStateTest.java:r1307761
Propchange: aries/branches/1.0-prototype/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java
------------------------------------------------------------------------------
Merged /aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java:r1307761
Propchange: aries/branches/1.0-prototype/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/
------------------------------------------------------------------------------
Merged /aries/trunk/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework:r1307761
Modified: aries/branches/1.0-prototype/jmx/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/jmx/pom.xml?rev=1308814&r1=1308813&r2=1308814&view=diff
==============================================================================
--- aries/branches/1.0-prototype/jmx/pom.xml (original)
+++ aries/branches/1.0-prototype/jmx/pom.xml Tue Apr 3 10:49:45 2012
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>java5-parent</artifactId>
- <version>0.5</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath />
</parent>
Propchange: aries/branches/1.0-prototype/jndi/
------------------------------------------------------------------------------
Merged /aries/trunk/jndi:r1307761
Modified: aries/branches/1.0-prototype/jndi/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/jndi/pom.xml?rev=1308814&r1=1308813&r2=1308814&view=diff
==============================================================================
--- aries/branches/1.0-prototype/jndi/pom.xml (original)
+++ aries/branches/1.0-prototype/jndi/pom.xml Tue Apr 3 10:49:45 2012
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>java6-parent</artifactId>
- <version>0.5</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath />
</parent>
Modified: aries/branches/1.0-prototype/jpa/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/jpa/pom.xml?rev=1308814&r1=1308813&r2=1308814&view=diff
==============================================================================
--- aries/branches/1.0-prototype/jpa/pom.xml (original)
+++ aries/branches/1.0-prototype/jpa/pom.xml Tue Apr 3 10:49:45 2012
@@ -21,7 +21,7 @@
<parent>
<artifactId>java5-parent</artifactId>
<groupId>org.apache.aries</groupId>
- <version>0.5</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath />
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: aries/branches/1.0-prototype/parent/default-parent/java5-parent/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/parent/default-parent/java5-parent/pom.xml?rev=1308814&r1=1308813&r2=1308814&view=diff
==============================================================================
--- aries/branches/1.0-prototype/parent/default-parent/java5-parent/pom.xml (original)
+++ aries/branches/1.0-prototype/parent/default-parent/java5-parent/pom.xml Tue Apr 3 10:49:45 2012
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>default-parent</artifactId>
- <version>0.6-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>java5-parent</artifactId>
@@ -42,6 +42,12 @@
<target>1.5</target>
</configuration>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.0</version>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: aries/branches/1.0-prototype/parent/default-parent/java6-parent/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/parent/default-parent/java6-parent/pom.xml?rev=1308814&r1=1308813&r2=1308814&view=diff
==============================================================================
--- aries/branches/1.0-prototype/parent/default-parent/java6-parent/pom.xml (original)
+++ aries/branches/1.0-prototype/parent/default-parent/java6-parent/pom.xml Tue Apr 3 10:49:45 2012
@@ -1,91 +1,91 @@
-<?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">
- <!-- This file was based on the Aries Java 5 Parent Pom -->
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.aries</groupId>
- <artifactId>default-parent</artifactId>
- <version>0.6-SNAPSHOT</version>
- </parent>
-
- <artifactId>java6-parent</artifactId>
- <name>Aries :: Java 6 Parent POM</name>
- <packaging>pom</packaging>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <phase>validate</phase>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireJavaVersion>
- <version>[1.6,)</version>
- </requireJavaVersion>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>2.4</version>
- <configuration>
- <targetJdk>1.6</targetJdk>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-
-</project>
-
-
+<?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">
+ <!-- This file was based on the Aries Java 5 Parent Pom -->
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>default-parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>java6-parent</artifactId>
+ <name>Aries :: Java 6 Parent POM</name>
+ <packaging>pom</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>validate</phase>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireJavaVersion>
+ <version>[1.6,)</version>
+ </requireJavaVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <source>1.6</source>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+ <targetJdk>1.6</targetJdk>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+
+</project>
+
+
Modified: aries/branches/1.0-prototype/parent/default-parent/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/parent/default-parent/pom.xml?rev=1308814&r1=1308813&r2=1308814&view=diff
==============================================================================
--- aries/branches/1.0-prototype/parent/default-parent/pom.xml (original)
+++ aries/branches/1.0-prototype/parent/default-parent/pom.xml Tue Apr 3 10:49:45 2012
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>parent</artifactId>
- <version>0.6-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>default-parent</artifactId>
@@ -290,6 +290,11 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<configuration>
<encoding>UTF-8</encoding>
Modified: aries/branches/1.0-prototype/parent/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/parent/pom.xml?rev=1308814&r1=1308813&r2=1308814&view=diff
==============================================================================
--- aries/branches/1.0-prototype/parent/pom.xml (original)
+++ aries/branches/1.0-prototype/parent/pom.xml Tue Apr 3 10:49:45 2012
@@ -32,7 +32,7 @@
<groupId>org.apache.aries</groupId>
<artifactId>parent</artifactId>
<name>Aries :: Top Parent POM</name>
- <version>0.6-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<description>
@@ -150,6 +150,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
+ <version>2.0</version>
<configuration>
<autoVersionSubmodules>true</autoVersionSubmodules>
</configuration>
Modified: aries/branches/1.0-prototype/proxy/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/proxy/pom.xml?rev=1308814&r1=1308813&r2=1308814&view=diff
==============================================================================
--- aries/branches/1.0-prototype/proxy/pom.xml (original)
+++ aries/branches/1.0-prototype/proxy/pom.xml Tue Apr 3 10:49:45 2012
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>java5-parent</artifactId>
- <version>0.5</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath />
</parent>
Modified: aries/branches/1.0-prototype/quiesce/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/quiesce/pom.xml?rev=1308814&r1=1308813&r2=1308814&view=diff
==============================================================================
--- aries/branches/1.0-prototype/quiesce/pom.xml (original)
+++ aries/branches/1.0-prototype/quiesce/pom.xml Tue Apr 3 10:49:45 2012
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>java5-parent</artifactId>
- <version>0.5</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath />
</parent>
Modified: aries/branches/1.0-prototype/samples/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/samples/pom.xml?rev=1308814&r1=1308813&r2=1308814&view=diff
==============================================================================
--- aries/branches/1.0-prototype/samples/pom.xml (original)
+++ aries/branches/1.0-prototype/samples/pom.xml Tue Apr 3 10:49:45 2012
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>java5-parent</artifactId>
- <version>0.5</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath />
</parent>
Propchange: aries/branches/1.0-prototype/sandbox/jmx-next/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintMetadataMBean.java
------------------------------------------------------------------------------
Merged /aries/trunk/sandbox/jmx-next/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintMetadataMBean.java:r1307761
Propchange: aries/branches/1.0-prototype/sandbox/jmx-next/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintStateMBean.java
------------------------------------------------------------------------------
Merged /aries/trunk/sandbox/jmx-next/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/BlueprintStateMBean.java:r1307761
Propchange: aries/branches/1.0-prototype/sandbox/jmx-next/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/Item.java
------------------------------------------------------------------------------
Merged /aries/trunk/sandbox/jmx-next/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/Item.java:r1307761
Propchange: aries/branches/1.0-prototype/sandbox/jmx-next/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/JmxConstants.java
------------------------------------------------------------------------------
Merged /aries/trunk/sandbox/jmx-next/jmx-blueprint-api/src/main/java/org/apache/aries/jmx/blueprint/JmxConstants.java:r1307761
Propchange: aries/branches/1.0-prototype/sandbox/jmx-next/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/Activator.java
------------------------------------------------------------------------------
Merged /aries/trunk/sandbox/jmx-next/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/Activator.java:r1307761
Propchange: aries/branches/1.0-prototype/sandbox/jmx-next/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadata.java
------------------------------------------------------------------------------
Merged /aries/trunk/sandbox/jmx-next/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadata.java:r1307761
Propchange: aries/branches/1.0-prototype/sandbox/jmx-next/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintState.java
------------------------------------------------------------------------------
Merged /aries/trunk/sandbox/jmx-next/jmx-blueprint-core/src/main/java/org/apache/aries/jmx/blueprint/impl/BlueprintState.java:r1307761
Propchange: aries/branches/1.0-prototype/sandbox/jmx-next/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadataTest.java
------------------------------------------------------------------------------
Merged /aries/trunk/sandbox/jmx-next/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/blueprint/impl/BlueprintMetadataTest.java:r1307761
Propchange: aries/branches/1.0-prototype/sandbox/jmx-next/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/blueprint/impl/BlueprintStateTest.java
------------------------------------------------------------------------------
Merged /aries/trunk/sandbox/jmx-next/jmx-blueprint-core/src/test/java/org/apache/aries/jmx/blueprint/impl/BlueprintStateTest.java:r1307761
Propchange: aries/branches/1.0-prototype/sandbox/jmx-next/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java
------------------------------------------------------------------------------
Merged /aries/trunk/sandbox/jmx-next/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/BlueprintMBeanTest.java:r1307761
Propchange: aries/branches/1.0-prototype/sandbox/jmx-next/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework/
------------------------------------------------------------------------------
Merged /aries/trunk/sandbox/jmx-next/jmx-itests/src/test/java/org/apache/aries/jmx/test/blueprint/framework:r1307761
Modified: aries/branches/1.0-prototype/spi-fly/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/spi-fly/pom.xml?rev=1308814&r1=1308813&r2=1308814&view=diff
==============================================================================
--- aries/branches/1.0-prototype/spi-fly/pom.xml (original)
+++ aries/branches/1.0-prototype/spi-fly/pom.xml Tue Apr 3 10:49:45 2012
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>java6-parent</artifactId>
- <version>0.5</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.aries.spifly</groupId>
Modified: aries/branches/1.0-prototype/subsystem/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/subsystem/pom.xml?rev=1308814&r1=1308813&r2=1308814&view=diff
==============================================================================
--- aries/branches/1.0-prototype/subsystem/pom.xml (original)
+++ aries/branches/1.0-prototype/subsystem/pom.xml Tue Apr 3 10:49:45 2012
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>java5-parent</artifactId>
- <version>0.5</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath/>
</parent>
Modified: aries/branches/1.0-prototype/testsupport/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/testsupport/pom.xml?rev=1308814&r1=1308813&r2=1308814&view=diff
==============================================================================
--- aries/branches/1.0-prototype/testsupport/pom.xml (original)
+++ aries/branches/1.0-prototype/testsupport/pom.xml Tue Apr 3 10:49:45 2012
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>java5-parent</artifactId>
- <version>0.5</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath />
</parent>
Modified: aries/branches/1.0-prototype/testsupport/testsupport-unit/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/testsupport/testsupport-unit/pom.xml?rev=1308814&r1=1308813&r2=1308814&view=diff
==============================================================================
--- aries/branches/1.0-prototype/testsupport/testsupport-unit/pom.xml (original)
+++ aries/branches/1.0-prototype/testsupport/testsupport-unit/pom.xml Tue Apr 3 10:49:45 2012
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>java5-parent</artifactId>
- <version>0.5</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath />
</parent>
Propchange: aries/branches/1.0-prototype/testsupport/testsupport-unit/src/main/java/org/apache/aries/mocks/
------------------------------------------------------------------------------
Merged /aries/trunk/testsupport/testsupport-unit/src/main/java/org/apache/aries/mocks:r1307761
Propchange: aries/branches/1.0-prototype/testsupport/testsupport-unit/src/main/java/org/apache/aries/unittest/
------------------------------------------------------------------------------
Merged /aries/trunk/testsupport/testsupport-unit/src/main/java/org/apache/aries/unittest:r1307761
Modified: aries/branches/1.0-prototype/transaction/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/transaction/pom.xml?rev=1308814&r1=1308813&r2=1308814&view=diff
==============================================================================
--- aries/branches/1.0-prototype/transaction/pom.xml (original)
+++ aries/branches/1.0-prototype/transaction/pom.xml Tue Apr 3 10:49:45 2012
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>java5-parent</artifactId>
- <version>0.5</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath />
</parent>
Modified: aries/branches/1.0-prototype/tutorials/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/tutorials/pom.xml?rev=1308814&r1=1308813&r2=1308814&view=diff
==============================================================================
--- aries/branches/1.0-prototype/tutorials/pom.xml (original)
+++ aries/branches/1.0-prototype/tutorials/pom.xml Tue Apr 3 10:49:45 2012
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>java5-parent</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
Modified: aries/branches/1.0-prototype/util/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/util/pom.xml?rev=1308814&r1=1308813&r2=1308814&view=diff
==============================================================================
--- aries/branches/1.0-prototype/util/pom.xml (original)
+++ aries/branches/1.0-prototype/util/pom.xml Tue Apr 3 10:49:45 2012
@@ -21,13 +21,13 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>java5-parent</artifactId>
- <version>0.5</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath />
</parent>
<artifactId>org.apache.aries.util-parent</artifactId>
<packaging>pom</packaging>
- <version>0.5-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<name>Apache Aries Util</name>
<description>
Modified: aries/branches/1.0-prototype/util/util-r42/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/util/util-r42/pom.xml?rev=1308814&r1=1308813&r2=1308814&view=diff
==============================================================================
--- aries/branches/1.0-prototype/util/util-r42/pom.xml (original)
+++ aries/branches/1.0-prototype/util/util-r42/pom.xml Tue Apr 3 10:49:45 2012
@@ -27,7 +27,7 @@
<artifactId>org.apache.aries.util-r42</artifactId>
<packaging>jar</packaging>
- <version>0.5-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<name>Apache Aries Util classes compiled under r 42 framework</name>
<description>
This bundle contains the OSGi common util for Apache Aries classes that need to be compiled under r 4.2
Propchange: aries/branches/1.0-prototype/util/util-r42/src/test/java/org/apache/aries/util/VersionRangeTest.java
------------------------------------------------------------------------------
Merged /aries/trunk/util/util-r42/src/test/java/org/apache/aries/util/VersionRangeTest.java:r1307761
Modified: aries/branches/1.0-prototype/util/util/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/util/util/pom.xml?rev=1308814&r1=1308813&r2=1308814&view=diff
==============================================================================
--- aries/branches/1.0-prototype/util/util/pom.xml (original)
+++ aries/branches/1.0-prototype/util/util/pom.xml Tue Apr 3 10:49:45 2012
@@ -27,7 +27,7 @@
<artifactId>org.apache.aries.util</artifactId>
<packaging>bundle</packaging>
- <version>0.5-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<name>Apache Aries Util</name>
<description>
This bundle contains the OSGi common util for Apache Aries
Modified: aries/branches/1.0-prototype/versioning/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/versioning/pom.xml?rev=1308814&r1=1308813&r2=1308814&view=diff
==============================================================================
--- aries/branches/1.0-prototype/versioning/pom.xml (original)
+++ aries/branches/1.0-prototype/versioning/pom.xml Tue Apr 3 10:49:45 2012
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>java5-parent</artifactId>
- <version>0.6-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath/>
</parent>
@@ -40,4 +40,4 @@
<module>org.apache.aries.versioning.plugin</module>
</modules>
-</project>
\ No newline at end of file
+</project>
Modified: aries/branches/1.0-prototype/web/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/1.0-prototype/web/pom.xml?rev=1308814&r1=1308813&r2=1308814&view=diff
==============================================================================
--- aries/branches/1.0-prototype/web/pom.xml (original)
+++ aries/branches/1.0-prototype/web/pom.xml Tue Apr 3 10:49:45 2012
@@ -20,7 +20,7 @@
<parent>
<artifactId>java5-parent</artifactId>
<groupId>org.apache.aries</groupId>
- <version>0.5</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath />
</parent>