diff --git a/maven/bnd-baseline-maven-plugin/.settings/org.eclipse.core.resources.prefs b/maven/bnd-baseline-maven-plugin/.settings/org.eclipse.core.resources.prefs index c86ef73191..e9441bb123 100644 --- a/maven/bnd-baseline-maven-plugin/.settings/org.eclipse.core.resources.prefs +++ b/maven/bnd-baseline-maven-plugin/.settings/org.eclipse.core.resources.prefs @@ -1,4 +1,3 @@ eclipse.preferences.version=1 encoding//src/main/java=UTF-8 -encoding//src/test/resources=UTF-8 encoding/=UTF-8 diff --git a/maven/bnd-run-maven-plugin/src/it/test/invoker.properties b/maven/bnd-baseline-maven-plugin/src/it/help/invoker.properties similarity index 80% rename from maven/bnd-run-maven-plugin/src/it/test/invoker.properties rename to maven/bnd-baseline-maven-plugin/src/it/help/invoker.properties index f67e03aea5..9c7a7746f7 100644 --- a/maven/bnd-run-maven-plugin/src/it/test/invoker.properties +++ b/maven/bnd-baseline-maven-plugin/src/it/help/invoker.properties @@ -1,4 +1,4 @@ -invoker.goals=--no-transfer-progress install bnd-run:run +invoker.goals=--no-transfer-progress package # Run mvn with --debug for debug logging #invoker.debug=true diff --git a/maven/bnd-baseline-maven-plugin/src/it/help/pom.xml b/maven/bnd-baseline-maven-plugin/src/it/help/pom.xml new file mode 100644 index 0000000000..715e3ba714 --- /dev/null +++ b/maven/bnd-baseline-maven-plugin/src/it/help/pom.xml @@ -0,0 +1,28 @@ + + 4.0.0 + biz.aQute.bnd-test + help + 0.0.1 + pom + + + + + biz.aQute.bnd + bnd-baseline-maven-plugin + ${bnd.version} + + + help + package + + help + + + + + + + diff --git a/maven/bnd-export-maven-plugin/.settings/org.eclipse.core.resources.prefs b/maven/bnd-export-maven-plugin/.settings/org.eclipse.core.resources.prefs index 29abf99956..839d647eef 100644 --- a/maven/bnd-export-maven-plugin/.settings/org.eclipse.core.resources.prefs +++ b/maven/bnd-export-maven-plugin/.settings/org.eclipse.core.resources.prefs @@ -2,5 +2,4 @@ eclipse.preferences.version=1 encoding//src/main/java=UTF-8 encoding//src/main/resources=UTF-8 encoding//src/test/java=UTF-8 -encoding//src/test/resources=UTF-8 encoding/=UTF-8 diff --git a/maven/bnd-export-maven-plugin/src/it/help/invoker.properties b/maven/bnd-export-maven-plugin/src/it/help/invoker.properties new file mode 100644 index 0000000000..9c7a7746f7 --- /dev/null +++ b/maven/bnd-export-maven-plugin/src/it/help/invoker.properties @@ -0,0 +1,7 @@ +invoker.goals=--no-transfer-progress package + +# Run mvn with --debug for debug logging +#invoker.debug=true + +# Run mvn in debugging mode and wait for a debugger to attach +#invoker.environmentVariables.MAVEN_DEBUG_OPTS=-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8000 diff --git a/maven/bnd-export-maven-plugin/src/it/help/pom.xml b/maven/bnd-export-maven-plugin/src/it/help/pom.xml new file mode 100644 index 0000000000..605d0bfdc9 --- /dev/null +++ b/maven/bnd-export-maven-plugin/src/it/help/pom.xml @@ -0,0 +1,28 @@ + + 4.0.0 + biz.aQute.bnd-test + help + 0.0.1 + pom + + + + + biz.aQute.bnd + bnd-export-maven-plugin + ${bnd.version} + + + help + package + + help + + + + + + + diff --git a/maven/bnd-indexer-maven-plugin/src/it/help/invoker.properties b/maven/bnd-indexer-maven-plugin/src/it/help/invoker.properties new file mode 100644 index 0000000000..9c7a7746f7 --- /dev/null +++ b/maven/bnd-indexer-maven-plugin/src/it/help/invoker.properties @@ -0,0 +1,7 @@ +invoker.goals=--no-transfer-progress package + +# Run mvn with --debug for debug logging +#invoker.debug=true + +# Run mvn in debugging mode and wait for a debugger to attach +#invoker.environmentVariables.MAVEN_DEBUG_OPTS=-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8000 diff --git a/maven/bnd-indexer-maven-plugin/src/it/help/pom.xml b/maven/bnd-indexer-maven-plugin/src/it/help/pom.xml new file mode 100644 index 0000000000..a1486eba5f --- /dev/null +++ b/maven/bnd-indexer-maven-plugin/src/it/help/pom.xml @@ -0,0 +1,28 @@ + + 4.0.0 + biz.aQute.bnd-test + help + 0.0.1 + pom + + + + + biz.aQute.bnd + bnd-indexer-maven-plugin + ${bnd.version} + + + help + package + + help + + + + + + + diff --git a/maven/bnd-maven-plugin/.settings/org.eclipse.core.resources.prefs b/maven/bnd-maven-plugin/.settings/org.eclipse.core.resources.prefs index 989609020a..abdea9ac03 100644 --- a/maven/bnd-maven-plugin/.settings/org.eclipse.core.resources.prefs +++ b/maven/bnd-maven-plugin/.settings/org.eclipse.core.resources.prefs @@ -1,5 +1,4 @@ eclipse.preferences.version=1 encoding//src/main/java=UTF-8 encoding//src/main/resources=UTF-8 -encoding//src/test/resources=UTF-8 encoding/=UTF-8 diff --git a/maven/bnd-maven-plugin/src/it/help/invoker.properties b/maven/bnd-maven-plugin/src/it/help/invoker.properties new file mode 100644 index 0000000000..9c7a7746f7 --- /dev/null +++ b/maven/bnd-maven-plugin/src/it/help/invoker.properties @@ -0,0 +1,7 @@ +invoker.goals=--no-transfer-progress package + +# Run mvn with --debug for debug logging +#invoker.debug=true + +# Run mvn in debugging mode and wait for a debugger to attach +#invoker.environmentVariables.MAVEN_DEBUG_OPTS=-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8000 diff --git a/maven/bnd-maven-plugin/src/it/help/pom.xml b/maven/bnd-maven-plugin/src/it/help/pom.xml new file mode 100644 index 0000000000..c11301f25d --- /dev/null +++ b/maven/bnd-maven-plugin/src/it/help/pom.xml @@ -0,0 +1,28 @@ + + 4.0.0 + biz.aQute.bnd-test + help + 0.0.1 + pom + + + + + biz.aQute.bnd + bnd-maven-plugin + ${bnd.version} + + + help + package + + help + + + + + + + diff --git a/maven/bnd-reporter-maven-plugin/src/it/help/invoker.properties b/maven/bnd-reporter-maven-plugin/src/it/help/invoker.properties new file mode 100644 index 0000000000..9c7a7746f7 --- /dev/null +++ b/maven/bnd-reporter-maven-plugin/src/it/help/invoker.properties @@ -0,0 +1,7 @@ +invoker.goals=--no-transfer-progress package + +# Run mvn with --debug for debug logging +#invoker.debug=true + +# Run mvn in debugging mode and wait for a debugger to attach +#invoker.environmentVariables.MAVEN_DEBUG_OPTS=-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8000 diff --git a/maven/bnd-reporter-maven-plugin/src/it/help/pom.xml b/maven/bnd-reporter-maven-plugin/src/it/help/pom.xml new file mode 100644 index 0000000000..6999f6e74f --- /dev/null +++ b/maven/bnd-reporter-maven-plugin/src/it/help/pom.xml @@ -0,0 +1,28 @@ + + 4.0.0 + biz.aQute.bnd-test + help + 0.0.1 + pom + + + + + biz.aQute.bnd + bnd-reporter-maven-plugin + ${bnd.version} + + + help + package + + help + + + + + + + diff --git a/maven/bnd-resolver-maven-plugin/.settings/org.eclipse.core.resources.prefs b/maven/bnd-resolver-maven-plugin/.settings/org.eclipse.core.resources.prefs index c86ef73191..e9441bb123 100644 --- a/maven/bnd-resolver-maven-plugin/.settings/org.eclipse.core.resources.prefs +++ b/maven/bnd-resolver-maven-plugin/.settings/org.eclipse.core.resources.prefs @@ -1,4 +1,3 @@ eclipse.preferences.version=1 encoding//src/main/java=UTF-8 -encoding//src/test/resources=UTF-8 encoding/=UTF-8 diff --git a/maven/bnd-resolver-maven-plugin/src/it/help/invoker.properties b/maven/bnd-resolver-maven-plugin/src/it/help/invoker.properties new file mode 100644 index 0000000000..9c7a7746f7 --- /dev/null +++ b/maven/bnd-resolver-maven-plugin/src/it/help/invoker.properties @@ -0,0 +1,7 @@ +invoker.goals=--no-transfer-progress package + +# Run mvn with --debug for debug logging +#invoker.debug=true + +# Run mvn in debugging mode and wait for a debugger to attach +#invoker.environmentVariables.MAVEN_DEBUG_OPTS=-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8000 diff --git a/maven/bnd-resolver-maven-plugin/src/it/help/pom.xml b/maven/bnd-resolver-maven-plugin/src/it/help/pom.xml new file mode 100644 index 0000000000..669c3101e5 --- /dev/null +++ b/maven/bnd-resolver-maven-plugin/src/it/help/pom.xml @@ -0,0 +1,28 @@ + + 4.0.0 + biz.aQute.bnd-test + help + 0.0.1 + pom + + + + + biz.aQute.bnd + bnd-resolver-maven-plugin + ${bnd.version} + + + help + package + + help + + + + + + + diff --git a/maven/bnd-run-maven-plugin/.settings/org.eclipse.core.resources.prefs b/maven/bnd-run-maven-plugin/.settings/org.eclipse.core.resources.prefs index 29abf99956..839d647eef 100644 --- a/maven/bnd-run-maven-plugin/.settings/org.eclipse.core.resources.prefs +++ b/maven/bnd-run-maven-plugin/.settings/org.eclipse.core.resources.prefs @@ -2,5 +2,4 @@ eclipse.preferences.version=1 encoding//src/main/java=UTF-8 encoding//src/main/resources=UTF-8 encoding//src/test/java=UTF-8 -encoding//src/test/resources=UTF-8 encoding/=UTF-8 diff --git a/maven/bnd-run-maven-plugin/src/it/help/invoker.properties b/maven/bnd-run-maven-plugin/src/it/help/invoker.properties new file mode 100644 index 0000000000..9c7a7746f7 --- /dev/null +++ b/maven/bnd-run-maven-plugin/src/it/help/invoker.properties @@ -0,0 +1,7 @@ +invoker.goals=--no-transfer-progress package + +# Run mvn with --debug for debug logging +#invoker.debug=true + +# Run mvn in debugging mode and wait for a debugger to attach +#invoker.environmentVariables.MAVEN_DEBUG_OPTS=-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8000 diff --git a/maven/bnd-run-maven-plugin/src/it/help/pom.xml b/maven/bnd-run-maven-plugin/src/it/help/pom.xml new file mode 100644 index 0000000000..2f5057c371 --- /dev/null +++ b/maven/bnd-run-maven-plugin/src/it/help/pom.xml @@ -0,0 +1,28 @@ + + 4.0.0 + biz.aQute.bnd-test + help + 0.0.1 + pom + + + + + biz.aQute.bnd + bnd-run-maven-plugin + ${bnd.version} + + + help + package + + help + + + + + + + diff --git a/maven/bnd-run-maven-plugin/src/it/run-test/invoker.properties b/maven/bnd-run-maven-plugin/src/it/run-test/invoker.properties new file mode 100644 index 0000000000..738c6a6616 --- /dev/null +++ b/maven/bnd-run-maven-plugin/src/it/run-test/invoker.properties @@ -0,0 +1,7 @@ +invoker.goals=--no-transfer-progress package bnd-run:run + +# Run mvn with --debug for debug logging +#invoker.debug=true + +# Run mvn in debugging mode and wait for a debugger to attach +#invoker.environmentVariables.MAVEN_DEBUG_OPTS=-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8000 diff --git a/maven/bnd-run-maven-plugin/src/it/test/pom.xml b/maven/bnd-run-maven-plugin/src/it/run-test/pom.xml similarity index 100% rename from maven/bnd-run-maven-plugin/src/it/test/pom.xml rename to maven/bnd-run-maven-plugin/src/it/run-test/pom.xml diff --git a/maven/bnd-run-maven-plugin/src/it/test/postbuild.groovy b/maven/bnd-run-maven-plugin/src/it/run-test/postbuild.groovy similarity index 82% rename from maven/bnd-run-maven-plugin/src/it/test/postbuild.groovy rename to maven/bnd-run-maven-plugin/src/it/run-test/postbuild.groovy index b25784a08f..ea39ee78dd 100644 --- a/maven/bnd-run-maven-plugin/src/it/test/postbuild.groovy +++ b/maven/bnd-run-maven-plugin/src/it/run-test/postbuild.groovy @@ -1,8 +1,5 @@ -import java.io.*; import java.util.regex.Pattern -println "basedir ${basedir}" - File build_log_file = new File("${basedir}/build.log") assert build_log_file.exists(); def build_log = build_log_file.text diff --git a/maven/bnd-run-maven-plugin/src/it/test/src/main/java/run/Activator.java b/maven/bnd-run-maven-plugin/src/it/run-test/src/main/java/run/Activator.java similarity index 100% rename from maven/bnd-run-maven-plugin/src/it/test/src/main/java/run/Activator.java rename to maven/bnd-run-maven-plugin/src/it/run-test/src/main/java/run/Activator.java diff --git a/maven/bnd-run-maven-plugin/src/it/test/test.bndrun b/maven/bnd-run-maven-plugin/src/it/run-test/test.bndrun similarity index 100% rename from maven/bnd-run-maven-plugin/src/it/test/test.bndrun rename to maven/bnd-run-maven-plugin/src/it/run-test/test.bndrun diff --git a/maven/bnd-testing-maven-plugin/.settings/org.eclipse.core.resources.prefs b/maven/bnd-testing-maven-plugin/.settings/org.eclipse.core.resources.prefs index 29abf99956..839d647eef 100644 --- a/maven/bnd-testing-maven-plugin/.settings/org.eclipse.core.resources.prefs +++ b/maven/bnd-testing-maven-plugin/.settings/org.eclipse.core.resources.prefs @@ -2,5 +2,4 @@ eclipse.preferences.version=1 encoding//src/main/java=UTF-8 encoding//src/main/resources=UTF-8 encoding//src/test/java=UTF-8 -encoding//src/test/resources=UTF-8 encoding/=UTF-8 diff --git a/maven/bnd-testing-maven-plugin/src/it/help/invoker.properties b/maven/bnd-testing-maven-plugin/src/it/help/invoker.properties new file mode 100644 index 0000000000..9c7a7746f7 --- /dev/null +++ b/maven/bnd-testing-maven-plugin/src/it/help/invoker.properties @@ -0,0 +1,7 @@ +invoker.goals=--no-transfer-progress package + +# Run mvn with --debug for debug logging +#invoker.debug=true + +# Run mvn in debugging mode and wait for a debugger to attach +#invoker.environmentVariables.MAVEN_DEBUG_OPTS=-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8000 diff --git a/maven/bnd-testing-maven-plugin/src/it/help/pom.xml b/maven/bnd-testing-maven-plugin/src/it/help/pom.xml new file mode 100644 index 0000000000..60aa33c678 --- /dev/null +++ b/maven/bnd-testing-maven-plugin/src/it/help/pom.xml @@ -0,0 +1,28 @@ + + 4.0.0 + biz.aQute.bnd-test + help + 0.0.1 + pom + + + + + biz.aQute.bnd + bnd-testing-maven-plugin + ${bnd.version} + + + help + package + + help + + + + + + + diff --git a/maven/pom.xml b/maven/pom.xml index bf7f7a1332..813955e442 100644 --- a/maven/pom.xml +++ b/maven/pom.xml @@ -4,16 +4,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - - biz.aQute.bnd - bnd-plugin-parent - ${revision} - bnd-plugin-parent - - + biz.aQute.bnd maven - Reactor POM for the Bnd Maven plugins. - ${project.groupId}:${project.artifactId} + 1.0.0 + Reactor to build the Bnd Maven plugins. + Bnd Maven plugins reactor pom