You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by zo...@apache.org on 2011/03/10 17:13:50 UTC
svn commit: r1080261 - in /aries/trunk/blueprint: blueprint-annotation-api/
blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/
blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/service/
blueprint-ap...
Author: zoe
Date: Thu Mar 10 16:13:49 2011
New Revision: 1080261
URL: http://svn.apache.org/viewvc?rev=1080261&view=rev
Log:
ARIES-598 Move blueprint to use packageinfo for package versions
Added:
aries/trunk/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/packageinfo
aries/trunk/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/service/packageinfo
aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/packageinfo
aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/di/packageinfo
aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/packageinfo
aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/mutable/packageinfo
aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/namespace/packageinfo
aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/packageinfo
aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/proxy/packageinfo
aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/reflect/packageinfo
aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/packageinfo
Modified:
aries/trunk/blueprint/blueprint-annotation-api/pom.xml
aries/trunk/blueprint/blueprint-api/pom.xml
aries/trunk/blueprint/blueprint-bundle/pom.xml
aries/trunk/blueprint/blueprint-cm/pom.xml
aries/trunk/blueprint/blueprint-core/pom.xml
Modified: aries/trunk/blueprint/blueprint-annotation-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-annotation-api/pom.xml?rev=1080261&r1=1080260&r2=1080261&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-annotation-api/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-annotation-api/pom.xml Thu Mar 10 16:13:49 2011
@@ -30,9 +30,11 @@
</description>
<properties>
- <aries.osgi.export>
- org.apache.aries.blueprint.annotation.*;version="${pom.version}"
- </aries.osgi.export>
+ <!-- Export package versions are maintained in packageinfo files -->
+ <aries.osgi.export>${aries.osgi.export.pkg};-noimport:=true</aries.osgi.export>
+ <aries.osgi.export.pkg>
+ org.apache.aries.blueprint.annotation.*
+ </aries.osgi.export.pkg>
<aries.osgi.import>
!org.apache.aries.blueprint.annotation.*,
*
Added: aries/trunk/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/packageinfo?rev=1080261&view=auto
==============================================================================
--- aries/trunk/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/packageinfo (added)
+++ aries/trunk/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/packageinfo Thu Mar 10 16:13:49 2011
@@ -0,0 +1,19 @@
+#
+# 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.
+#
+version 0.4.0
Added: aries/trunk/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/service/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/service/packageinfo?rev=1080261&view=auto
==============================================================================
--- aries/trunk/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/service/packageinfo (added)
+++ aries/trunk/blueprint/blueprint-annotation-api/src/main/java/org/apache/aries/blueprint/annotation/service/packageinfo Thu Mar 10 16:13:49 2011
@@ -0,0 +1,19 @@
+#
+# 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.
+#
+version 0.4.0
Modified: aries/trunk/blueprint/blueprint-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-api/pom.xml?rev=1080261&r1=1080260&r2=1080261&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-api/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-api/pom.xml Thu Mar 10 16:13:49 2011
@@ -30,9 +30,11 @@
</description>
<properties>
- <aries.osgi.export>
- org.osgi.service.blueprint*;version="1.0.1"
- </aries.osgi.export>
+ <!-- Export package versions are maintained in packageinfo files -->
+ <aries.osgi.export>${aries.osgi.export.pkg};-noimport:=true</aries.osgi.export>
+ <aries.osgi.export.pkg>
+ org.osgi.service.blueprint*
+ </aries.osgi.export.pkg>
<aries.osgi.import>
!org.osgi.service.blueprint*,
*
Modified: aries/trunk/blueprint/blueprint-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-bundle/pom.xml?rev=1080261&r1=1080260&r2=1080261&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-bundle/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-bundle/pom.xml Thu Mar 10 16:13:49 2011
@@ -51,13 +51,15 @@
org.apache.aries.quiesce.participant;version="[0.2,1.0)";resolution:=optional,
*
</aries.osgi.import>
- <aries.osgi.export>
+ <!-- Export package versions are maintained in packageinfo files -->
+ <aries.osgi.export>${aries.osgi.export.pkg};-noimport:=true</aries.osgi.export>
+ <aries.osgi.export.pkg>
=org.osgi.service.blueprint;uses:="org.osgi.service.blueprint.container,org.osgi.service.blueprint.reflect,org.apache.aries.blueprint,org.apache.aries.blueprint.ext,org.apache.aries.blueprint.mutable,org.apache.aries.blueprint.compendium.cm";version="1.0.1",
- org.osgi.service.blueprint.container;version="1.0.1",
- org.osgi.service.blueprint.reflect;version="1.0.1",
+ org.osgi.service.blueprint.container,
+ org.osgi.service.blueprint.reflect,
!org.apache.aries.blueprint.annotation*,
- org.apache.aries.blueprint*;version="${pom.version}"
- </aries.osgi.export>
+ org.apache.aries.blueprint*
+ </aries.osgi.export.pkg>
<aries.osgi.private.pkg>
OSGI-INF*
</aries.osgi.private.pkg>
Modified: aries/trunk/blueprint/blueprint-cm/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-cm/pom.xml?rev=1080261&r1=1080260&r2=1080261&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-cm/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-cm/pom.xml Thu Mar 10 16:13:49 2011
@@ -32,6 +32,8 @@
</description>
<properties>
+ <!-- Export package versions are maintained in packageinfo files -->
+ <aries.osgi.export>${aries.osgi.export.pkg};-noimport:=true</aries.osgi.export>
<aries.osgi.export.pkg>
org.apache.aries.blueprint.compendium.cm*
</aries.osgi.export.pkg>
Added: aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/packageinfo?rev=1080261&view=auto
==============================================================================
--- aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/packageinfo (added)
+++ aries/trunk/blueprint/blueprint-cm/src/main/java/org/apache/aries/blueprint/compendium/cm/packageinfo Thu Mar 10 16:13:49 2011
@@ -0,0 +1,19 @@
+#
+# 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.
+#
+version 0.4.0
Modified: aries/trunk/blueprint/blueprint-core/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/pom.xml?rev=1080261&r1=1080260&r2=1080261&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-core/pom.xml Thu Mar 10 16:13:49 2011
@@ -36,6 +36,8 @@
<aries.osgi.activator>
org.apache.aries.blueprint.container.BlueprintExtender
</aries.osgi.activator>
+ <!-- Export package versions are maintained in packageinfo files -->
+ <aries.osgi.export>${aries.osgi.export.pkg};-noimport:=true</aries.osgi.export>
<aries.osgi.export.pkg>
!org.apache.aries.blueprint.annotation*,
org.apache.aries.blueprint*
@@ -125,6 +127,12 @@
<include>blueprint.xsd</include>
</includes>
</resource>
+ <resource>
+ <directory>${project.build.sourceDirectory}</directory>
+ <includes>
+ <include>**/packageinfo</include>
+ </includes>
+ </resource>
</resources>
</build>
Added: aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/di/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/di/packageinfo?rev=1080261&view=auto
==============================================================================
--- aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/di/packageinfo (added)
+++ aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/di/packageinfo Thu Mar 10 16:13:49 2011
@@ -0,0 +1,19 @@
+#
+# 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.
+#
+version 0.4.0
Added: aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/packageinfo?rev=1080261&view=auto
==============================================================================
--- aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/packageinfo (added)
+++ aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/ext/packageinfo Thu Mar 10 16:13:49 2011
@@ -0,0 +1,19 @@
+#
+# 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.
+#
+version 0.4.0
Added: aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/mutable/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/mutable/packageinfo?rev=1080261&view=auto
==============================================================================
--- aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/mutable/packageinfo (added)
+++ aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/mutable/packageinfo Thu Mar 10 16:13:49 2011
@@ -0,0 +1,19 @@
+#
+# 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.
+#
+version 0.4.0
Added: aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/namespace/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/namespace/packageinfo?rev=1080261&view=auto
==============================================================================
--- aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/namespace/packageinfo (added)
+++ aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/namespace/packageinfo Thu Mar 10 16:13:49 2011
@@ -0,0 +1,19 @@
+#
+# 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.
+#
+version 0.4.0
Added: aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/packageinfo?rev=1080261&view=auto
==============================================================================
--- aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/packageinfo (added)
+++ aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/packageinfo Thu Mar 10 16:13:49 2011
@@ -0,0 +1,19 @@
+#
+# 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.
+#
+version 0.4.0
Added: aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/proxy/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/proxy/packageinfo?rev=1080261&view=auto
==============================================================================
--- aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/proxy/packageinfo (added)
+++ aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/proxy/packageinfo Thu Mar 10 16:13:49 2011
@@ -0,0 +1,19 @@
+#
+# 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.
+#
+version 0.4.0
Added: aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/reflect/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/reflect/packageinfo?rev=1080261&view=auto
==============================================================================
--- aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/reflect/packageinfo (added)
+++ aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/reflect/packageinfo Thu Mar 10 16:13:49 2011
@@ -0,0 +1,19 @@
+#
+# 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.
+#
+version 0.4.0
Added: aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/packageinfo
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/packageinfo?rev=1080261&view=auto
==============================================================================
--- aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/packageinfo (added)
+++ aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/utils/packageinfo Thu Mar 10 16:13:49 2011
@@ -0,0 +1,19 @@
+#
+# 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.
+#
+version 0.4.0