Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

build(deps): Bump maven-invoker-plugin from 3.2.2 to 3.3.0 in /maven #5270

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
@@ -1,4 +1,3 @@
import java.io.*;
import java.util.regex.Pattern

File build_log_file = new File("${basedir}/build.log")
Expand Down
@@ -1,4 +1,3 @@
import java.io.*;
import java.util.regex.Pattern

File build_log_file = new File("${basedir}/build.log")
Expand Down
@@ -1,4 +1,3 @@
import java.io.*;
import java.util.regex.Pattern

File build_log_file = new File("${basedir}/build.log")
Expand Down
@@ -1,4 +1,3 @@
import java.io.*;
import java.util.regex.Pattern

File build_log_file = new File("${basedir}/build.log")
Expand Down
@@ -1,4 +1,3 @@
import java.io.*;
import java.util.regex.Pattern

File build_log_file = new File("${basedir}/build.log")
Expand Down
@@ -1,4 +1,3 @@
import java.io.*;
import java.util.regex.Pattern

File build_log_file = new File("${basedir}/build.log")
Expand Down
@@ -1,4 +1,3 @@
import java.io.*;
import java.util.regex.Pattern

File build_log_file = new File("${basedir}/build.log")
Expand Down
16 changes: 9 additions & 7 deletions maven/bnd-export-maven-plugin/src/it/export/postbuild.groovy
@@ -1,10 +1,12 @@
import aQute.bnd.build.*;
import aQute.bnd.build.model.*;
import aQute.bnd.osgi.*;
import aQute.bnd.properties.*;
import aQute.bnd.version.*;
import aQute.lib.io.*;
import java.util.jar.*;
import aQute.bnd.build.Workspace
import aQute.bnd.build.model.BndEditModel
import aQute.bnd.osgi.Processor
import aQute.bnd.properties.Document
import aQute.bnd.version.MavenVersion
import aQute.lib.io.IO

import java.util.jar.Attributes
import java.util.jar.JarFile;

def baseVersion = new MavenVersion(bndVersion).toReleaseVersion()

Expand Down
12 changes: 8 additions & 4 deletions maven/bnd-indexer-maven-plugin/src/it/add-mvn/postbuild.groovy
@@ -1,7 +1,11 @@
import aQute.bnd.osgi.repository.*;
import aQute.bnd.osgi.resource.*;
import org.osgi.resource.*;
import org.osgi.service.repository.*;
import aQute.bnd.osgi.repository.ResourcesRepository
import aQute.bnd.osgi.repository.XMLResourceParser
import aQute.bnd.osgi.resource.RequirementBuilder
import aQute.bnd.osgi.resource.ResourceUtils
import org.osgi.resource.Capability
import org.osgi.resource.Requirement
import org.osgi.resource.Resource
import org.osgi.service.repository.Repository;

