diff --git a/.github/scripts/ci-publish.sh b/.github/scripts/ci-publish.sh index f3d7612be7..c2d44329d6 100755 --- a/.github/scripts/ci-publish.sh +++ b/.github/scripts/ci-publish.sh @@ -40,4 +40,4 @@ if [[ -n "${SONATYPE_BEARER:-}" ]]; then SONATYPE_OPTS="${SONATYPE_OPTS} --snapshot" fi ./.github/scripts/sonatype-upload.sh ${SONATYPE_OPTS} dist/bundles -fi +fi \ No newline at end of file diff --git a/.github/scripts/codeql-build.sh b/.github/scripts/codeql-build.sh index 64fe0d44c3..5367812062 100755 --- a/.github/scripts/codeql-build.sh +++ b/.github/scripts/codeql-build.sh @@ -4,4 +4,4 @@ set -ev ./mvnw --version ./gradlew --no-daemon -Dmaven.repo.local=dist/m2 --continue testClasses :dist:jarDependencies "$@" ./gradlew --no-daemon -Dmaven.repo.local=dist/m2 --continue :gradle-plugins:testClasses -./mvnw -Dmaven.repo.local=dist/m2 --batch-mode --no-transfer-progress test-compile +./mvnw -Dmaven.repo.local=dist/m2 --batch-mode --no-transfer-progress test-compile \ No newline at end of file diff --git a/.gitignore b/.gitignore index 0623caf0cf..45c9213ce9 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,6 @@ Archive target/ *.code-workspace bndtools.test/workspace/ +_log/ +.polyglot* +.tycho* diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml new file mode 100644 index 0000000000..cb6e0d7535 --- /dev/null +++ b/.mvn/extensions.xml @@ -0,0 +1,8 @@ + + + + org.eclipse.tycho + tycho-build + ${tycho-version} + + \ No newline at end of file diff --git a/.mvn/maven.config b/.mvn/maven.config new file mode 100644 index 0000000000..a3c944e4cc --- /dev/null +++ b/.mvn/maven.config @@ -0,0 +1 @@ +-Dtycho-version=5.0.2 \ No newline at end of file diff --git a/cnf/pom.xml b/cnf/pom.xml new file mode 100644 index 0000000000..267f236f13 --- /dev/null +++ b/cnf/pom.xml @@ -0,0 +1,36 @@ + + + 4.0.0 + biz.aQute.bnd + configurator + 1.0.0-SNAPSHOT + pom + + + + + + + + + + + file-activation-example + + + someFile + + + + + + + + + + + ../maven-plugins + + \ No newline at end of file diff --git a/pom.xml b/pom.xml deleted file mode 100644 index c93df9181d..0000000000 --- a/pom.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - 4.0.0 - - biz.aQute.bnd - maven - 1.0.0 - Reactor to build the Maven projects. - Bnd Maven Reactor - pom - - - UTF-8 - true - true - - - - maven-plugins - -