You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by ro...@apache.org on 2021/04/07 15:34:06 UTC
[aries-component-dsl] branch master updated (7cdde98 -> 9efbc64)
This is an automated email from the ASF dual-hosted git repository.
rotty3000 pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/aries-component-dsl.git.
from 7cdde98 Close programs when test finish
new 047d464 github actions and dependabot
new f386277 changelog
new 98dbc2b update bnd plugins
new 949face ignore vscode files
new 9efbc64 update dependencies and simplify integration testing layout
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/dependabot.yaml | 16 +++
.github/workflows/maven.yml | 50 +++++++++
.gitignore | 1 +
.mailmap | 3 +
README.md | 1 +
changelog.md | 206 ++++++++++++++++++++++++++++++++++++
changelog.sh | 105 ++++++++++++++++++
component-dsl/pom.xml | 36 +++----
itests-run/LICENSE | 202 -----------------------------------
itests-run/pom.xml | 126 ----------------------
itests/bnd.bnd | 6 +-
{itests-run => itests}/itest.bndrun | 21 ++--
itests/pom.xml | 78 +++++++++++++-
pom.xml | 44 +++++---
14 files changed, 513 insertions(+), 382 deletions(-)
create mode 100644 .github/dependabot.yaml
create mode 100644 .github/workflows/maven.yml
create mode 100644 .mailmap
create mode 100644 changelog.md
create mode 100755 changelog.sh
delete mode 100644 itests-run/LICENSE
delete mode 100644 itests-run/pom.xml
rename {itests-run => itests}/itest.bndrun (68%)
[aries-component-dsl] 03/05: update bnd plugins
Posted by ro...@apache.org.
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
commit 98dbc2bdf880329884d6dc52e9829058984f3d05
Author: Raymond Augé <ra...@liferay.com>
AuthorDate: Wed Apr 7 10:12:09 2021 -0400
update bnd plugins
Signed-off-by: Raymond Augé <ra...@liferay.com>
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index b75d819..056bb4f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <bnd.version>4.2.0</bnd.version>
+ <bnd.version>5.3.0</bnd.version>
</properties>
<build>
[aries-component-dsl] 02/05: changelog
Posted by ro...@apache.org.
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
commit f386277dbe6e7a9c500c162c210b6c978570da05
Author: Raymond Augé <ra...@liferay.com>
AuthorDate: Wed Apr 7 10:06:01 2021 -0400
changelog
---
.mailmap | 3 +
changelog.md | 206 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
changelog.sh | 105 ++++++++++++++++++++++++++++++
3 files changed, 314 insertions(+)
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..0cc3f41
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,3 @@
+Carlos Sierra Andrés <cs...@gmail.com> <ca...@liferay.com>
+Raymond Augé <ro...@apache.org> <ra...@liferay.com>
+Raymond Augé <ro...@apache.org> <ro...@apache.org>
\ No newline at end of file
diff --git a/changelog.md b/changelog.md
new file mode 100644
index 0000000..6c6b841
--- /dev/null
+++ b/changelog.md
@@ -0,0 +1,206 @@
+## org.apache.aries.component-dsl.parent-1.2.2
+Carlos Sierra Andrés (153):
+ - Initial component-dsl commit [1aac90f]
+ - Use released bnd-maven-plugin version [e1ae411]
+ - Added tests for buildFilterString and add filter only methods [9415dfc]
+ - Classes refactoring and proper type bounds [f2f3e2e]
+ - Move to a submodule [9f56cd7]
+ - new test modules [fd7c137]
+ - Parent pom [a24dde0]
+ - Update to use parent [9c1b157]
+ - Fix wrong null handling [3d32178]
+ - Make OSGiResult AutoCloseable [ef721eb]
+ - More tests [cee5c5f]
+ - Mark as @safeVarArgs [dc42525]
+ - foreach can't be implemented in terms of map [04d0c1a]
+ - Add test to show programmatic dependencies [c17e9b9]
+ - New route primitive to allow more complex implementations [e6453e9]
+ - Source formatting [d6f4ed1]
+ - Test implementation with highest service ranking [8d627f2]
+ - Symetrically signal object deregistration [49b57fb]
+ - Test definition of component-like "programs" [ae8927f]
+ - Correct implementation of distribute [2977c2f]
+ - First attempt to implement Applicative [29565d1]
+ - Suuport the varied ways of register services in OSGi [0c0927f]
+ - Simplify distribute into all [99625dd]
+ - Fix license headers [064fa83]
+ - Fix generic flatMap [1ba2018]
+ - Use release instead of snapshots [308b3d5]
+ - Check for initialization [5b880af]
+ - Close all results even if one fails [974f71d]
+ - Return a Tuple of null instead of a null Tuple [a782892]
+ - Source formatting [c32e22e]
+ - Looks like `all` should combine the results [3da7804]
+ - Optimize flatMap to use ServiceTracker [9785a43]
+ - Abstract flatMap and implement it thread safe [5159b61]
+ - Allow just to be lazy [6c05ace]
+ - Naive join implementation [8a2014f]
+ - Refactor and get Modified to work [073b0dd]
+ - [Component-DSL] Source cleaning [abb9669]
+ - [Component-DSL] Refactor tuples [a33d1ff]
+ - [Component-DSL] Reimplement in terms of service references [d74b9f0]
+ - [Component-DSL] Extract route to a different class [3c4cd58]
+ - [Component-DSL] allow just to generate several values [62f6fa9]
+ - [Component-DSL] Add Synchronized DoublyLinkedList [da47f31]
+ - [Component-DSL] Add related tuples [7f54dae]
+ - [Component-DSL] Reimplement Applicative [c546e61]
+ - [Component-DSL] Add closed status to the tuple [909b771]
+ - [Component-DSL] Reimplement router [c0a8345]
+ - [Component-DSL] Source cleaning [bf8e1f6]
+ - [Component-DSL] Take closed into account [39ecac6]
+ - [Component-DSL] refactor to remove Pipe [33e30d5]
+ - [Component-DSL] Eliminate mutable setter [d886a59]
+ - [Component-DSL] Tuple refactoring [8fd05a2]
+ - [Component-DSL] Remove SentEvent from Tuple [961c017]
+ - [Component-DSL] Adding Probe for tests [68e426e]
+ - [Component-DSL] Add Doug Lea's doubly linked list impl [c2bc4d9]
+ - [Component-DSL] lock free doubly linked list [47d5b0c]
+ - [Component-DSL] Add atomic guards [35c8c23]
+ - [Component-DSL] Reimplement foreach with effects [b52909b]
+ - [Component-DSL] Add concurrency tests [507a85d]
+ - [Component-DSL] Remove unnecessary mutable Tuple [cd4ff48]
+ - [Component-DSL] Change `apply` for `combine` [f7c7b13]
+ - [Component-DSL] As a default ignore modify [1be5b17]
+ - [Component-DSL] Concurrency fixes [1cf9272]
+ - [Component-DSL] No need no check for nulls [b815f8d]
+ - [Component-DSL] Minor source formating [e61465c]
+ - [Component-DSL] Update misleading name [f8f5865]
+ - [Component-DSL] Optimize filter implementation [b39647f]
+ - [Component-DSL] add `once` operation [75da946]
+ - [Component-DSL] Add CachingServiceReference [b0eea34]
+ - [Component-DSL] replaceAll does not allow nulls [13cd064]
+ - [Component-DSL] print stack traces to ease debugging [f04c594]
+ - [Component-DSL] Add refresher interface [9628fb0]
+ - [Component-DSL] Add toString() to CachingServiceReference [f3418b8]
+ - [Component-DSL] Error handling [106ead1]
+ - [Component-DSL] Replace router with transformer [c39c0b0]
+ - [Component-DSL] Add new branching primitives [bd3db02]
+ - [Component-DSL] Implement _highest_ as a primitive [a5b4c1b]
+ - [Component-DSL] Refactor and source formatting [f2b6550]
+ - [Component-DSL] Add effects only producer [534cc7a]
+ - [Component-DSL] Register accepts Supplier [544e88f]
+ - [Component-DSL] Do not capture exceptions [30d9361]
+ - [Component-DSL] Add lifecycle to Publisher [35e1918]
+ - [Component-DSL] Merge all produced elements by default [06a48ed]
+ - [Component-DSL] Source cleaning [08dde34]
+ - [Component-DSL] Make sure resource is not left in working state [6ca4ad9]
+ - [Component-DSL] Implement accumulations using onlyLast [a084613]
+ - [Component-DSL] Tests for accumulations [51cad71]
+ - [Component-DSL] Don't use eager expressions in splitBy [5ecb797]
+ - [Component-DSL] Fix only last publisher [29118f1]
+ - [Component-DSL] Added Effect type [a8986a6]
+ - [Component-DSL] needs a counter to work properly [7909ae6]
+ - [Component-DSL] No need for lifecycle in Publisher [0438737]
+ - [Component-DSL] Retract values in inverse order [c0a65e7]
+ - [Component-DSL] Sent notHighest after highest [64d7e66]
+ - [Component-DSL] cleanup [8e76d8d]
+ - [Component-DSL] Better use explicit comparison [94e5807]
+ - [Component-DSL] Improve toString method [d0e7c30]
+ - [Component-DSL] Javadoc cleanup [6061cfe]
+ - [Component-DSL] Refactor to eliminate OSGiOperationimpl [9b46a28]
+ - [Component-DSL] Refactor [202a658]
+ - [Component-DSL] Support up to arity 26 [0e02d8a]
+ - Remove redundant OSGiOperation [3bcb631]
+ - Do not return impl type [fc454d3]
+ - Make Publisher return OSGiResult to unify [fbebd5c]
+ - Simplify [0599a46]
+ - Change to OSGiRunnable [5c3e80a]
+ - Abstract out to OSGiFactory [df45970]
+ - Move to default methods [cf6b934]
+ - Cleanup [2d2ac74]
+ - Allow lazy predicates [9f52eef]
+ - [Component-DSL] match packages with bundle name [f0d832c]
+ - [Component-DSL] Cleanup [9f6f6ec]
+ - [Component-DSL] Missing license headers [7d48c2c]
+ - [Component-DSL] RAT [db04880]
+ - [Component-DSL] Prepare release [33152b8]
+ - Prepare release [94f8601]
+ - [Component-DSL] Use full component name [64dfa5c]
+ - [Component-DSL] Update SCM [ec54fc6]
+ - [Component-DSL] Prepare release 1.0.0 [1d01c74]
+ - [Component-DSL] Include personal.bnd file [7e7f66f]
+ - [Component-DSL] Improve ProbleImpl [0019d52]
+ - [Component-DSL] Add coalesce function [89c5d1c]
+ - [Component-DSL] Rearrange source [3ed2473]
+ - [Component-DSL] Add baseline support [6b382e1]
+ - [Component-DSL] Use latest bnd [9a80aa0]
+ - [Component-DSL] Bump modules version to 1.1.0 [5282648]
+ - [Component-DSL] Get initial configuration state [0b5afd6]
+ - [Component-DSL] Support update hints [5706e8f]
+ - [Component-DSL] Clean source [49502cf]
+ - [Component-DSL] Add methods to get services from references [b9b85a6]
+ - [Component-DSL] Better support for nested calls [e7e490f]
+ - [ARIES-1811] Always execute onRemoving action [0cd1f0d]
+ - [ARIES-1810] Deprecate onClose [d652192]
+ - [ARIES-1812] Add update support to once [744736a]
+ - [ARIES-1813] Add effects execution places [c76e88e]
+ - [Component-DSL] Bump version [f3d27da]
+ - [Component-DSL] Bump version [2324847]
+ - [Componen-DSL] Fix baseline version [1b6e7bb]
+ - [Component-DSL] missing synchronized [e325ba4]
+ - Add some documentation [b3fcce5]
+ - [Component-DSL] Fix NPE [785fc95]
+ - [Component-DSL] Code cleanup [e7f84b4]
+ - [Component-DSL] Prepare for release [708ce6b]
+ - Add .gitignore [96a9fc0]
+ - Update SCM information [74728e2]
+ - [ARIES-1922] Fix effect handling [866bafa]
+ - [ARIES-1926] UpdateSupport should not reorder effects [a86ab9c]
+ - [ARIES-1930] Consistent error handling [d4a8df9]
+ - [ARIES-1930] Consistent error handling [0e67873]
+ - [ARIES-1930] This should not be execute now [5bd2383]
+ - [ARIES-1930] Consistent error handling [452e4d4]
+ - Source format [e85a373]
+ - Source formatting [936df2f]
+ - Resolver changes [6887995]
+
+Raymond Augé (8):
+ - ARIES-1799 [component-dsl] When registering a service from a Supplier<T> an exception occurs [7d704fe]
+ - fix duplicate scm tag [685accc]
+ - more build cleanup [f053ac5]
+ - add badges [0d42340]
+ - use bundles from MC and correct versions [51aa797]
+ - fix test failures [94a041a]
+ - add deploy profile [345c71e]
+ - modernize project configuration [b089e87]
+
+## org.apache.aries.component-dsl.parent-1.2.1
+Carlos Sierra Andrés (5):
+ - [Component-DSL] missing synchronized [0295b37]
+ - Add some documentation [bbc508c]
+ - [Component-DSL] Fix NPE [b9a1b59]
+ - [Component-DSL] Code cleanup [a9d7c2b]
+ - [Component-DSL] Prepare for release [7d3e3b4]
+
+## org.apache.aries.component-dsl.parent-1.2.0
+Carlos Sierra Andrés (7):
+ - [ARIES-1811] Always execute onRemoving action [7613c8a]
+ - [ARIES-1810] Deprecate onClose [dfad657]
+ - [ARIES-1812] Add update support to once [8c0dddc]
+ - [ARIES-1813] Add effects execution places [0a0aba1]
+ - [Component-DSL] Bump version [5d641f0]
+ - [Component-DSL] Bump version [9e8dfb2]
+ - [Componen-DSL] Fix baseline version [e52afa6]
+
+## org.apache.aries.component-dsl.parent-1.1.0
+Carlos Sierra Andrés (12):
+ - [Component-DSL] Include personal.bnd file [cba7967]
+ - [Component-DSL] Improve ProbleImpl [4ac3f9c]
+ - [Component-DSL] Add coalesce function [2d3eb01]
+ - [Component-DSL] Rearrange source [d64c641]
+ - [Component-DSL] Add baseline support [71dee33]
+ - [Component-DSL] Use latest bnd [656da97]
+ - [Component-DSL] Bump modules version to 1.1.0 [3edd16d]
+ - [Component-DSL] Get initial configuration state [d98b244]
+ - [Component-DSL] Support update hints [57dd372]
+ - [Component-DSL] Clean source [9586cf6]
+ - [Component-DSL] Add methods to get services from references [f7027ee]
+ - [Component-DSL] Better support for nested calls [e8b2821]
+
+Raymond Augé (1):
+ - ARIES-1799 [component-dsl] When registering a service from a Supplier<T> an exception occurs [1d862ba]
+
+## org.apache.aries.component-dsl.parent-1.0.0
+Carlos Sierra Andrés (1):
+ - [Component-DSL] Prepare release 1.0.0 [08fb613]
+
diff --git a/changelog.sh b/changelog.sh
new file mode 100755
index 0000000..12c5743
--- /dev/null
+++ b/changelog.sh
@@ -0,0 +1,105 @@
+#!/bin/bash
+# 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.
+
+###############################################################################
+# In most cases just execute ./changelog.sh should suffice.
+#
+# To tune commiter names/remove dups, adjust the .mailmap file
+# (see https://git-scm.com/docs/gitmailmap)
+###############################################################################
+
+TAG_SEARCH=
+WORK_DIR=.
+CHANGELOG=${WORK_DIR}/changelog.md
+
+###############################################################################
+############# Do not edit below ###############################################
+###############################################################################
+
+# collect all the tags that match our pattern and reverse the order
+ALL_TAGS=( $(git tag -l $TAG_SEARCH | xargs -n 1 | tac) )
+PREVIOUS_TAG="${ALL_TAGS[0]}"
+TAGS=${ALL_TAGS[@]:1}
+
+if [ -f $CHANGELOG ]; then
+ UPDATE=$PREVIOUS_TAG
+fi
+
+while (( "$#" )); do
+ case "$1" in
+ -u|--update-changelog)
+ if [ -n "$2" ] && [ ${2:0:1} != "-" ]; then
+ UPDATE=$2
+ shift 2
+ else
+ echo "Error: Tag for $1 is missing" >&2
+ exit 1
+ fi
+ ;;
+ -*|--*=) # unsupported flags
+ echo "Error: Unsupported flag $1" >&2
+ exit 1
+ ;;
+ *) # preserve positional arguments
+ shift
+ ;;
+ esac
+done
+
+if [ -v UPDATE ]; then
+ printf "Updating $CHANGELOG\n"
+ # update the file if asked (appends to head of file)
+
+ # read the first tag in the existing changelog
+ line=$(head -n 1 $CHANGELOG)
+ TAGS=("${line#\#\# }")
+
+ # set the previous tag to the passed argument
+ PREVIOUS_TAG=$UPDATE
+ printf "Collecting changes from $TAGS to $PREVIOUS_TAG\n"
+
+ # swap the changelog for a temp file
+ ORIGINAL_FILE=$CHANGELOG
+ CHANGELOG="$CHANGELOG.tmp"
+else
+ printf "Creating $CHANGELOG\n"
+fi
+
+# create the file if it doesn't exist
+printf "" > $CHANGELOG
+
+# write the changelog
+for tag in $TAGS; do
+ RESULT=$(git --no-pager shortlog --no-merges --grep 'maven-release-plugin' --invert-grep --format="- %s [%h]" -w0,2 -nc $tag..$PREVIOUS_TAG $WORK_DIR)
+
+ if [[ ! -z "${RESULT// }" ]]; then
+ echo "## $PREVIOUS_TAG" >> $CHANGELOG
+ echo "$RESULT" >> $CHANGELOG
+ echo "" >> $CHANGELOG
+ fi
+
+ PREVIOUS_TAG=$tag
+done
+
+if [ -v UPDATE ]; then
+ # append the changelog to the end of temp
+ cat $ORIGINAL_FILE >> $CHANGELOG
+
+ # move the changelog temp over the changelog
+ mv -f $CHANGELOG $ORIGINAL_FILE
+fi
[aries-component-dsl] 01/05: github actions and dependabot
Posted by ro...@apache.org.
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
commit 047d4646bcd451652efa311d756d28248be93526
Author: Raymond Augé <ra...@liferay.com>
AuthorDate: Wed Apr 7 09:46:06 2021 -0400
github actions and dependabot
Signed-off-by: Raymond Augé <ra...@liferay.com>
---
.github/dependabot.yaml | 16 +++++++++++++++
.github/workflows/maven.yml | 50 +++++++++++++++++++++++++++++++++++++++++++++
README.md | 1 +
3 files changed, 67 insertions(+)
diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml
new file mode 100644
index 0000000..4fd5944
--- /dev/null
+++ b/.github/dependabot.yaml
@@ -0,0 +1,16 @@
+# GitHub Dependabot configuration file
+
+version: 2
+updates:
+
+ # Maintain dependencies for GitHub Actions
+ - package-ecosystem: "github-actions"
+ directory: "/"
+ schedule:
+ interval: "daily"
+
+ # Maintain dependencies for maven
+ - package-ecosystem: "maven"
+ directory: "/"
+ schedule:
+ interval: "daily"
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
new file mode 100644
index 0000000..0ea546b
--- /dev/null
+++ b/.github/workflows/maven.yml
@@ -0,0 +1,50 @@
+# 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: CI Build
+
+on:
+ push:
+ # Sequence of patterns matched against refs/heads
+ branches-ignore:
+ # Push events to branches matching refs/heads/dependabot/**
+ - 'dependabot/**'
+ pull_request:
+
+env:
+ LC_ALL: en_US.UTF-8
+
+jobs:
+ JDKxx_Matrix:
+ strategy:
+ matrix:
+ java: [ 8, 11, 16, 17-ea ]
+ os: [ ubuntu-latest ]
+ include:
+ - os: windows-latest
+ java: 8
+ name: JDK${{ matrix.java }} ${{ matrix.os }}
+ runs-on: ${{ matrix.os }}
+ steps:
+ - name: Git Checkout
+ uses: actions/checkout@v2
+ - name: Set up Java
+ uses: actions/setup-java@v2
+ with:
+ distribution: 'zulu'
+ check-latest: ${{ endsWith(matrix.java, '-ea') }}
+ java-version: ${{ matrix.java }}
+ - name: Build
+ continue-on-error: ${{contains(matrix.java, '-ea')}}
+ shell: bash
+ run: |
+ mvn -U -e -B -ntp install
diff --git a/README.md b/README.md
index 5da8247..958159c 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
# osgi-component-dsl
[](https://builds.apache.org/job/Aries-component-dsl-master)
+[](https://github.com/rotty3000/aries-component-dsl/actions/workflows/maven.yml)
[](https://search.maven.org/search?q=g:%22org.apache.aries.component-dsl%22%20AND%20a:%22org.apache.aries.component-dsl.component-dsl%22)
A lightweight functional DSL to interact with OSGi registry.
[aries-component-dsl] 05/05: update dependencies and simplify
integration testing layout
Posted by ro...@apache.org.
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
commit 9efbc6411b385636bcb4b6c816006747f51417a1
Author: Raymond Augé <ra...@liferay.com>
AuthorDate: Wed Apr 7 10:28:35 2021 -0400
update dependencies and simplify integration testing layout
Signed-off-by: Raymond Augé <ra...@liferay.com>
---
component-dsl/pom.xml | 36 +++----
itests-run/LICENSE | 202 ------------------------------------
itests-run/pom.xml | 126 ----------------------
itests/bnd.bnd | 6 +-
{itests-run => itests}/itest.bndrun | 21 ++--
itests/pom.xml | 78 +++++++++++++-
pom.xml | 42 +++++---
7 files changed, 130 insertions(+), 381 deletions(-)
diff --git a/component-dsl/pom.xml b/component-dsl/pom.xml
index 6793bcc..e3c21ea 100644
--- a/component-dsl/pom.xml
+++ b/component-dsl/pom.xml
@@ -29,28 +29,11 @@
<artifactId>org.apache.aries.component-dsl.component-dsl</artifactId>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.8</source>
- <target>1.8</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
</plugin>
<plugin>
<groupId>biz.aQute.bnd</groupId>
@@ -87,9 +70,22 @@
<dependencies>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.service.cm</artifactId>
- <version>1.6.0</version>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.13.2</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest</artifactId>
+ <version>2.2</version>
+ <scope>test</scope>
</dependency>
</dependencies>
diff --git a/itests-run/LICENSE b/itests-run/LICENSE
deleted file mode 100644
index d645695..0000000
--- a/itests-run/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- 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.
diff --git a/itests-run/pom.xml b/itests-run/pom.xml
deleted file mode 100644
index d459684..0000000
--- a/itests-run/pom.xml
+++ /dev/null
@@ -1,126 +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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.aries.component-dsl</groupId>
- <artifactId>org.apache.aries.component-dsl.parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <relativePath>..</relativePath>
- </parent>
-
- <artifactId>org.apache.aries.component-dsl.itests-run</artifactId>
- <description>Apache Aries Component DSL Integration Test Plan</description>
- <name>Apache Aries Component DSL Integration Test Plan</name>
- <packaging>pom</packaging>
-
- <build>
- <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>
- <failOnChanges>false</failOnChanges>
- <resolve>false</resolve>
- <bndruns>
- <bndrun>itest.bndrun</bndrun>
- </bndruns>
- <targetDir>.</targetDir>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>testing</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>org.apache.aries.component-dsl</groupId>
- <artifactId>org.apache.aries.component-dsl.itests</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.component-dsl</groupId>
- <artifactId>org.apache.aries.component-dsl.component-dsl</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.configadmin</artifactId>
- <version>1.9.14</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.platform</groupId>
- <artifactId>org.eclipse.osgi</artifactId>
- <version>3.12.0</version>
- </dependency>
- <dependency>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>biz.aQute.tester</artifactId>
- <version>${bnd.version}</version>
- </dependency>
- <dependency>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>biz.aQute.launcher</artifactId>
- <version>${bnd.version}</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.enroute.junit.wrapper</artifactId>
- <version>4.12.0</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.enroute.hamcrest.wrapper</artifactId>
- <version>1.3.0</version>
- </dependency>
- </dependencies>
-
- <scm>
- <connection>scm:git:git@github.com:apache/aries-component-dsl.git</connection>
- <developerConnection>scm:git:git@github.com:apache/aries-component-dsl.git</developerConnection>
- <url>https://github.com/apache/aries-component-dsl</url>
- <tag>HEAD</tag>
- </scm>
-
-</project>
\ No newline at end of file
diff --git a/itests/bnd.bnd b/itests/bnd.bnd
index 602ee7f..c7e846e 100644
--- a/itests/bnd.bnd
+++ b/itests/bnd.bnd
@@ -17,9 +17,7 @@
Bundle-Description: Integration Test bundle for component DSL
-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,\
+-includepackage:\
+ org.apache.aries.component.dsl.*;-split-package:=merge-first
Test-Cases: ${classes;CONCRETE;ANNOTATED;org.junit.Test}
diff --git a/itests-run/itest.bndrun b/itests/itest.bndrun
similarity index 68%
rename from itests-run/itest.bndrun
rename to itests/itest.bndrun
index a200c08..7d2d17d 100644
--- a/itests-run/itest.bndrun
+++ b/itests/itest.bndrun
@@ -15,24 +15,21 @@
# specific language governing permissions and limitations
# under the License.
--runrequires: \
- osgi.identity;filter:='(osgi.identity=org.apache.aries.component-dsl.itests)'
+#-runtrace: true
+#-runjdb: 8000
-runfw: org.eclipse.osgi
-#-runtrace: true
-
--runee: JavaSE-1.8
-resolve.effective: resolve, active
--runsystempackages.eqnx: javax.script
--runsystemcapabilities.dflt: ${native_capability}
--runproperties:
+# Keep resolution results in sorted order for better diff
+-runstartlevel: \
+ order=sortbynameversion,\
+ begin=-1
+
-runbundles: \
- org.apache.servicemix.bundles.junit;version='[4.12.0,4.12.1)',\
- org.apache.felix.configadmin;version='[1.9.14,1.9.15)',\
- org.osgi.service.cm;version='[1.6.0,1.6.1)',\
org.apache.aries.component-dsl.itests;version='[2.0.0,2.0.1)',\
- org.apache.aries.component-dsl.component-dsl;version='[2.0.0,2.0.1)'
+ org.apache.felix.configadmin;version='[1.9.20,1.9.21)',\
+ org.apache.servicemix.bundles.junit;version='[4.13.2,4.13.3)'
-include: -personal.bnd
diff --git a/itests/pom.xml b/itests/pom.xml
index 5ee3a3a..b31c70c 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -33,15 +33,87 @@
<dependency>
<groupId>org.apache.aries.component-dsl</groupId>
<artifactId>org.apache.aries.component-dsl.component-dsl</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.junit</artifactId>
+ <version>4.13.2_1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.configadmin</artifactId>
+ <version>1.9.20</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.platform</groupId>
+ <artifactId>org.eclipse.osgi</artifactId>
+ <version>3.16.200</version>
+ <scope>runtime</scope>
</dependency>
</dependencies>
+ <build>
+ <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>
+ <scopes>
+ <scope>compile</scope>
+ <scope>runtime</scope>
+ <scope>test</scope>
+ </scopes>
+ </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>
+ <failOnChanges>false</failOnChanges>
+ <resolve>false</resolve>
+ <bndruns>
+ <bndrun>itest.bndrun</bndrun>
+ </bndruns>
+ <scopes>
+ <scope>compile</scope>
+ <scope>runtime</scope>
+ <scope>test</scope>
+ </scopes>
+ <targetDir>.</targetDir>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>testing</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
<scm>
<connection>scm:git:git@github.com:apache/aries-component-dsl.git</connection>
<developerConnection>scm:git:git@github.com:apache/aries-component-dsl.git</developerConnection>
<url>https://github.com/apache/aries-component-dsl</url>
- <tag>HEAD</tag>
- </scm>
+ <tag>HEAD</tag>
+ </scm>
</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 056bb4f..800b89a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,12 +27,16 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>21</version>
+ <version>23</version>
<relativePath />
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <java.build.version>1.8</java.build.version>
+ <maven.compiler.source>${java.build.version}</maven.compiler.source>
+ <maven.compiler.target>${java.build.version}</maven.compiler.target>
+
<bnd.version>5.3.0</bnd.version>
</properties>
@@ -41,16 +45,12 @@
<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>
- </configuration>
+ <version>3.8.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>3.0.1</version>
+ <version>3.2.0</version>
<configuration>
<archive>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
@@ -76,28 +76,42 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.annotation</artifactId>
- <version>7.0.0</version>
+ <version>8.0.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <version>6.0.0</version>
+ <artifactId>org.osgi.service.cm</artifactId>
+ <version>1.6.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.core</artifactId>
+ <version>6.0.0</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
<modules>
<module>component-dsl</module>
<module>itests</module>
- <module>itests-run</module>
</modules>
<profiles>
<profile>
+ <id>java-release-9+</id>
+ <activation>
+ <jdk>[9,)</jdk>
+ </activation>
+ <properties>
+ <java.build.version>${java.specification.version}</java.build.version>
+ <maven.compiler.release>${java.build.version}</maven.compiler.release>
+ <maven.compiler.source>${java.build.version}</maven.compiler.source>
+ <maven.compiler.target>${java.build.version}</maven.compiler.target>
+ </properties>
+ </profile>
+ <profile>
<id>deploy</id>
<build>
<plugins>
[aries-component-dsl] 04/05: ignore vscode files
Posted by ro...@apache.org.
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
commit 949face8e7a3e56046e85abcf83a19d46a657e50
Author: Raymond Augé <ra...@liferay.com>
AuthorDate: Wed Apr 7 10:12:34 2021 -0400
ignore vscode files
Signed-off-by: Raymond Augé <ra...@liferay.com>
---
.gitignore | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitignore b/.gitignore
index 7081da0..1ba9cbe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
.classpath
.project
.settings/
+.vscode/
*/bin/
**/build/
**/generated/