public Repository check(String xmlFile, String gzipFile, int size, boolean localURL, boolean doCheck) {
// Check the bundles exist!
Expand Down
@@ -1,7 +1,11 @@
import aQute.bnd.osgi.repository.*;
import aQute.bnd.osgi.resource.*;
import org.osgi.resource.*;
import org.osgi.service.repository.*;
import aQute.bnd.osgi.repository.ResourcesRepository
import aQute.bnd.osgi.repository.XMLResourceParser
import aQute.bnd.osgi.resource.RequirementBuilder
import aQute.bnd.osgi.resource.ResourceUtils
import org.osgi.resource.Capability
import org.osgi.resource.Requirement
import org.osgi.resource.Resource
import org.osgi.service.repository.Repository;

public Repository check(String xmlFile, String gzipFile, int size, boolean localURL, boolean doCheck) {
// Check the bundles exist!
Expand Down
@@ -1,10 +1,13 @@
import java.nio.file.*;
import aQute.lib.io.IO

import java.nio.file.Files
import java.nio.file.Path
import java.nio.file.Paths;

Path source = Paths.get("${projectsDirectory}/local-repo/org/objenesis");
Path target = Paths.get("${localRepositoryPath}/org/objenesis");

target.deleteDir();

IO.delete(target)

source.toFile().eachFileRecurse({ f ->
Path s = Paths.get(f.toURI());
Expand All @@ -29,4 +32,4 @@ Path remote = target.resolve("objenesis/2.2/_remote.repositories");

assert remote.toFile().text.normalize() == expected.normalize()

return;
return;
12 changes: 8 additions & 4 deletions maven/bnd-indexer-maven-plugin/src/it/in-build/postbuild.groovy
@@ -1,7 +1,11 @@
import aQute.bnd.osgi.repository.*;
import aQute.bnd.osgi.resource.*;
import org.osgi.resource.*;
import org.osgi.service.repository.*;
import aQute.bnd.osgi.repository.ResourcesRepository
import aQute.bnd.osgi.repository.XMLResourceParser
import aQute.bnd.osgi.resource.RequirementBuilder
import aQute.bnd.osgi.resource.ResourceUtils
import org.osgi.resource.Capability
import org.osgi.resource.Requirement
import org.osgi.resource.Resource
import org.osgi.service.repository.Repository;

public Repository check(String xmlFile, String gzipFile, int size, boolean localURL, boolean doCheck) {
// Check the bundles exist!
Expand Down
@@ -1,7 +1,11 @@
import aQute.bnd.osgi.repository.*;
import aQute.bnd.osgi.resource.*;
import org.osgi.resource.*;
import org.osgi.service.repository.*;
import aQute.bnd.osgi.repository.ResourcesRepository
import aQute.bnd.osgi.repository.XMLResourceParser
import aQute.bnd.osgi.resource.RequirementBuilder
import aQute.bnd.osgi.resource.ResourceUtils
import org.osgi.resource.Capability
import org.osgi.resource.Requirement
import org.osgi.resource.Resource
import org.osgi.service.repository.Repository;

public Repository check(String xmlFile, String gzipFile, int size, boolean localURL, boolean doCheck) {
// Check the bundles exist!
Expand Down
@@ -1,7 +1,11 @@
import aQute.bnd.osgi.repository.*;
import aQute.bnd.osgi.resource.*;
import org.osgi.resource.*;
import org.osgi.service.repository.*;
import aQute.bnd.osgi.repository.ResourcesRepository
import aQute.bnd.osgi.repository.XMLResourceParser
import aQute.bnd.osgi.resource.RequirementBuilder
import aQute.bnd.osgi.resource.ResourceUtils
import org.osgi.resource.Capability
import org.osgi.resource.Requirement
import org.osgi.resource.Resource
import org.osgi.service.repository.Repository;

public Repository check(String xmlFile, String gzipFile, int size, boolean localURL, boolean doCheck) {
// Check the bundles exist!
Expand Down
@@ -1,7 +1,11 @@
import aQute.bnd.osgi.repository.*;
import aQute.bnd.osgi.resource.*;
import org.osgi.resource.*;
import org.osgi.service.repository.*;
import aQute.bnd.osgi.repository.ResourcesRepository
import aQute.bnd.osgi.repository.XMLResourceParser
import aQute.bnd.osgi.resource.RequirementBuilder
import aQute.bnd.osgi.resource.ResourceUtils
import org.osgi.resource.Capability
import org.osgi.resource.Requirement
import org.osgi.resource.Resource
import org.osgi.service.repository.Repository;

public Repository check(String xmlFile, String gzipFile, int size, boolean localURL, boolean doCheck) {
// Check the bundles exist!
Expand Down
@@ -1,7 +1,11 @@
import aQute.bnd.osgi.repository.*;
import aQute.bnd.osgi.resource.*;
import org.osgi.resource.*;
import org.osgi.service.repository.*;
import aQute.bnd.osgi.repository.ResourcesRepository
import aQute.bnd.osgi.repository.XMLResourceParser
import aQute.bnd.osgi.resource.RequirementBuilder
import aQute.bnd.osgi.resource.ResourceUtils
import org.osgi.resource.Capability
import org.osgi.resource.Requirement
import org.osgi.resource.Resource
import org.osgi.service.repository.Repository;

public Repository check(String xmlFile, String gzipFile, int size, boolean localURL, boolean doCheck) {
// Check the bundles exist!
Expand Down
@@ -1,7 +1,11 @@
import aQute.bnd.osgi.repository.*;
import aQute.bnd.osgi.resource.*;
import org.osgi.resource.*;
import org.osgi.service.repository.*;
import aQute.bnd.osgi.repository.ResourcesRepository
import aQute.bnd.osgi.repository.XMLResourceParser
import aQute.bnd.osgi.resource.RequirementBuilder
import aQute.bnd.osgi.resource.ResourceUtils
import org.osgi.resource.Capability
import org.osgi.resource.Requirement
import org.osgi.resource.Resource
import org.osgi.service.repository.Repository;

public Repository check(String xmlFile, String gzipFile, int size, boolean localURL, boolean doCheck) {
// Check the bundles exist!
Expand Down
@@ -1,7 +1,11 @@
import aQute.bnd.osgi.repository.*;
import aQute.bnd.osgi.resource.*;
import org.osgi.resource.*;
import org.osgi.service.repository.*;
import aQute.bnd.osgi.repository.ResourcesRepository
import aQute.bnd.osgi.repository.XMLResourceParser
import aQute.bnd.osgi.resource.RequirementBuilder
import aQute.bnd.osgi.resource.ResourceUtils
import org.osgi.resource.Capability
import org.osgi.resource.Requirement
import org.osgi.resource.Resource
import org.osgi.service.repository.Repository;

public Repository check(String xmlFile, String gzipFile, int size, boolean localURL, boolean doCheck) {
// Check the bundles exist!
Expand Down
@@ -1,7 +1,11 @@
import aQute.bnd.osgi.repository.*;
import aQute.bnd.osgi.resource.*;
import org.osgi.resource.*;
import org.osgi.service.repository.*;
import aQute.bnd.osgi.repository.ResourcesRepository
import aQute.bnd.osgi.repository.XMLResourceParser
import aQute.bnd.osgi.resource.RequirementBuilder
import aQute.bnd.osgi.resource.ResourceUtils
import org.osgi.resource.Capability
import org.osgi.resource.Requirement
import org.osgi.resource.Resource
import org.osgi.service.repository.Repository;

public Repository check(String xmlFile, String gzipFile, int size, boolean localURL, boolean doCheck) {
// Check the bundles exist!
Expand Down
@@ -1,7 +1,11 @@
import aQute.bnd.osgi.repository.*;
import aQute.bnd.osgi.resource.*;
import org.osgi.resource.*;
import org.osgi.service.repository.*;
import aQute.bnd.osgi.repository.ResourcesRepository
import aQute.bnd.osgi.repository.XMLResourceParser
import aQute.bnd.osgi.resource.RequirementBuilder
import aQute.bnd.osgi.resource.ResourceUtils
import org.osgi.resource.Capability
import org.osgi.resource.Requirement
import org.osgi.resource.Resource
import org.osgi.service.repository.Repository;

public Repository check(String xmlFile, String gzipFile, int size, boolean localURL, boolean doCheck) {
// Check the bundles exist!
Expand Down
@@ -1,7 +1,11 @@
import aQute.bnd.osgi.repository.*;
import aQute.bnd.osgi.resource.*;
import org.osgi.resource.*;
import org.osgi.service.repository.*;
import aQute.bnd.osgi.repository.ResourcesRepository
import aQute.bnd.osgi.repository.XMLResourceParser
import aQute.bnd.osgi.resource.RequirementBuilder
import aQute.bnd.osgi.resource.ResourceUtils
import org.osgi.resource.Capability
import org.osgi.resource.Requirement
import org.osgi.resource.Resource
import org.osgi.service.repository.Repository;

public Repository check(String xmlFile, String gzipFile, int size, boolean localURL, boolean doCheck) {
// Check the bundles exist!
Expand Down
12 changes: 8 additions & 4 deletions maven/bnd-indexer-maven-plugin/src/it/scoped/postbuild.groovy
@@ -1,7 +1,11 @@
import aQute.bnd.osgi.repository.*;
import aQute.bnd.osgi.resource.*;
import org.osgi.resource.*;
import org.osgi.service.repository.*;
import aQute.bnd.osgi.repository.ResourcesRepository
import aQute.bnd.osgi.repository.XMLResourceParser
import aQute.bnd.osgi.resource.RequirementBuilder
import aQute.bnd.osgi.resource.ResourceUtils
import org.osgi.resource.Capability
import org.osgi.resource.Requirement
import org.osgi.resource.Resource
import org.osgi.service.repository.Repository;

public Repository check(String xmlFile, String gzipFile, int size, boolean localURL, boolean doCheck) {
// Check the bundles exist!
Expand Down
@@ -1,7 +1,11 @@
import aQute.bnd.osgi.repository.*;
import aQute.bnd.osgi.resource.*;
import org.osgi.resource.*;
import org.osgi.service.repository.*;
import aQute.bnd.osgi.repository.ResourcesRepository
import aQute.bnd.osgi.repository.XMLResourceParser
import aQute.bnd.osgi.resource.RequirementBuilder
import aQute.bnd.osgi.resource.ResourceUtils
import org.osgi.resource.Capability
import org.osgi.resource.Requirement
import org.osgi.resource.Resource
import org.osgi.service.repository.Repository;

public Repository check(String xmlFile, String gzipFile, int size, boolean localURL, boolean doCheck) {
// Check the bundles exist!
Expand Down
@@ -1,4 +1,7 @@
import java.util.jar.*;
import groovy.xml.XmlSlurper

import java.util.jar.Attributes
import java.util.jar.JarFile

def bsn = 'jar-test-api-bundle'
def version = '0.0.1'
Expand Down
@@ -1,5 +1,3 @@
import java.util.jar.*;

def bsn = 'jar-test-bnd-process-skipIfEmpty'

// Check the bundles exist!
Expand Down
@@ -1,4 +1,7 @@
import java.util.jar.*;
import groovy.xml.XmlSlurper

import java.util.jar.Attributes
import java.util.jar.JarFile

def bsn = 'jar-test-bnd-process-tests-goal-fragment'
def version = '0.0.1-SNAPSHOT'
Expand Down
@@ -1,4 +1,7 @@
import java.util.jar.*;
import groovy.xml.XmlSlurper

import java.util.jar.Attributes
import java.util.jar.JarFile

def bsn = 'jar-test-bnd-process-tests-goal'
def version = '0.0.1-SNAPSHOT'
Expand Down
@@ -1,4 +1,6 @@
import java.util.jar.*;
import groovy.xml.XmlSlurper

import java.util.jar.JarFile

def bsn = 'jar-test-bnd-process-tests-skipIfEmpty'
def version = '0.0.1'
Expand Down
@@ -1,6 +1,11 @@
import java.time.*;
import java.time.format.*;
import java.util.jar.*;
import groovy.xml.XmlSlurper

import java.time.Instant
import java.time.ZoneId
import java.time.ZonedDateTime
import java.time.format.DateTimeFormatter
import java.util.jar.JarEntry
import java.util.jar.JarFile

def bsn = 'jar-test-impl-bundle'
def version = '0.0.1-SNAPSHOT'
Expand Down
@@ -1,4 +1,7 @@
import java.util.jar.*;
import groovy.xml.XmlSlurper

import java.util.jar.Attributes
import java.util.jar.JarFile

def bsn = 'jar-test-inheriting-api-bundle'
def version = '0.0.1'
Expand Down
@@ -1,4 +1,7 @@
import java.util.jar.*;
import groovy.xml.XmlSlurper

import java.util.jar.Attributes
import java.util.jar.JarFile

def bsn = 'jar-test-war-bundle'
def version = '0.0.1-SNAPSHOT'
Expand Down
@@ -1,6 +1,12 @@
import java.time.*;
import java.time.format.*;
import java.util.jar.*;
import groovy.xml.XmlSlurper

import java.time.Instant
import java.time.ZoneId
import java.time.ZonedDateTime
import java.time.format.DateTimeFormatter
import java.util.jar.Attributes
import java.util.jar.JarEntry
import java.util.jar.JarFile

def bsn = 'test.wrapper.bundle'
def moduleDir = 'jar-test-wrapper-bundle'
Expand Down
@@ -1,4 +1,5 @@
import java.util.jar.*;
import java.util.jar.Attributes
import java.util.jar.JarFile;

// Check the bundles exist!
File api_bundle = new File(basedir, 'target/test-api-bundle-0.0.1.jar')
Expand Down