You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by al...@apache.org on 2025/02/08 12:23:41 UTC
(aries) 01/03: ARIES-2165: Build blueprint plugin with java 11, 17 and 21
This is an automated email from the ASF dual-hosted git repository.
alien11689 pushed a commit to branch ARIES-2165-build-blueprint-plugin-with-java-11-17-21
in repository https://gitbox.apache.org/repos/asf/aries.git
commit 083794471a4bb27fdbab451a7d488e3ced8e0b35
Author: Dominik Przybysz <al...@gmail.com>
AuthorDate: Sat Feb 8 12:47:04 2025 +0100
ARIES-2165: Build blueprint plugin with java 11, 17 and 21
---
.../blueprint-maven-plugin-annotation/pom.xml | 29 ++-------
.../plugin/blueprint-maven-plugin-itest/pom.xml | 72 ++++++++++------------
.../src/it/custom-destination/verify.groovy | 2 +-
.../src/it/multiple-invocation/verify.groovy | 4 +-
.../src/it/pax-cdi/verify.groovy | 2 +-
.../it/produced-bean-by-method-name/verify.groovy | 2 +-
.../src/it/scanpath-restrict/verify.groovy | 2 +-
.../src/it/simple-project/verify.groovy | 2 +-
.../src/it/spring/verify.groovy | 2 +-
.../src/it/transaction-annotation/verify.groovy | 6 +-
.../src/it/with-provide/verify.groovy | 2 +-
.../pom.xml | 33 ++--------
.../plugin/blueprint-maven-plugin-spi/pom.xml | 26 ++------
.../blueprint-maven-plugin-spring-handlers/pom.xml | 32 ++--------
blueprint/plugin/blueprint-maven-plugin/pom.xml | 72 ++--------------------
blueprint/plugin/pom.xml | 9 +--
16 files changed, 70 insertions(+), 227 deletions(-)
diff --git a/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml b/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml
index cdabe1ef9..d3c5560be 100644
--- a/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml
+++ b/blueprint/plugin/blueprint-maven-plugin-annotation/pom.xml
@@ -23,10 +23,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>blueprint-parent</artifactId>
- <version>1.0.0</version>
- <relativePath>../../blueprint-parent/pom.xml</relativePath>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>parent</artifactId>
+ <version>2.1.2-SNAPSHOT</version>
+ <relativePath>../../../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.blueprint</groupId>
@@ -42,10 +42,7 @@
</scm>
<properties>
- <java.source.version>1.8</java.source.version>
- <java.target.version>1.8</java.target.version>
-
- <bnd-maven-plugin.version>5.0.0</bnd-maven-plugin.version>
+ <bnd-maven-plugin.version>6.4.0</bnd-maven-plugin.version>
<osgi.annotation.version>7.0.0</osgi.annotation.version>
</properties>
@@ -60,21 +57,7 @@
<build>
<plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>${java.source.version}</source>
- <target>${java.target.version}</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <source>${java.source.version}</source>
- </configuration>
- </plugin>
- <plugin>
+ <plugin>
<groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-maven-plugin</artifactId>
<version>${bnd-maven-plugin.version}</version>
diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/pom.xml b/blueprint/plugin/blueprint-maven-plugin-itest/pom.xml
index f9df21231..e88faccad 100644
--- a/blueprint/plugin/blueprint-maven-plugin-itest/pom.xml
+++ b/blueprint/plugin/blueprint-maven-plugin-itest/pom.xml
@@ -22,10 +22,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>blueprint-parent</artifactId>
- <version>1.0.0</version>
- <relativePath>../../blueprint-parent/pom.xml</relativePath>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>parent</artifactId>
+ <version>2.1.2-SNAPSHOT</version>
+ <relativePath>../../../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.blueprint</groupId>
@@ -35,11 +35,11 @@
<name>Apache Aries Blueprint Maven Plugin iTest</name>
<properties>
- <java.target.version>1.7</java.target.version>
- <java.source.version>1.7</java.source.version>
+ <aries.skip.version.check>true</aries.skip.version.check>
- <blueprint-maven-plugin.version>1.9.1-SNAPSHOT</blueprint-maven-plugin.version>
+ <blueprint-maven-plugin.version>1.10.1-SNAPSHOT</blueprint-maven-plugin.version>
<maven-invoker-plugin.version>3.9.0</maven-invoker-plugin.version>
+ <groovy.version>4.0.24</groovy.version>
</properties>
<scm>
@@ -51,43 +51,33 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-invoker-plugin</artifactId>
+ <version>${maven-invoker-plugin.version}</version>
<configuration>
- <target>${java.target.version}</target>
- <source>${java.source.version}</source>
+ <projectsDirectory>src/it</projectsDirectory>
+ <pomIncludes>
+ <pomInclude>*/pom.xml</pomInclude>
+ </pomIncludes>
+ <postBuildHookScript>verify</postBuildHookScript>
+ <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
+ <parallelThreads>4</parallelThreads>
</configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.groovy</groupId>
+ <artifactId>groovy-xml</artifactId>
+ <version>${groovy.version}</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>integration-test</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-invoker-plugin</artifactId>
- <version>${maven-invoker-plugin.version}</version>
- <configuration>
- <projectsDirectory>src/it</projectsDirectory>
- <pomIncludes>
- <pomInclude>*/pom.xml</pomInclude>
- </pomIncludes>
- <postBuildHookScript>verify</postBuildHookScript>
- <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
- <parallelThreads>4</parallelThreads>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/custom-destination/verify.groovy b/blueprint/plugin/blueprint-maven-plugin-itest/src/it/custom-destination/verify.groovy
index 04d9d8c15..ef1ca9036 100644
--- a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/custom-destination/verify.groovy
+++ b/blueprint/plugin/blueprint-maven-plugin-itest/src/it/custom-destination/verify.groovy
@@ -19,7 +19,7 @@
def file = new File(basedir, 'target/classes/custom/my/blueprint.xml')
assert file.exists()
-def xml = new groovy.util.XmlSlurper().parse(file)
+def xml = new groovy.xml.XmlSlurper().parse(file)
assert xml.name() == 'blueprint'
assert xml.bean.@class == 'p1.T1'
assert xml.bean.@id == 't1'
diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/multiple-invocation/verify.groovy b/blueprint/plugin/blueprint-maven-plugin-itest/src/it/multiple-invocation/verify.groovy
index 4ef3e1b12..64b18534d 100644
--- a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/multiple-invocation/verify.groovy
+++ b/blueprint/plugin/blueprint-maven-plugin-itest/src/it/multiple-invocation/verify.groovy
@@ -19,7 +19,7 @@
def p1 = new File(basedir, 'target/generated-sources/blueprint/OSGI-INF/blueprint/p1.xml')
assert p1.exists()
-def xmlP1 = new groovy.util.XmlSlurper().parse(p1)
+def xmlP1 = new groovy.xml.XmlSlurper().parse(p1)
assert xmlP1.name() == 'blueprint'
assert xmlP1.'@default-activation' == 'lazy'
assert xmlP1.'@default-availability' == 'mandatory'
@@ -30,7 +30,7 @@ assert xmlP1.bean.@id == 't1'
def p2 = new File(basedir, 'target/generated-sources/blueprint/OSGI-INF/blueprint/p2.xml')
assert p2.exists()
-def xmlP2 = new groovy.util.XmlSlurper().parse(p2)
+def xmlP2 = new groovy.xml.XmlSlurper().parse(p2)
assert xmlP2.name() == 'blueprint'
assert xmlP2.'@default-activation' == 'eager'
assert xmlP2.'@default-availability' == 'optional'
diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/pax-cdi/verify.groovy b/blueprint/plugin/blueprint-maven-plugin-itest/src/it/pax-cdi/verify.groovy
index 8872e3df0..8241ea2a4 100644
--- a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/pax-cdi/verify.groovy
+++ b/blueprint/plugin/blueprint-maven-plugin-itest/src/it/pax-cdi/verify.groovy
@@ -19,7 +19,7 @@
def file = new File(basedir, 'target/generated-sources/blueprint/OSGI-INF/blueprint/autowire.xml')
assert file.exists()
-def xml = new groovy.util.XmlSlurper().parse(file)
+def xml = new groovy.xml.XmlSlurper().parse(file)
assert xml.name() == 'blueprint'
assert xml.bean.find{ it.@class == 'p1.T1'}.@id == 't1'
assert xml.bean.find{ it.@class == 'p1.T1'}.argument.@ref == 'i2-a1234'
diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/produced-bean-by-method-name/verify.groovy b/blueprint/plugin/blueprint-maven-plugin-itest/src/it/produced-bean-by-method-name/verify.groovy
index 5db78807f..6538e2ed4 100644
--- a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/produced-bean-by-method-name/verify.groovy
+++ b/blueprint/plugin/blueprint-maven-plugin-itest/src/it/produced-bean-by-method-name/verify.groovy
@@ -19,7 +19,7 @@
def file = new File(basedir, 'target/generated-sources/blueprint/OSGI-INF/blueprint/autowire.xml')
assert file.exists()
-def xml = new groovy.util.XmlSlurper().parse(file)
+def xml = new groovy.xml.XmlSlurper().parse(file)
assert xml.name() == 'blueprint'
assert xml.bean.find{ it.@class == 'p1.T1'}.@id == 't1'
assert xml.bean.find{ it.@id == 'bla1'}.'@class' == 'java.lang.String'
diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/scanpath-restrict/verify.groovy b/blueprint/plugin/blueprint-maven-plugin-itest/src/it/scanpath-restrict/verify.groovy
index 25c595813..27bd1413e 100644
--- a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/scanpath-restrict/verify.groovy
+++ b/blueprint/plugin/blueprint-maven-plugin-itest/src/it/scanpath-restrict/verify.groovy
@@ -20,7 +20,7 @@
def file = new File(basedir, 'target/generated-sources/blueprint/OSGI-INF/blueprint/autowire.xml')
assert file.exists()
-def xml = new groovy.util.XmlSlurper().parse(file)
+def xml = new groovy.xml.XmlSlurper().parse(file)
assert xml.bean.find {it.@class == 'p1.T1'}.size() == 0
assert xml.bean.find {it.@class == 'p2.T2'}.@id == 't2'
assert xml.bean.find {it.@class == 'p2.inner.T3'}.@id == 'test3'
diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/simple-project/verify.groovy b/blueprint/plugin/blueprint-maven-plugin-itest/src/it/simple-project/verify.groovy
index a5ab70378..d4c44b180 100644
--- a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/simple-project/verify.groovy
+++ b/blueprint/plugin/blueprint-maven-plugin-itest/src/it/simple-project/verify.groovy
@@ -19,7 +19,7 @@
def file = new File(basedir, 'target/generated-sources/blueprint/OSGI-INF/blueprint/autowire.xml')
assert file.exists()
-def xml = new groovy.util.XmlSlurper().parse(file)
+def xml = new groovy.xml.XmlSlurper().parse(file)
assert xml.name() == 'blueprint'
assert xml.bean.find{ it.@class == 'p1.T1'}.@id == 't1'
assert xml.bean.find{ it.@class == 'p1.T2'}.size() == 0
diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/spring/verify.groovy b/blueprint/plugin/blueprint-maven-plugin-itest/src/it/spring/verify.groovy
index ce9aaeda9..30d2346fe 100644
--- a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/spring/verify.groovy
+++ b/blueprint/plugin/blueprint-maven-plugin-itest/src/it/spring/verify.groovy
@@ -19,7 +19,7 @@
def file = new File(basedir, 'target/generated-sources/blueprint/custom/my/blueprint.xml')
assert file.exists()
-def xml = new groovy.util.XmlSlurper().parse(file)
+def xml = new groovy.xml.XmlSlurper().parse(file)
assert xml.name() == 'blueprint'
assert xml.bean.find {it.@id == 't1'}.@class == 'p1.T1'
assert xml.bean.find {it.@id == 't2'}.@class == 'p1.T2'
diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/transaction-annotation/verify.groovy b/blueprint/plugin/blueprint-maven-plugin-itest/src/it/transaction-annotation/verify.groovy
index 4cd98a8f3..e3b1d1ffe 100644
--- a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/transaction-annotation/verify.groovy
+++ b/blueprint/plugin/blueprint-maven-plugin-itest/src/it/transaction-annotation/verify.groovy
@@ -19,17 +19,17 @@
def fileP1 = new File(basedir, 'target/generated-sources/blueprint/OSGI-INF/blueprint/p1.xml')
assert fileP1.exists()
-def xml1 = new groovy.util.XmlSlurper().parse(fileP1)
+def xml1 = new groovy.xml.XmlSlurper().parse(fileP1)
assert xml1."enable-annotations".size() == 0
assert xml1.bean.find{ it.@class == 'p1.T1'}.@id == 't1'
assert xml1.bean.transaction.find{ it.name() == 'transaction' }.size() == 1
def fileP2 = new File(basedir, 'target/generated-sources/blueprint/OSGI-INF/blueprint/p2.xml')
assert fileP2.exists()
-def xml2 = new groovy.util.XmlSlurper().parse(fileP2)
+def xml2 = new groovy.xml.XmlSlurper().parse(fileP2)
assert xml2."enable-annotations".size() == 1
def fileP3 = new File(basedir, 'target/generated-sources/blueprint/OSGI-INF/blueprint/p3.xml')
assert fileP3.exists()
-def xml3 = new groovy.util.XmlSlurper().parse(fileP3)
+def xml3 = new groovy.xml.XmlSlurper().parse(fileP3)
assert xml3."enable-annotations".size() == 0
\ No newline at end of file
diff --git a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/with-provide/verify.groovy b/blueprint/plugin/blueprint-maven-plugin-itest/src/it/with-provide/verify.groovy
index 2750c874d..7668cd65b 100644
--- a/blueprint/plugin/blueprint-maven-plugin-itest/src/it/with-provide/verify.groovy
+++ b/blueprint/plugin/blueprint-maven-plugin-itest/src/it/with-provide/verify.groovy
@@ -19,7 +19,7 @@
def file = new File(basedir, 'a/target/classes/custom/my/blueprint.xml')
assert file.exists()
-def xml = new groovy.util.XmlSlurper().parse(file)
+def xml = new groovy.xml.XmlSlurper().parse(file)
assert xml.name() == 'blueprint'
assert xml.bean.@class == 'a.A'
assert xml.bean.@id == 'a'
diff --git a/blueprint/plugin/blueprint-maven-plugin-pax-cdi-handlers/pom.xml b/blueprint/plugin/blueprint-maven-plugin-pax-cdi-handlers/pom.xml
index 995526c4d..10b5e5131 100644
--- a/blueprint/plugin/blueprint-maven-plugin-pax-cdi-handlers/pom.xml
+++ b/blueprint/plugin/blueprint-maven-plugin-pax-cdi-handlers/pom.xml
@@ -22,10 +22,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>blueprint-parent</artifactId>
- <version>1.0.0</version>
- <relativePath>../../blueprint-parent/pom.xml</relativePath>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>parent</artifactId>
+ <version>2.1.2-SNAPSHOT</version>
+ <relativePath>../../../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.blueprint</groupId>
@@ -34,42 +34,17 @@
<name>Apache Aries Blueprint Maven Plugin Pax Cdi Handlers</name>
<properties>
- <java.target.version>1.7</java.target.version>
- <java.source.version>1.7</java.source.version>
-
<blueprint-maven-plugin-spi.version>1.0.0</blueprint-maven-plugin-spi.version>
<guava.version>19.0</guava.version>
<pax-cdi-api.version>0.8.0</pax-cdi-api.version>
</properties>
- <profiles>
- <profile>
- <id>dev</id>
- <properties>
- <blueprint-maven-plugin-spi.version>${blueprint-maven-plugin-spi.dev-version}</blueprint-maven-plugin-spi.version>
- </properties>
- </profile>
- </profiles>
-
<scm>
<connection>scm:git:https://gitbox.apache.org/repos/asf/aries.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/aries.git</developerConnection>
<url>https://gitbox.apache.org/repos/asf?p=aries.git;a=summary</url>
</scm>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <target>${java.target.version}</target>
- <source>${java.source.version}</source>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-
<dependencies>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
diff --git a/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml b/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml
index bc9cb7c68..8af7180a7 100644
--- a/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml
+++ b/blueprint/plugin/blueprint-maven-plugin-spi/pom.xml
@@ -22,10 +22,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>blueprint-parent</artifactId>
- <version>1.0.0</version>
- <relativePath>../../blueprint-parent/pom.xml</relativePath>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>parent</artifactId>
+ <version>2.1.2-SNAPSHOT</version>
+ <relativePath>../../../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.blueprint</groupId>
@@ -38,22 +38,4 @@
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/aries.git</developerConnection>
<url>https://gitbox.apache.org/repos/asf?p=aries.git;a=summary</url>
</scm>
-
- <properties>
- <java.target.version>1.7</java.target.version>
- <java.source.version>1.7</java.source.version>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <target>${java.target.version}</target>
- <source>${java.source.version}</source>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/blueprint/plugin/blueprint-maven-plugin-spring-handlers/pom.xml b/blueprint/plugin/blueprint-maven-plugin-spring-handlers/pom.xml
index 5833e660f..cfafe179e 100644
--- a/blueprint/plugin/blueprint-maven-plugin-spring-handlers/pom.xml
+++ b/blueprint/plugin/blueprint-maven-plugin-spring-handlers/pom.xml
@@ -21,10 +21,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>blueprint-parent</artifactId>
- <version>1.0.0</version>
- <relativePath>../../blueprint-parent/pom.xml</relativePath>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>parent</artifactId>
+ <version>2.1.2-SNAPSHOT</version>
+ <relativePath>../../../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.blueprint</groupId>
@@ -39,36 +39,12 @@
</scm>
<properties>
- <java.target.version>1.7</java.target.version>
- <java.source.version>1.7</java.source.version>
-
<blueprint-maven-plugin-spi.version>1.0.0</blueprint-maven-plugin-spi.version>
<commons-lang.version>2.6</commons-lang.version>
<guava.version>19.0</guava.version>
<spring.version>3.1.4.RELEASE</spring.version>
</properties>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <target>${java.target.version}</target>
- <source>${java.source.version}</source>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>dev</id>
- <properties>
- <blueprint-maven-plugin-spi.version>${blueprint-maven-plugin-spi.dev-version}</blueprint-maven-plugin-spi.version>
- </properties>
- </profile>
- </profiles>
-
<dependencies>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
diff --git a/blueprint/plugin/blueprint-maven-plugin/pom.xml b/blueprint/plugin/blueprint-maven-plugin/pom.xml
index d43a2f380..0bbf484cb 100644
--- a/blueprint/plugin/blueprint-maven-plugin/pom.xml
+++ b/blueprint/plugin/blueprint-maven-plugin/pom.xml
@@ -22,10 +22,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>blueprint-parent</artifactId>
- <version>1.0.0</version>
- <relativePath>../../blueprint-parent/pom.xml</relativePath>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>parent</artifactId>
+ <version>2.1.2-SNAPSHOT</version>
+ <relativePath>../../../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.aries.blueprint</groupId>
@@ -38,9 +38,6 @@
</description>
<properties>
- <java.source.version>8</java.source.version>
- <java.target.version>8</java.target.version>
-
<aether.version>1.13.1</aether.version>
<blueprint-maven-plugin-annotation.version>1.3.0</blueprint-maven-plugin-annotation.version>
<blueprint-maven-plugin-pax-cdi-handlers.version>1.0.0</blueprint-maven-plugin-pax-cdi-handlers.version>
@@ -69,22 +66,6 @@
<xbean-finder-shaded.version>4.26</xbean-finder-shaded.version>
</properties>
- <profiles>
- <profile>
- <id>dev</id>
- <properties>
- <org.apache.aries.blueprint.api.version>${blueprint.api.dev.version}</org.apache.aries.blueprint.api.version>
- <org.apache.aries.blueprint.core.version>${blueprint.core.dev.version}</org.apache.aries.blueprint.core.version>
- <org.apache.aries.blueprint.cm.version>${blueprint.cm.dev.version}</org.apache.aries.blueprint.cm.version>
-
- <blueprint-maven-plugin-spi.version>${blueprint-maven-plugin-spi.dev-version}</blueprint-maven-plugin-spi.version>
- <blueprint-maven-plugin-spring-handlers.version>${blueprint-maven-plugin-spring-handlers.dev-version}</blueprint-maven-plugin-spring-handlers.version>
- <blueprint-maven-plugin-annotation.version>${blueprint-maven-plugin-annotation.dev-version}</blueprint-maven-plugin-annotation.version>
- <blueprint-maven-plugin-pax-cdi-handlers.version>${blueprint-maven-plugin-pax-cdi-handlers.dev-version}</blueprint-maven-plugin-pax-cdi-handlers.version>
- </properties>
- </profile>
- </profiles>
-
<scm>
<connection>scm:git:https://gitbox.apache.org/repos/asf/aries.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/aries.git</developerConnection>
@@ -93,13 +74,6 @@
<build>
<plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <target>${java.source.version}</target>
- <source>${java.target.version}</source>
- </configuration>
- </plugin>
<plugin>
<artifactId>maven-plugin-plugin</artifactId>
<version>${maven-plugin-plugin.version}</version>
@@ -140,43 +114,6 @@
</executions>
</plugin>
</plugins>
- <pluginManagement>
- <plugins>
- <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build
- itself. -->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>${lifecycle-mapping.version}</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>
- org.apache.maven.plugins
- </groupId>
- <artifactId>
- maven-plugin-plugin
- </artifactId>
- <versionRange>
- [3.2,)
- </versionRange>
- <goals>
- <goal>descriptor</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore/>
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
-
</build>
<dependencies>
@@ -196,7 +133,6 @@
<version>${blueprint-maven-plugin-pax-cdi-handlers.version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
diff --git a/blueprint/plugin/pom.xml b/blueprint/plugin/pom.xml
index fbbdbd27b..a51845ed6 100644
--- a/blueprint/plugin/pom.xml
+++ b/blueprint/plugin/pom.xml
@@ -22,12 +22,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>blueprint-parent</artifactId>
- <version>1.0.0</version>
- <relativePath>../blueprint-parent/pom.xml</relativePath>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>parent</artifactId>
+ <version>2.1.2-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
+ <groupId>org.apache.aries.blueprint</groupId>
<artifactId>plugin-parent</artifactId>
<name>Apache Aries Blueprint Maven Plugin Parent</name>
<packaging>pom</packaging>