Browse Source

Address review: fix pkg.skip.bootjar precedence and remove unused surefire.version

Remove <pkg.skip.bootjar>false</pkg.skip.bootjar> from all child
module <properties> blocks. The root POM already defaults it to false,
and child declarations block the skip-pkg profile override, so
-Dpkg.skip=true was never actually skipping spring-boot:repackage.

Also remove the unused surefire.version property (superseded by
maven-surefire-plugin.version).
pull/15139/head
Sergey Matvienko 6 months ago
parent
commit
7bb708888f
  1. 1
      application/pom.xml
  2. 1
      edqs/pom.xml
  3. 1
      monitoring/pom.xml
  4. 1
      msa/js-executor/pom.xml
  5. 1
      msa/vc-executor/pom.xml
  6. 1
      msa/web-ui/pom.xml
  7. 1
      pom.xml
  8. 1
      transport/coap/pom.xml
  9. 1
      transport/http/pom.xml
  10. 1
      transport/lwm2m/pom.xml
  11. 1
      transport/mqtt/pom.xml
  12. 1
      transport/snmp/pom.xml

1
application/pom.xml

@ -35,7 +35,6 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<main.dir>${basedir}/..</main.dir>
<pkg.type>java</pkg.type>
<pkg.skip.bootjar>false</pkg.skip.bootjar>
<pkg.process-resources.phase>process-resources</pkg.process-resources.phase>
<pkg.package.phase>package</pkg.package.phase>
<pkg.name>thingsboard</pkg.name>

1
edqs/pom.xml

@ -33,7 +33,6 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<main.dir>${basedir}/..</main.dir>
<pkg.type>java</pkg.type>
<pkg.skip.bootjar>false</pkg.skip.bootjar>
<pkg.process-resources.phase>process-resources</pkg.process-resources.phase>
<pkg.package.phase>package</pkg.package.phase>
<pkg.name>tb-edqs</pkg.name>

1
monitoring/pom.xml

@ -33,7 +33,6 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<main.dir>${basedir}/..</main.dir>
<pkg.type>java</pkg.type>
<pkg.skip.bootjar>false</pkg.skip.bootjar>
<pkg.process-resources.phase>process-resources</pkg.process-resources.phase>
<pkg.package.phase>package</pkg.package.phase>
<pkg.name>tb-monitoring</pkg.name>

1
msa/js-executor/pom.xml

@ -37,7 +37,6 @@
<docker.name>tb-js-executor</docker.name>
<pkg.name>tb-js-executor</pkg.name>
<pkg.type>js</pkg.type>
<pkg.skip.bootjar>false</pkg.skip.bootjar>
<pkg.process-resources.phase>process-resources</pkg.process-resources.phase>
<pkg.package.phase>package</pkg.package.phase>
<pkg.linux.dist>${project.build.directory}/package/linux</pkg.linux.dist>

1
msa/vc-executor/pom.xml

@ -35,7 +35,6 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<main.dir>${basedir}/../..</main.dir>
<pkg.type>java</pkg.type>
<pkg.skip.bootjar>false</pkg.skip.bootjar>
<pkg.process-resources.phase>process-resources</pkg.process-resources.phase>
<pkg.package.phase>package</pkg.package.phase>
<pkg.name>tb-vc-executor</pkg.name>

1
msa/web-ui/pom.xml

@ -39,7 +39,6 @@
<docker.name>tb-web-ui</docker.name>
<pkg.name>tb-web-ui</pkg.name>
<pkg.type>js</pkg.type>
<pkg.skip.bootjar>false</pkg.skip.bootjar>
<pkg.process-resources.phase>process-resources</pkg.process-resources.phase>
<pkg.package.phase>package</pkg.package.phase>
<pkg.linux.dist>${project.build.directory}/package/linux</pkg.linux.dist>

1
pom.xml

@ -92,7 +92,6 @@
<paho.client.version>1.2.5</paho.client.version>
<paho.mqttv5.client.version>1.2.5</paho.mqttv5.client.version>
<os-maven-plugin.version>1.7.1</os-maven-plugin.version>
<surefire.version>3.5.4</surefire.version>
<jar-plugin.version>3.5.0</jar-plugin.version>
<maven-surefire-plugin.version>3.5.4</maven-surefire-plugin.version>
<maven-install-plugin.version>3.1.4</maven-install-plugin.version>

1
transport/coap/pom.xml

@ -34,7 +34,6 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<main.dir>${basedir}/../..</main.dir>
<pkg.type>java</pkg.type>
<pkg.skip.bootjar>false</pkg.skip.bootjar>
<pkg.process-resources.phase>process-resources</pkg.process-resources.phase>
<pkg.package.phase>package</pkg.package.phase>
<pkg.name>tb-coap-transport</pkg.name>

1
transport/http/pom.xml

@ -34,7 +34,6 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<main.dir>${basedir}/../..</main.dir>
<pkg.type>java</pkg.type>
<pkg.skip.bootjar>false</pkg.skip.bootjar>
<pkg.process-resources.phase>process-resources</pkg.process-resources.phase>
<pkg.package.phase>package</pkg.package.phase>
<pkg.name>tb-http-transport</pkg.name>

1
transport/lwm2m/pom.xml

@ -34,7 +34,6 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<main.dir>${basedir}/../..</main.dir>
<pkg.type>java</pkg.type>
<pkg.skip.bootjar>false</pkg.skip.bootjar>
<pkg.process-resources.phase>process-resources</pkg.process-resources.phase>
<pkg.package.phase>package</pkg.package.phase>
<pkg.name>tb-lwm2m-transport</pkg.name>

1
transport/mqtt/pom.xml

@ -34,7 +34,6 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<main.dir>${basedir}/../..</main.dir>
<pkg.type>java</pkg.type>
<pkg.skip.bootjar>false</pkg.skip.bootjar>
<pkg.process-resources.phase>process-resources</pkg.process-resources.phase>
<pkg.package.phase>package</pkg.package.phase>
<pkg.name>tb-mqtt-transport</pkg.name>

1
transport/snmp/pom.xml

@ -36,7 +36,6 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<main.dir>${basedir}/../..</main.dir>
<pkg.type>java</pkg.type>
<pkg.skip.bootjar>false</pkg.skip.bootjar>
<pkg.process-resources.phase>process-resources</pkg.process-resources.phase>
<pkg.package.phase>package</pkg.package.phase>
<pkg.name>tb-snmp-transport</pkg.name>

Loading…
Cancel
Save