You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by gn...@apache.org on 2018/07/03 10:54:35 UTC
svn commit: r1834942 - in /aries/trunk/blueprint: blueprint-bundle/
blueprint-cm/ blueprint-compatibility/ blueprint-jexl-evaluator/
blueprint-noosgi/ blueprint-parent/ itests/
plugin/blueprint-maven-plugin-annotation/
plugin/blueprint-maven-plugin-ite...
Author: gnodet
Date: Tue Jul 3 10:54:34 2018
New Revision: 1834942
URL: http://svn.apache.org/viewvc?rev=1834942&view=rev
Log:
Fix build
Modified:
aries/trunk/blueprint/blueprint-bundle/pom.xml
aries/trunk/blueprint/blueprint-cm/pom.xml
aries/trunk/blueprint/blueprint-compatibility/pom.xml
aries/trunk/blueprint/blueprint-jexl-evaluator/pom.xml
aries/trunk/blueprint/blueprint-noosgi/pom.xml
aries/trunk/blueprint/blueprint-parent/pom.xml
aries/trunk/blueprint/itests/pom.xml
aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml
aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/pom.xml
aries/trunk/blueprint/plugin/blueprint-maven-plugin-pax-cdi-handlers/pom.xml
aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml
aries/trunk/blueprint/plugin/blueprint-maven-plugin-spring-handlers/pom.xml
aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml
aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/ArtifactFilter.java
Modified: aries/trunk/blueprint/blueprint-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-bundle/pom.xml?rev=1834942&r1=1834941&r2=1834942&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-bundle/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-bundle/pom.xml Tue Jul 3 10:54:34 2018
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>blueprint-parent</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../blueprint-parent/pom.xml</relativePath>
</parent>
Modified: aries/trunk/blueprint/blueprint-cm/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-cm/pom.xml?rev=1834942&r1=1834941&r2=1834942&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-cm/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-cm/pom.xml Tue Jul 3 10:54:34 2018
@@ -56,8 +56,8 @@
</aries.osgi.private.pkg>
<blueprint.api.version>1.0.0</blueprint.api.version>
- <blueprint.core.version>1.10.0-SNAPSHOT</blueprint.core.version>
- <blueprint.parser.version>1.6.0-SNAPSHOT</blueprint.parser.version>
+ <blueprint.core.version>1.10.0</blueprint.core.version>
+ <blueprint.parser.version>1.6.0</blueprint.parser.version>
<lastReleaseVersion>1.1.0</lastReleaseVersion>
</properties>
Modified: aries/trunk/blueprint/blueprint-compatibility/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-compatibility/pom.xml?rev=1834942&r1=1834941&r2=1834942&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-compatibility/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-compatibility/pom.xml Tue Jul 3 10:54:34 2018
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>blueprint-parent</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../blueprint-parent/pom.xml</relativePath>
</parent>
Modified: aries/trunk/blueprint/blueprint-jexl-evaluator/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-jexl-evaluator/pom.xml?rev=1834942&r1=1834941&r2=1834942&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-jexl-evaluator/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-jexl-evaluator/pom.xml Tue Jul 3 10:54:34 2018
@@ -55,7 +55,7 @@
<aries.osgi.private.pkg>
org.apache.aries.blueprint.jexl.evaluator
</aries.osgi.private.pkg>
- <blueprint.core.version>1.10.0-SNAPSHOT</blueprint.core.version>
+ <blueprint.core.version>1.10.0</blueprint.core.version>
<lastReleaseVersion>1.0.0</lastReleaseVersion>
</properties>
Modified: aries/trunk/blueprint/blueprint-noosgi/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-noosgi/pom.xml?rev=1834942&r1=1834941&r2=1834942&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-noosgi/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-noosgi/pom.xml Tue Jul 3 10:54:34 2018
@@ -45,8 +45,8 @@
<properties>
<blueprint.api.version>1.0.1</blueprint.api.version>
- <blueprint.core.version>1.10.0-SNAPSHOT</blueprint.core.version>
- <blueprint.parser.version>1.6.0-SNAPSHOT</blueprint.parser.version>
+ <blueprint.core.version>1.10.0</blueprint.core.version>
+ <blueprint.parser.version>1.6.0</blueprint.parser.version>
<proxy.impl.version>1.0.3</proxy.impl.version>
</properties>
Modified: aries/trunk/blueprint/blueprint-parent/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-parent/pom.xml?rev=1834942&r1=1834941&r2=1834942&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-parent/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-parent/pom.xml Tue Jul 3 10:54:34 2018
@@ -31,7 +31,7 @@
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>blueprint-parent</artifactId>
<packaging>pom</packaging>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<name>Apache Aries Blueprint Parent</name>
<description>
This bundle contains the blueprint parent pom.
@@ -45,13 +45,13 @@
<properties>
<blueprint.api.dev.version>1.0.2-SNAPSHOT</blueprint.api.dev.version>
- <blueprint.core.dev.version>1.10.0-SNAPSHOT</blueprint.core.dev.version>
- <blueprint.cm.dev.version>1.3.0-SNAPSHOT</blueprint.cm.dev.version>
- <blueprint.parser.dev.version>1.6.0-SNAPSHOT</blueprint.parser.dev.version>
+ <blueprint.core.dev.version>1.10.1-SNAPSHOT</blueprint.core.dev.version>
+ <blueprint.cm.dev.version>1.3.1-SNAPSHOT</blueprint.cm.dev.version>
+ <blueprint.parser.dev.version>1.6.1-SNAPSHOT</blueprint.parser.dev.version>
<blueprint.authz.dev.version>1.0.1-SNAPSHOT</blueprint.authz.dev.version>
<blueprint.spring.dev.version>1.0.0-SNAPSHOT</blueprint.spring.dev.version>
<blueprint.spring.extender.dev.version>1.0.0-SNAPSHOT</blueprint.spring.extender.dev.version>
- <blueprint.jexl.evaluator.dev.version>1.1.0-SNAPSHOT</blueprint.jexl.evaluator.dev.version>
+ <blueprint.jexl.evaluator.dev.version>1.1.1-SNAPSHOT</blueprint.jexl.evaluator.dev.version>
<blueprint.sample.dev.version>1.0.1-SNAPSHOT</blueprint.sample.dev.version>
<blueprint.sample.fragment.dev.version>1.0.1-SNAPSHOT</blueprint.sample.fragment.dev.version>
<blueprint.noosgi.dev.version>1.2.0-SNAPSHOT</blueprint.noosgi.dev.version>
Modified: aries/trunk/blueprint/itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/itests/pom.xml?rev=1834942&r1=1834941&r2=1834942&view=diff
==============================================================================
--- aries/trunk/blueprint/itests/pom.xml (original)
+++ aries/trunk/blueprint/itests/pom.xml Tue Jul 3 10:54:34 2018
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>blueprint-parent</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../blueprint-parent/pom.xml</relativePath>
</parent>
Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml?rev=1834942&r1=1834941&r2=1834942&view=diff
==============================================================================
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml (original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml Tue Jul 3 10:54:34 2018
@@ -22,10 +22,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries</groupId>
- <artifactId>parent</artifactId>
- <version>2.0.1</version>
- <relativePath />
+ <groupId>org.apache.aries.blueprint</groupId>
+ <artifactId>blueprint-parent</artifactId>
+ <version>1.0.0</version>
+ <relativePath>../../blueprint-parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.blueprint</groupId>
Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/pom.xml?rev=1834942&r1=1834941&r2=1834942&view=diff
==============================================================================
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/pom.xml (original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin-itest/pom.xml Tue Jul 3 10:54:34 2018
@@ -22,10 +22,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries</groupId>
- <artifactId>parent</artifactId>
- <version>2.0.1</version>
- <relativePath />
+ <groupId>org.apache.aries.blueprint</groupId>
+ <artifactId>blueprint-parent</artifactId>
+ <version>1.0.0</version>
+ <relativePath>../../blueprint-parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.blueprint</groupId>
Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin-pax-cdi-handlers/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-pax-cdi-handlers/pom.xml?rev=1834942&r1=1834941&r2=1834942&view=diff
==============================================================================
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin-pax-cdi-handlers/pom.xml (original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin-pax-cdi-handlers/pom.xml Tue Jul 3 10:54:34 2018
@@ -22,10 +22,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries</groupId>
- <artifactId>parent</artifactId>
- <version>2.0.1</version>
- <relativePath />
+ <groupId>org.apache.aries.blueprint</groupId>
+ <artifactId>blueprint-parent</artifactId>
+ <version>1.0.0</version>
+ <relativePath>../blueprint-parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.blueprint</groupId>
Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml?rev=1834942&r1=1834941&r2=1834942&view=diff
==============================================================================
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml (original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml Tue Jul 3 10:54:34 2018
@@ -22,10 +22,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries</groupId>
- <artifactId>parent</artifactId>
- <version>2.0.1</version>
- <relativePath />
+ <groupId>org.apache.aries.blueprint</groupId>
+ <artifactId>blueprint-parent</artifactId>
+ <version>1.0.0</version>
+ <relativePath>../../blueprint-parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.blueprint</groupId>
Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin-spring-handlers/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin-spring-handlers/pom.xml?rev=1834942&r1=1834941&r2=1834942&view=diff
==============================================================================
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin-spring-handlers/pom.xml (original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin-spring-handlers/pom.xml Tue Jul 3 10:54:34 2018
@@ -21,10 +21,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries</groupId>
- <artifactId>parent</artifactId>
- <version>2.0.1</version>
- <relativePath />
+ <groupId>org.apache.aries.blueprint</groupId>
+ <artifactId>blueprint-parent</artifactId>
+ <version>1.0.0</version>
+ <relativePath>../../blueprint-parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.blueprint</groupId>
Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml?rev=1834942&r1=1834941&r2=1834942&view=diff
==============================================================================
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml (original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml Tue Jul 3 10:54:34 2018
@@ -22,10 +22,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries</groupId>
- <artifactId>parent</artifactId>
- <version>2.0.1</version>
- <relativePath />
+ <groupId>org.apache.aries.blueprint</groupId>
+ <artifactId>blueprint-parent</artifactId>
+ <version>1.0.0</version>
+ <relativePath>../../blueprint-parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.blueprint</groupId>
Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/ArtifactFilter.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/ArtifactFilter.java?rev=1834942&r1=1834941&r2=1834942&view=diff
==============================================================================
--- aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/ArtifactFilter.java (original)
+++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/ArtifactFilter.java Tue Jul 3 10:54:34 2018
@@ -1,3 +1,21 @@
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.
+ */
package org.apache.aries.blueprint.plugin;
import org.apache.maven.artifact.Artifact;