This is an automated email from the ASF dual-hosted git repository. alien11689 pushed a commit to branch restore-tutorials-blueprint in repository https://gitbox.apache.org/repos/asf/aries.git
commit 8858d4b060aebecbe4ea2a19c19eee708a01f177 Author: Dominik Przybysz <[email protected]> AuthorDate: Sun Mar 2 21:04:03 2025 +0100 [MAINTENANCE] Compile tutorial modules --- .github/workflows/tutorials.yml | 51 ++++ README.md | 1 + pom.xml | 2 +- tutorials/blueprint/pom.xml | 9 +- tutorials/blueprint/tutorial-assembly/pom.xml | 324 +++++++++++---------- .../src/main/assemblies/tutorial-assembly.xml | 31 -- .../tutorial-assembly/src/main/docs/style/site.css | 18 ++ .../filtered-resources/configuration/config.ini | 26 +- .../tutorial-assembly/src/main/scripts/build.bat | 7 - .../tutorial-assembly/src/main/scripts/build.sh | 9 - .../tutorial-assembly/src/main/scripts/run.bat | 35 ++- .../tutorial-assembly/src/main/scripts/run.sh | 32 +- .../src/main/scripts/start_platform.bat | 22 +- .../src/main/scripts/start_platform.sh | 19 +- .../blueprint/tutorial-modules/greeter-api/pom.xml | 16 +- .../greeter-client-blueprint/pom.xml | 19 +- .../tutorial-modules/greeter-client-osgi/pom.xml | 15 +- .../greeter-server-blueprint/pom.xml | 15 +- .../tutorial-modules/greeter-server-osgi/pom.xml | 15 +- tutorials/blueprint/tutorial-modules/pom.xml | 40 --- tutorials/pom.xml | 221 ++++---------- 21 files changed, 480 insertions(+), 447 deletions(-) diff --git a/.github/workflows/tutorials.yml b/.github/workflows/tutorials.yml new file mode 100644 index 000000000..414197cb8 --- /dev/null +++ b/.github/workflows/tutorials.yml @@ -0,0 +1,51 @@ +# Licensed 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. + +name: Tutorials - CI Build + +on: + pull_request: + paths: + - parent/** + - tutorials/** + - .github/workflows/tutorials.yml + push: + branches: + - 'trunk' + +env: + LC_ALL: en_US.UTF-8 + +jobs: + JDKxx_Matrix: + timeout-minutes: 10 + strategy: + fail-fast: false + matrix: + java: [ 8 ] + os: [ ubuntu-latest ] + name: JDK${{ matrix.java }} ${{ matrix.os }} + runs-on: ${{ matrix.os }} + steps: + - name: Git Checkout + uses: actions/checkout@v4 + - name: Set up Java + uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: ${{ matrix.java }} + - name: Build parent + shell: bash + run: mvn -U -e -B -ntp clean install -f parent + - name: Build tutorials + shell: bash + run: mvn -U -e -B -ntp clean install -f tutorials diff --git a/README.md b/README.md index 135a991d6..f34db64e3 100644 --- a/README.md +++ b/README.md @@ -25,6 +25,7 @@ See [Apache Aries Website](http://aries.apache.org/). - [](https://github.com/apache/aries/actions/workflows/web.yml) - [](https://github.com/apache/aries/actions/workflows/util.yml) - [](https://github.com/apache/aries/actions/workflows/testsupport.yml) +- [](https://github.com/apache/aries/actions/workflows/tutorials.yml) ## Source Code diff --git a/pom.xml b/pom.xml index 3ddea23c0..be3476816 100644 --- a/pom.xml +++ b/pom.xml @@ -55,6 +55,7 @@ <module>subsystem</module> <module>testsupport</module> <module>transaction</module> + <module>tutorials</module> <module>util</module> <module>versioning</module> <module>web</module> @@ -62,7 +63,6 @@ <!-- excluded as not having CI build--> <!-- <module>sandbox</module> - <module>tutorials</module> --> </modules> diff --git a/tutorials/blueprint/pom.xml b/tutorials/blueprint/pom.xml index 5fc64b1dd..af0ae4961 100644 --- a/tutorials/blueprint/pom.xml +++ b/tutorials/blueprint/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>org.apache.aries.tutorials</groupId> <artifactId>tutorials</artifactId> - <version>0.4-SNAPSHOT</version> + <version>0.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -31,6 +31,11 @@ <modules> - <module>tutorial-modules</module> + <module>tutorial-modules/greeter-api</module> + <module>tutorial-modules/greeter-client-osgi</module> + <module>tutorial-modules/greeter-server-osgi</module> + <module>tutorial-modules/greeter-client-blueprint</module> + <module>tutorial-modules/greeter-server-blueprint</module> + <module>tutorial-assembly</module> </modules> </project> diff --git a/tutorials/blueprint/tutorial-assembly/pom.xml b/tutorials/blueprint/tutorial-assembly/pom.xml index b278d31a5..72e0648a5 100644 --- a/tutorials/blueprint/tutorial-assembly/pom.xml +++ b/tutorials/blueprint/tutorial-assembly/pom.xml @@ -1,151 +1,179 @@ <?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. - --> +<!-- + 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";> - - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.apache.aries.tutorials.blueprint</groupId> - <artifactId>blueprint</artifactId> - <version>0.4-SNAPSHOT</version> - </parent> - - - <groupId>org.apache.aries.tutorials.blueprint</groupId> - <artifactId>tutorial-assembly</artifactId> - <name>Greeter Tutorial Assembly</name> - <packaging>pom</packaging> - - <dependencies> - - <!-- External (platform) dependencies --> - - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.fileinstall</artifactId> - </dependency> - - <dependency> - <groupId>org.eclipse</groupId> - <artifactId>osgi</artifactId> - </dependency> - - <dependency> - <groupId>org.eclipse.equinox</groupId> - <artifactId>cm</artifactId> - </dependency> - - <dependency> - <groupId>org.eclipse.osgi</groupId> - <artifactId>services</artifactId> - </dependency> - - <dependency> - <groupId>org.ops4j.pax.logging</groupId> - <artifactId>pax-logging-api</artifactId> - </dependency> - - <dependency> - <groupId>org.ops4j.pax.logging</groupId> - <artifactId>pax-logging-service</artifactId> - </dependency> - - <!-- Internal (Aries) dependencies --> - - <dependency> - <groupId>org.apache.aries.blueprint</groupId> - <artifactId>org.apache.aries.blueprint</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.aries</groupId> - <artifactId>org.apache.aries.util</artifactId> - </dependency> - - <!-- Sample application dependencies --> - - <dependency> - <groupId>org.apache.aries.tutorials.blueprint</groupId> - <artifactId>org.apache.aries.tutorials.blueprint.greeter.api</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.aries.tutorials.blueprint</groupId> - <artifactId>org.apache.aries.tutorials.blueprint.greeter.client.blueprint</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.aries.tutorials.blueprint</groupId> - <artifactId>org.apache.aries.tutorials.blueprint.greeter.client.osgi</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.aries.tutorials.blueprint</groupId> - <artifactId>org.apache.aries.tutorials.blueprint.greeter.server.blueprint</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.aries.tutorials.blueprint</groupId> - <artifactId>org.apache.aries.tutorials.blueprint.greeter.server.osgi</artifactId> - <version>${project.version}</version> - </dependency> - - </dependencies> - - <modules> - <module>../tutorial-modules/greeter-api</module> - <module>../tutorial-modules/greeter-client-blueprint</module> - <module>../tutorial-modules/greeter-client-osgi</module> - <module>../tutorial-modules/greeter-server-blueprint</module> - <module>../tutorial-modules/greeter-server-osgi</module> - </modules> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-resources-plugin</artifactId> - <configuration> - <outputDirectory>${project.build.directory}</outputDirectory> - </configuration> - <executions> - <execution> - <id>filter</id> - <phase>generate-resources</phase> - <goals> - <goal>resources</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-5</version> - <configuration> - <descriptors> - <descriptor>src/main/assemblies/tutorial-assembly.xml</descriptor> - </descriptors> - </configuration> - </plugin> - </plugins> - </build> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.aries.tutorials.blueprint</groupId> + <artifactId>blueprint</artifactId> + <version>0.1-SNAPSHOT</version> + </parent> + + <artifactId>tutorial-assembly</artifactId> + <name>Greeter Tutorial Assembly</name> + <packaging>pom</packaging> + + <dependencies> + + <!-- External (platform) dependencies --> + + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.fileinstall</artifactId> + </dependency> + + <dependency> + <groupId>org.eclipse.platform</groupId> + <artifactId>org.eclipse.osgi</artifactId> + </dependency> + <dependency> + <groupId>org.eclipse.platform</groupId> + <artifactId>org.eclipse.equinox.console</artifactId> + </dependency> + <dependency> + <groupId>org.fusesource.jansi</groupId> + <artifactId>jansi</artifactId> + </dependency> + <dependency> + <groupId>org.jline</groupId> + <artifactId>jline</artifactId> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.gogo.command</artifactId> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.gogo.jline</artifactId> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.gogo.runtime</artifactId> + </dependency> + + + <dependency> + <groupId>org.ops4j.pax.logging</groupId> + <artifactId>pax-logging-api</artifactId> + </dependency> + + <dependency> + <groupId>org.ops4j.pax.logging</groupId> + <artifactId>pax-logging-service</artifactId> + </dependency> + + <!-- Internal (Aries) dependencies --> + + <dependency> + <groupId>org.apache.aries.blueprint</groupId> + <artifactId>org.apache.aries.blueprint.core</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.aries.blueprint</groupId> + <artifactId>org.apache.aries.blueprint.api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.aries</groupId> + <artifactId>org.apache.aries.util</artifactId> + </dependency> + <dependency> + <groupId>org.apache.aries.proxy</groupId> + <artifactId>org.apache.aries.proxy</artifactId> + </dependency> + <dependency> + <groupId>org.apache.aries.quiesce</groupId> + <artifactId>org.apache.aries.quiesce.api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.aries.quiesce</groupId> + <artifactId>org.apache.aries.quiesce.manager</artifactId> + </dependency> + + <!-- Sample application dependencies --> + + <dependency> + <groupId>org.apache.aries.tutorials.blueprint</groupId> + <artifactId>org.apache.aries.tutorials.blueprint.greeter.api</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.aries.tutorials.blueprint</groupId> + <artifactId>org.apache.aries.tutorials.blueprint.greeter.client.blueprint</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.aries.tutorials.blueprint</groupId> + <artifactId>org.apache.aries.tutorials.blueprint.greeter.client.osgi</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.aries.tutorials.blueprint</groupId> + <artifactId>org.apache.aries.tutorials.blueprint.greeter.server.blueprint</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.aries.tutorials.blueprint</groupId> + <artifactId>org.apache.aries.tutorials.blueprint.greeter.server.osgi</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <configuration> + <outputDirectory>${project.build.directory}</outputDirectory> + </configuration> + <executions> + <execution> + <id>filter</id> + <phase>generate-resources</phase> + <goals> + <goal>resources</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.2-beta-5</version> + <configuration> + <descriptors> + <descriptor>src/main/assemblies/tutorial-assembly.xml</descriptor> + </descriptors> + </configuration> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>assembly</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> diff --git a/tutorials/blueprint/tutorial-assembly/src/main/assemblies/tutorial-assembly.xml b/tutorials/blueprint/tutorial-assembly/src/main/assemblies/tutorial-assembly.xml index 828353fb9..210b27a92 100644 --- a/tutorials/blueprint/tutorial-assembly/src/main/assemblies/tutorial-assembly.xml +++ b/tutorials/blueprint/tutorial-assembly/src/main/assemblies/tutorial-assembly.xml @@ -27,22 +27,6 @@ </formats> <includeBaseDirectory>false</includeBaseDirectory> - <moduleSets> - <moduleSet> - <sources> - <fileSets> - <fileSet> - <excludes> - <exclude>target/**</exclude> - <exclude>.*/**</exclude> - </excludes> - </fileSet> - </fileSets> - <outputDirectoryMapping>source/${module.artifactId}</outputDirectoryMapping> - </sources> - </moduleSet> - </moduleSets> - <dependencySets> <dependencySet> <excludes> @@ -63,10 +47,6 @@ <directory>target/configuration</directory> <outputDirectory>/platform/configuration</outputDirectory> </fileSet> - <fileSet> - <directory>src/main/dropins</directory> - <outputDirectory>/dropins</outputDirectory> - </fileSet> <fileSet> <directory>src/main/docs</directory> <outputDirectory>/docs</outputDirectory> @@ -86,12 +66,6 @@ <destName>run.sh</destName> <fileMode>0777</fileMode> </file> - <file> - <source>src/main/scripts/build.sh</source> - <outputDirectory>scripts</outputDirectory> - <destName>build.sh</destName> - <fileMode>0777</fileMode> - </file> <file> <source>src/main/scripts/start_platform.bat</source> <outputDirectory>scripts</outputDirectory> @@ -102,11 +76,6 @@ <outputDirectory>scripts</outputDirectory> <destName>run.bat</destName> </file> - <file> - <source>src/main/scripts/build.bat</source> - <outputDirectory>scripts</outputDirectory> - <destName>build.bat</destName> - </file> </files> </assembly> diff --git a/tutorials/blueprint/tutorial-assembly/src/main/docs/style/site.css b/tutorials/blueprint/tutorial-assembly/src/main/docs/style/site.css index 11b6abb92..572e9d662 100644 --- a/tutorials/blueprint/tutorial-assembly/src/main/docs/style/site.css +++ b/tutorials/blueprint/tutorial-assembly/src/main/docs/style/site.css @@ -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 + * + * 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. + */ body { margin: 0; padding: 0; diff --git a/tutorials/blueprint/tutorial-assembly/src/main/filtered-resources/configuration/config.ini b/tutorials/blueprint/tutorial-assembly/src/main/filtered-resources/configuration/config.ini index c8c2ae740..73647d800 100644 --- a/tutorials/blueprint/tutorial-assembly/src/main/filtered-resources/configuration/config.ini +++ b/tutorials/blueprint/tutorial-assembly/src/main/filtered-resources/configuration/config.ini @@ -16,14 +16,24 @@ # under the License. osgi.bundles=\ -org.apache.felix.fileinstall-2.0.8@start,\ -cm-3.2.0-v20070116@start,\ -services-3.1.200-v20070605@start,\ -pax-logging-api-1.4.jar@start,\ -pax-logging-service-1.4.jar@start,\ -org.apache.aries.util-${ariesUtilVersion}.jar@start,\ -org.apache.aries.blueprint-${ariesBlueprintVersion}.jar@start +org.eclipse.equinox.console-${org.eclipse.equinox.console.version}@start,\ +jansi-${jansi.version}@start,\ +jline-${jline.version}@start,\ +org.apache.felix.gogo.command-${org.apache.felix.gogo.command.version}@start,\ +org.apache.felix.gogo.jline-${org.apache.felix.gogo.jline.version}@start,\ +org.apache.felix.gogo.runtime-${org.apache.felix.gogo.runtime.version}@start,\ +org.apache.felix.fileinstall-${org.apache.felix.fileinstall.version}@start,\ +pax-logging-api-${pax-logging.version}.jar@start,\ +pax-logging-service-${pax-logging.version}.jar@start,\ +org.apache.aries.util-${org.apache.aries.util.version}.jar@start,\ +org.apache.aries.proxy-${org.apache.aries.proxy.version}.jar@start,\ +org.apache.aries.quiesce.api-${org.apache.aries.quiesce.api.version}.jar@start,\ +org.apache.aries.quiesce.manager-${org.apache.aries.quiesce.manager.version}.jar@start,\ +org.apache.aries.blueprint.api-${org.apache.aries.blueprint.api.version}.jar@start,\ +org.apache.aries.blueprint.core-${org.apache.aries.blueprint.core.version}.jar@start felix.fileinstall.dir=../dropins -felix.fileinstall.bundles.new.start=false +felix.fileinstall.bundles.new.start=true +felix.fileinstall.poll=1000 eclipse.ignoreApp=true org.ops4j.pax.logging.DefaultServiceLog.level=INFO +osgi.console=true \ No newline at end of file diff --git a/tutorials/blueprint/tutorial-assembly/src/main/scripts/build.bat b/tutorials/blueprint/tutorial-assembly/src/main/scripts/build.bat deleted file mode 100644 index 1900e3a37..000000000 --- a/tutorials/blueprint/tutorial-assembly/src/main/scripts/build.bat +++ /dev/null @@ -1,7 +0,0 @@ -@echo off -setlocal -cd %~dp0 - -echo Building project %1 -cd ../source/%1 -mvn clean install diff --git a/tutorials/blueprint/tutorial-assembly/src/main/scripts/build.sh b/tutorials/blueprint/tutorial-assembly/src/main/scripts/build.sh deleted file mode 100755 index ab01c1980..000000000 --- a/tutorials/blueprint/tutorial-assembly/src/main/scripts/build.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -scriptDir=`pwd`/`dirname $0` -project=$1 - -if [ "${project}" != "NONE" ]; then - echo Building project ${project} - cd "../source/${project}" - mvn clean install -fi diff --git a/tutorials/blueprint/tutorial-assembly/src/main/scripts/run.bat b/tutorials/blueprint/tutorial-assembly/src/main/scripts/run.bat index 450f49601..d2e932bfc 100644 --- a/tutorials/blueprint/tutorial-assembly/src/main/scripts/run.bat +++ b/tutorials/blueprint/tutorial-assembly/src/main/scripts/run.bat @@ -1,7 +1,30 @@ -setlocal +@REM ################################################################################ +@REM # Copyright 2010 +@REM # +@REM # Licensed to the Apache Software Foundation (ASF) under one or more +@REM # contributor license agreements. See the NOTICE file distributed with +@REM # this work for additional information regarding copyright ownership. +@REM # The ASF licenses this file to You under the Apache License, Version 2.0 +@REM # (the "License"); you may not use this file except in compliance with +@REM # the License. You may obtain a copy of the License at +@REM # +@REM # http://www.apache.org/licenses/LICENSE-2.0 +@REM # +@REM # Unless required by applicable law or agreed to in writing, software +@REM # distributed under the License is distributed on an "AS IS" BASIS, +@REM # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@REM # See the License for the specific language governing permissions and +@REM # limitations under the License. +@REM ################################################################################ +setlocal cd %~dp0 -copy ..\source\org.apache.aries.tutorials.blueprint.greeter.api\target\*.jar ..\dropins - -copy ..\source\org.apache.aries.tutorials.blueprint.greeter.server.osgi\target\*.jar ..\dropins - -copy ..\source\org.apache.aries.tutorials.blueprint.greeter.client.osgi\target\*.jar ..\dropins +mkdir ..\dropins +copy ..\bin\org.apache.aries.tutorials.blueprint.greeter.api-0.1-SNAPSHOT.jar ..\dropins +timeout /t 3 +copy ..\bin\org.apache.aries.tutorials.blueprint.greeter.server.osgi-0.1-SNAPSHOT.jar ..\dropins +timeout /t 3 +copy ..\bin\org.apache.aries.tutorials.blueprint.greeter.server.blueprint-0.1-SNAPSHOT.jar ..\dropins +timeout /t 3 +copy ..\bin\org.apache.aries.tutorials.blueprint.greeter.client.osgi-0.1-SNAPSHOT.jar ..\dropins +timeout /t 3 +copy ..\bin\org.apache.aries.tutorials.blueprint.greeter.client.blueprint-0.1-SNAPSHOT.jar ..\dropins \ No newline at end of file diff --git a/tutorials/blueprint/tutorial-assembly/src/main/scripts/run.sh b/tutorials/blueprint/tutorial-assembly/src/main/scripts/run.sh index 17a9d7be8..f6d1d5397 100644 --- a/tutorials/blueprint/tutorial-assembly/src/main/scripts/run.sh +++ b/tutorials/blueprint/tutorial-assembly/src/main/scripts/run.sh @@ -1,5 +1,31 @@ #!/bin/sh +################################################################################ +# +# 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. +################################################################################ scriptDir=`dirname $0` -cp "${scriptDir}/../source/org.apache.aries.tutorials.blueprint.greeter.api/target/"*.jar "${scriptDir}/../dropins" -cp "${scriptDir}/../source/org.apache.aries.tutorials.blueprint.greeter.server.osgi/target/"*.jar "${scriptDir}/../dropins" -cp "${scriptDir}/../source/org.apache.aries.tutorials.blueprint.greeter.client.osgi/target/"*.jar "${scriptDir}/../dropins" +binDir="${scriptDir}/../bin" +targetDir="${scriptDir}/../dropins" +mkdir $targetDir +cp "${binDir}/org.apache.aries.tutorials.blueprint.greeter.api-0.1-SNAPSHOT.jar" $targetDir +sleep 3 +cp "${binDir}/org.apache.aries.tutorials.blueprint.greeter.server.osgi-0.1-SNAPSHOT.jar" $targetDir +sleep 3 +cp "${binDir}/org.apache.aries.tutorials.blueprint.greeter.server.blueprint-0.1-SNAPSHOT.jar" $targetDir +sleep 3 +cp "${binDir}/org.apache.aries.tutorials.blueprint.greeter.client.osgi-0.1-SNAPSHOT.jar" $targetDir +sleep 3 +cp "${binDir}/org.apache.aries.tutorials.blueprint.greeter.client.blueprint-0.1-SNAPSHOT.jar" $targetDir diff --git a/tutorials/blueprint/tutorial-assembly/src/main/scripts/start_platform.bat b/tutorials/blueprint/tutorial-assembly/src/main/scripts/start_platform.bat index 87acd9ba7..a0947cc71 100644 --- a/tutorials/blueprint/tutorial-assembly/src/main/scripts/start_platform.bat +++ b/tutorials/blueprint/tutorial-assembly/src/main/scripts/start_platform.bat @@ -1,5 +1,23 @@ +@REM ################################################################################ +@REM # Copyright 2010 +@REM # +@REM # Licensed to the Apache Software Foundation (ASF) under one or more +@REM # contributor license agreements. See the NOTICE file distributed with +@REM # this work for additional information regarding copyright ownership. +@REM # The ASF licenses this file to You under the Apache License, Version 2.0 +@REM # (the "License"); you may not use this file except in compliance with +@REM # the License. You may obtain a copy of the License at +@REM # +@REM # http://www.apache.org/licenses/LICENSE-2.0 +@REM # +@REM # Unless required by applicable law or agreed to in writing, software +@REM # distributed under the License is distributed on an "AS IS" BASIS, +@REM # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@REM # See the License for the specific language governing permissions and +@REM # limitations under the License. +@REM ################################################################################ setlocal cd %~dp0 -cd ..\platform +cd ..\platform -java -jar osgi-3.5.0.v20090520.jar -console -clean \ No newline at end of file +java -jar org.eclipse.osgi-3.22.0.jar -console -clean \ No newline at end of file diff --git a/tutorials/blueprint/tutorial-assembly/src/main/scripts/start_platform.sh b/tutorials/blueprint/tutorial-assembly/src/main/scripts/start_platform.sh index 1bfeef5f2..8d1319056 100644 --- a/tutorials/blueprint/tutorial-assembly/src/main/scripts/start_platform.sh +++ b/tutorials/blueprint/tutorial-assembly/src/main/scripts/start_platform.sh @@ -1,4 +1,21 @@ #!/bin/sh +################################################################################ +# +# 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. +################################################################################ scriptDir=`pwd`/`dirname $0` cd "${scriptDir}/../platform" -java -jar osgi-3.5.0.v20090520.jar -console -clean +java -jar org.eclipse.osgi-3.22.0.jar -console -clean diff --git a/tutorials/blueprint/tutorial-modules/greeter-api/pom.xml b/tutorials/blueprint/tutorial-modules/greeter-api/pom.xml index b8eddee89..c589f8864 100644 --- a/tutorials/blueprint/tutorial-modules/greeter-api/pom.xml +++ b/tutorials/blueprint/tutorial-modules/greeter-api/pom.xml @@ -17,18 +17,22 @@ <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";> - <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.aries.tutorials.blueprint</groupId> + <artifactId>blueprint</artifactId> + <version>0.1-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </parent> + <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.aries.tutorials.blueprint</groupId> <artifactId>org.apache.aries.tutorials.blueprint.greeter.api</artifactId> <packaging>bundle</packaging> <name>Greeter API</name> - <version>0.4-SNAPSHOT</version> <description> - This is the API for the greeter service. It has no parent because it - is built outside the tutorial. When the tutorial is assembled the source and binaries + This is the API for the greeter service. It has no parent because it + is built outside the tutorial. When the tutorial is assembled the source and binaries from this project are included the the tutorial zip/tar.gz files. The version is referenced in the tutorial documentation (tutorial-assembly/src/main/docs/instructions.html), so changes to the version number here must be reflected in the documentation. @@ -49,6 +53,4 @@ </plugin> </plugins> </build> - <profiles> - </profiles> </project> diff --git a/tutorials/blueprint/tutorial-modules/greeter-client-blueprint/pom.xml b/tutorials/blueprint/tutorial-modules/greeter-client-blueprint/pom.xml index 34281bc88..dfba8c93b 100644 --- a/tutorials/blueprint/tutorial-modules/greeter-client-blueprint/pom.xml +++ b/tutorials/blueprint/tutorial-modules/greeter-client-blueprint/pom.xml @@ -17,14 +17,17 @@ <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";> + <parent> + <groupId>org.apache.aries.tutorials.blueprint</groupId> + <artifactId>blueprint</artifactId> + <version>0.1-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </parent> <modelVersion>4.0.0</modelVersion> - - <groupId>org.apache.aries.tutorials.blueprint</groupId> <artifactId>org.apache.aries.tutorials.blueprint.greeter.client.blueprint</artifactId> <packaging>bundle</packaging> <name>Greeter Blueprint Client</name> - <version>0.4-SNAPSHOT</version> <description> This is the final client for the greeter service. Students working through the tutorial @@ -35,6 +38,9 @@ so changes to the version number here must be reflected in the documentation. </description> + <properties> + <aries.osgi.private.pkg>org.apache.aries.tutorials.blueprint.greeter.client</aries.osgi.private.pkg> + </properties> <build> <plugins> @@ -56,14 +62,13 @@ <groupId>org.osgi</groupId> <artifactId>org.osgi</artifactId> <version>3.0.0</version> - <type>jar</type> - <scope>compile</scope> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.aries.tutorials.blueprint</groupId> <artifactId>org.apache.aries.tutorials.blueprint.greeter.api</artifactId> - <version>0.4-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> + <scope>provided</scope> </dependency> </dependencies> </project> diff --git a/tutorials/blueprint/tutorial-modules/greeter-client-osgi/pom.xml b/tutorials/blueprint/tutorial-modules/greeter-client-osgi/pom.xml index 4d03374fe..70fde0d9c 100644 --- a/tutorials/blueprint/tutorial-modules/greeter-client-osgi/pom.xml +++ b/tutorials/blueprint/tutorial-modules/greeter-client-osgi/pom.xml @@ -17,14 +17,18 @@ <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";> + <parent> + <groupId>org.apache.aries.tutorials.blueprint</groupId> + <artifactId>blueprint</artifactId> + <version>0.1-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.aries.tutorials.blueprint</groupId> <artifactId>org.apache.aries.tutorials.blueprint.greeter.client.osgi</artifactId> <packaging>bundle</packaging> <name>Greeter OSGi Client</name> - <version>0.4-SNAPSHOT</version> <description> This is the initial client for the greeter service. Students working through the tutorial @@ -55,15 +59,14 @@ <dependency> <groupId>org.apache.aries.tutorials.blueprint</groupId> <artifactId>org.apache.aries.tutorials.blueprint.greeter.api</artifactId> - <version>0.4-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi</artifactId> <version>3.0.0</version> - <type>jar</type> - <scope>compile</scope> + <scope>provided</scope> </dependency> </dependencies> </project> diff --git a/tutorials/blueprint/tutorial-modules/greeter-server-blueprint/pom.xml b/tutorials/blueprint/tutorial-modules/greeter-server-blueprint/pom.xml index 7354cd0b4..36d6f3e8e 100644 --- a/tutorials/blueprint/tutorial-modules/greeter-server-blueprint/pom.xml +++ b/tutorials/blueprint/tutorial-modules/greeter-server-blueprint/pom.xml @@ -17,14 +17,18 @@ <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";> + <parent> + <groupId>org.apache.aries.tutorials.blueprint</groupId> + <artifactId>blueprint</artifactId> + <version>0.1-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.aries.tutorials.blueprint</groupId> <artifactId>org.apache.aries.tutorials.blueprint.greeter.server.blueprint</artifactId> <packaging>bundle</packaging> <name>Greeter Blueprint Server</name> - <version>0.4-SNAPSHOT</version> <description> This is the final greeter service. Students working through the tutorial @@ -54,15 +58,14 @@ <dependency> <groupId>org.apache.aries.tutorials.blueprint</groupId> <artifactId>org.apache.aries.tutorials.blueprint.greeter.api</artifactId> - <version>0.4-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi</artifactId> <version>3.0.0</version> - <type>jar</type> - <scope>compile</scope> + <scope>provided</scope> </dependency> </dependencies> </project> diff --git a/tutorials/blueprint/tutorial-modules/greeter-server-osgi/pom.xml b/tutorials/blueprint/tutorial-modules/greeter-server-osgi/pom.xml index 649a5795e..96166a594 100644 --- a/tutorials/blueprint/tutorial-modules/greeter-server-osgi/pom.xml +++ b/tutorials/blueprint/tutorial-modules/greeter-server-osgi/pom.xml @@ -17,13 +17,17 @@ <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";> + <parent> + <groupId>org.apache.aries.tutorials.blueprint</groupId> + <artifactId>blueprint</artifactId> + <version>0.1-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.aries.tutorials.blueprint</groupId> <artifactId>org.apache.aries.tutorials.blueprint.greeter.server.osgi</artifactId> <packaging>bundle</packaging> <name>Greeter OSGi Server</name> - <version>0.4-SNAPSHOT</version> <description> This is the initial greeter service project. Students working through the tutorial @@ -55,15 +59,14 @@ <dependency> <groupId>org.apache.aries.tutorials.blueprint</groupId> <artifactId>org.apache.aries.tutorials.blueprint.greeter.api</artifactId> - <version>0.4-SNAPSHOT</version> - <scope>compile</scope> + <version>${project.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi</artifactId> <version>3.0.0</version> - <type>jar</type> - <scope>compile</scope> + <scope>provided</scope> </dependency> </dependencies> </project> diff --git a/tutorials/blueprint/tutorial-modules/pom.xml b/tutorials/blueprint/tutorial-modules/pom.xml deleted file mode 100644 index 0884042a2..000000000 --- a/tutorials/blueprint/tutorial-modules/pom.xml +++ /dev/null @@ -1,40 +0,0 @@ -<?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";> - - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.apache.aries.tutorials.blueprint</groupId> - <artifactId>blueprint</artifactId> - <version>0.4-SNAPSHOT</version> - </parent> - - <groupId>org.apache.aries.tutorials.blueprint</groupId> - <artifactId>tutorial-modules</artifactId> - <name>Greeter Modules</name> - <packaging>pom</packaging> - <version>0.4-SNAPSHOT</version> - - <modules> - <module>greeter-api</module> - <module>greeter-client-osgi</module> - <module>greeter-server-osgi</module> - <module>greeter-client-blueprint</module> - <module>greeter-server-blueprint</module> - </modules> -</project> diff --git a/tutorials/pom.xml b/tutorials/pom.xml index dad7762ec..7a5436ab3 100644 --- a/tutorials/pom.xml +++ b/tutorials/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.1.2-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> @@ -41,201 +41,108 @@ </scm> <properties> - <ariesApplicationVersion>0.1-SNAPSHOT</ariesApplicationVersion> - <ariesBlueprintVersion>0.1-SNAPSHOT</ariesBlueprintVersion> - <ariesJmxVersion>0.1-SNAPSHOT</ariesJmxVersion> - <ariesJndiVersion>0.1-SNAPSHOT</ariesJndiVersion> - <ariesJpaVersion>0.1-SNAPSHOT</ariesJpaVersion> - <ariesTransactionVersion>0.1-SNAPSHOT</ariesTransactionVersion> - <ariesUtilVersion>0.1-SNAPSHOT</ariesUtilVersion> - <ariesWebVersion>0.1-SNAPSHOT</ariesWebVersion> + <aries.skip.version.check>true</aries.skip.version.check> + + <jansi.version>1.18</jansi.version> + <jline.version>3.13.2</jline.version> + <org.apache.aries.blueprint.api.version>1.0.1</org.apache.aries.blueprint.api.version> + <org.apache.aries.blueprint.core.version>1.10.3</org.apache.aries.blueprint.core.version> + <org.apache.aries.proxy.version>1.1.14</org.apache.aries.proxy.version> + <org.apache.aries.quiesce.api.version>1.0.0</org.apache.aries.quiesce.api.version> + <org.apache.aries.quiesce.manager.version>1.0.0</org.apache.aries.quiesce.manager.version> + <org.apache.aries.util.version>1.1.3</org.apache.aries.util.version> + <org.apache.felix.fileinstall.version>3.7.4</org.apache.felix.fileinstall.version> + <org.apache.felix.gogo.command.version>1.1.2</org.apache.felix.gogo.command.version> + <org.apache.felix.gogo.jline.version>1.1.8</org.apache.felix.gogo.jline.version> + <org.apache.felix.gogo.runtime.version>1.1.6</org.apache.felix.gogo.runtime.version> + <org.eclipse.equinox.console.version>1.4.800</org.eclipse.equinox.console.version> + <org.eclipse.osgi.version>3.22.0</org.eclipse.osgi.version> + <pax-logging.version>1.11.17</pax-logging.version> </properties> <dependencyManagement> <dependencies> <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.main</artifactId> - <version>2.0.4</version> + <groupId>org.eclipse.platform</groupId> + <artifactId>org.eclipse.osgi</artifactId> + <version>${org.eclipse.osgi.version}</version> </dependency> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.shell</artifactId> - <version>1.4.2</version> + <groupId>org.eclipse.platform</groupId> + <artifactId>org.eclipse.equinox.console</artifactId> + <version>${org.eclipse.equinox.console.version}</version> </dependency> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.shell.tui</artifactId> - <version>1.4.1</version> + <groupId>org.fusesource.jansi</groupId> + <artifactId>jansi</artifactId> + <version>${jansi.version}</version> </dependency> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.eventadmin</artifactId> - <version>1.2.2</version> - </dependency> - <dependency> - <groupId>org.ops4j.pax.web</groupId> - <artifactId>pax-web-extender-war</artifactId> - <version>0.7.2</version> + <groupId>org.jline</groupId> + <artifactId>jline</artifactId> + <version>${jline.version}</version> </dependency> <dependency> - <groupId>org.ops4j.pax.web</groupId> - <artifactId>pax-web-jetty-bundle</artifactId> - <version>0.7.2</version> - </dependency> - <dependency> - <groupId>org.ops4j.pax.web</groupId> - <artifactId>pax-web-jsp</artifactId> - <version>0.7.2</version> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId> - <version>2.0.0</version> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-servlet_2.5_spec</artifactId> - <version>1.2</version> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jsp_2.1_spec</artifactId> - <version>1.0.1</version> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jta_1.1_spec</artifactId> - <version>1.1.1</version> - </dependency> - <!-- - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jpa_1.0_spec</artifactId> - <version>1.1.2</version> - </dependency> - --> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jpa_2.0_spec</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - <version>1.2</version> - </dependency> - <dependency> - <groupId>org.apache.derby</groupId> - <artifactId>derby</artifactId> - <version>10.5.3.0_1</version> - </dependency> - <dependency> - <groupId>org.apache.openjpa</groupId> - <artifactId>openjpa</artifactId> - <version>2.0.0-beta2</version> - </dependency> - <dependency> - <groupId>org.apache.openjpa</groupId> - <artifactId>openjpa-persistence-jdbc</artifactId> - <version>2.0.0-beta2</version> - </dependency> - <dependency> - <groupId>net.sourceforge.serp</groupId> - <artifactId>serp</artifactId> - <version>1.13.1</version> - </dependency> - <!-- bundle version of serp necessary for equinox assembly using openjpa --> - <dependency> - <groupId>org.apache.servicemix.bundles</groupId> - <artifactId>org.apache.servicemix.bundles.serp</artifactId> - <version>1.13.1_2</version> - </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.5</version> - </dependency> - <dependency> - <groupId>commons-pool</groupId> - <artifactId>commons-pool</artifactId> - <version>1.5.4</version> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.gogo.command</artifactId> + <version>${org.apache.felix.gogo.command.version}</version> </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.2.2</version> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.gogo.jline</artifactId> + <version>${org.apache.felix.gogo.jline.version}</version> </dependency> <dependency> - <groupId>org.apache.servicemix.bundles</groupId> - <artifactId>org.apache.servicemix.bundles.cglib</artifactId> - <version>2.1_3_4</version> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.gogo.runtime</artifactId> + <version>${org.apache.felix.gogo.runtime.version}</version> </dependency> + <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.fileinstall</artifactId> - <version>2.0.8</version> + <version>${org.apache.felix.fileinstall.version}</version> </dependency> - - <!-- other aries subproject dependency management --> <dependency> - <groupId>org.apache.aries</groupId> - <artifactId>org.apache.aries.util</artifactId> - <version>${ariesUtilVersion}</version> + <groupId>org.ops4j.pax.logging</groupId> + <artifactId>pax-logging-api</artifactId> + <version>${pax-logging.version}</version> </dependency> <dependency> - <groupId>org.apache.aries.application</groupId> - <artifactId>application</artifactId> - <version>${ariesApplicationVersion}</version> - <type>pom</type> - <scope>import</scope> + <groupId>org.ops4j.pax.logging</groupId> + <artifactId>pax-logging-service</artifactId> + <version>${pax-logging.version}</version> </dependency> <dependency> <groupId>org.apache.aries.blueprint</groupId> - <artifactId>blueprint</artifactId> - <version>${ariesBlueprintVersion}</version> - <type>pom</type> - <scope>import</scope> + <artifactId>org.apache.aries.blueprint.core</artifactId> + <version>${org.apache.aries.blueprint.core.version}</version> </dependency> <dependency> - <groupId>org.apache.aries.jmx</groupId> - <artifactId>jmx</artifactId> - <version>${ariesJmxVersion}</version> - <type>pom</type> - <scope>import</scope> + <groupId>org.apache.aries.blueprint</groupId> + <artifactId>org.apache.aries.blueprint.api</artifactId> + <version>${org.apache.aries.blueprint.api.version}</version> </dependency> <dependency> - <groupId>org.apache.aries.jndi</groupId> - <artifactId>jndi</artifactId> - <version>${ariesJndiVersion}</version> - <type>pom</type> - <scope>import</scope> + <groupId>org.apache.aries</groupId> + <artifactId>org.apache.aries.util</artifactId> + <version>${org.apache.aries.util.version}</version> </dependency> <dependency> - <groupId>org.apache.aries.jpa</groupId> - <artifactId>jpa</artifactId> - <version>${ariesJpaVersion}</version> - <type>pom</type> - <scope>import</scope> + <groupId>org.apache.aries.proxy</groupId> + <artifactId>org.apache.aries.proxy</artifactId> + <version>${org.apache.aries.proxy.version}</version> </dependency> <dependency> - <groupId>org.apache.aries.transaction</groupId> - <artifactId>transaction</artifactId> - <version>${ariesTransactionVersion}</version> - <type>pom</type> - <scope>import</scope> + <groupId>org.apache.aries.quiesce</groupId> + <artifactId>org.apache.aries.quiesce.api</artifactId> + <version>${org.apache.aries.quiesce.api.version}</version> </dependency> <dependency> - <groupId>org.apache.aries.web</groupId> - <artifactId>web</artifactId> - <version>${ariesWebVersion}</version> - <type>pom</type> - <scope>import</scope> + <groupId>org.apache.aries.quiesce</groupId> + <artifactId>org.apache.aries.quiesce.manager</artifactId> + <version>${org.apache.aries.quiesce.manager.version}</version> </dependency> - </dependencies> </dependencyManagement>
