This is an automated email from the ASF dual-hosted git repository. rotty3000 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/aries-component-dsl.git
The following commit(s) were added to refs/heads/master by this push: new b089e87 modernize project configuration b089e87 is described below commit b089e8700e08a4734a3d49a7a60149845966b13c Author: Raymond Augé <raymond.a...@liferay.com> AuthorDate: Tue May 28 15:10:47 2019 -0400 modernize project configuration Signed-off-by: Raymond Augé <raymond.a...@liferay.com> --- component-dsl/bnd.bnd | 20 -------------------- component-dsl/pom.xml | 4 +--- .../aries/component/dsl/function/package-info.java | 20 ++++++++++++++++++++ .../aries/component/dsl/internal/package-info.java | 19 +++++++++++++++++++ .../apache/aries/component/dsl/package-info.java | 20 ++++++++++++++++++++ itests-run/itest.bndrun | 7 +++---- itests-run/pom.xml | 21 ++++++++++++++++++++- itests/bnd.bnd | 8 ++++---- pom.xml | 5 +++++ 9 files changed, 92 insertions(+), 32 deletions(-) diff --git a/component-dsl/bnd.bnd b/component-dsl/bnd.bnd deleted file mode 100644 index 3fa218e..0000000 --- a/component-dsl/bnd.bnd +++ /dev/null @@ -1,20 +0,0 @@ -# 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. - -Export-Package:\ - org.apache.aries.component.dsl,\ - org.apache.aries.component.dsl.function \ No newline at end of file diff --git a/component-dsl/pom.xml b/component-dsl/pom.xml index 3a1eeac..86eb7a3 100644 --- a/component-dsl/pom.xml +++ b/component-dsl/pom.xml @@ -38,7 +38,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.1</version> <configuration> <source>1.8</source> <target>1.8</target> @@ -47,7 +46,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>3.0.1</version> <configuration> <archive> <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> @@ -91,7 +89,7 @@ <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.service.cm</artifactId> - <version>1.5.0</version> + <version>1.6.0</version> </dependency> </dependencies> diff --git a/component-dsl/src/main/java/org/apache/aries/component/dsl/function/package-info.java b/component-dsl/src/main/java/org/apache/aries/component/dsl/function/package-info.java new file mode 100644 index 0000000..765970c --- /dev/null +++ b/component-dsl/src/main/java/org/apache/aries/component/dsl/function/package-info.java @@ -0,0 +1,20 @@ +/* + * 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. + */ + +@org.osgi.annotation.bundle.Export +@org.osgi.annotation.versioning.Version("1.3.0") +package org.apache.aries.component.dsl.function; diff --git a/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/package-info.java b/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/package-info.java new file mode 100644 index 0000000..c96f341 --- /dev/null +++ b/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/package-info.java @@ -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. + */ + +@org.osgi.service.cm.annotations.RequireConfigurationAdmin +package org.apache.aries.component.dsl.internal; diff --git a/component-dsl/src/main/java/org/apache/aries/component/dsl/package-info.java b/component-dsl/src/main/java/org/apache/aries/component/dsl/package-info.java new file mode 100644 index 0000000..5fbb612 --- /dev/null +++ b/component-dsl/src/main/java/org/apache/aries/component/dsl/package-info.java @@ -0,0 +1,20 @@ +/* + * 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. + */ + +@org.osgi.annotation.bundle.Export +@org.osgi.annotation.versioning.Version("1.3.0") +package org.apache.aries.component.dsl; diff --git a/itests-run/itest.bndrun b/itests-run/itest.bndrun index b820de4..f884a62 100644 --- a/itests-run/itest.bndrun +++ b/itests-run/itest.bndrun @@ -29,9 +29,8 @@ -runsystemcapabilities.dflt: ${native_capability} -runproperties: -runbundles: \ - org.apache.aries.component-dsl.itests; version='[1.0.0,2.0.0)',\ - org.apache.felix.configadmin; version='[1.8.8,1.8.9)',\ - osgi.enroute.hamcrest.wrapper; version='[1.3.0,1.3.1)',\ - osgi.enroute.junit.wrapper; version='[4.12.0,4.12.1)' + org.apache.aries.component-dsl.itests;version='[1.2.2,1.2.3)',\ + org.apache.servicemix.bundles.junit;version='[4.12.0,4.12.1)',\ + org.apache.felix.configadmin;version='[1.9.14,1.9.15)' -include: -personal.bnd diff --git a/itests-run/pom.xml b/itests-run/pom.xml index c65a4dd..230191f 100644 --- a/itests-run/pom.xml +++ b/itests-run/pom.xml @@ -34,6 +34,25 @@ <plugins> <plugin> <groupId>biz.aQute.bnd</groupId> + <artifactId>bnd-resolver-maven-plugin</artifactId> + <version>${bnd.version}</version> + <configuration> + <failOnChanges>false</failOnChanges> + <bndruns> + <bndrun>itest.bndrun</bndrun> + </bndruns> + </configuration> + <executions> + <execution> + <phase>pre-integration-test</phase> + <goals> + <goal>resolve</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>biz.aQute.bnd</groupId> <artifactId>bnd-testing-maven-plugin</artifactId> <version>${bnd.version}</version> <configuration> @@ -68,7 +87,7 @@ <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.configadmin</artifactId> - <version>1.8.8</version> + <version>1.9.14</version> </dependency> <dependency> <groupId>org.eclipse.platform</groupId> diff --git a/itests/bnd.bnd b/itests/bnd.bnd index c7a5273..602ee7f 100644 --- a/itests/bnd.bnd +++ b/itests/bnd.bnd @@ -17,9 +17,9 @@ Bundle-Description: Integration Test bundle for component DSL -Private-Package:\ - org.apache.aries.component.dsl,\ - org.apache.aries.component.dsl.function,\ - org.apache.aries.component.dsl.internal,\ +Export-Package:\ + org.apache.aries.component.dsl;-split-package:=merge-first,\ + org.apache.aries.component.dsl.function;-split-package:=merge-first,\ + org.apache.aries.component.dsl.internal;-split-package:=merge-first,\ Test-Cases: ${classes;CONCRETE;ANNOTATED;org.junit.Test} diff --git a/pom.xml b/pom.xml index 3d585e1..bee083b 100644 --- a/pom.xml +++ b/pom.xml @@ -75,6 +75,11 @@ <dependencies> <dependency> <groupId>org.osgi</groupId> + <artifactId>osgi.annotation</artifactId> + <version>7.0.0</version> + </dependency> + <dependency> + <groupId>org.osgi</groupId> <artifactId>osgi.core</artifactId> <version>6.0.0</version> </dependency>