Skip to content

Commit c30b8b7

Browse files
committed
[#4] Plugins version updated.
Tycho updated to 3.0.4 Checkstyle to 10.4
1 parent 9445f78 commit c30b8b7

File tree

2 files changed

+18
-14
lines changed

2 files changed

+18
-14
lines changed

b3dgs-builtools/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,13 @@
5555
<maven.compiler.source>1.8</maven.compiler.source>
5656
<maven.compiler.target>1.8</maven.compiler.target>
5757
<maven.compiler.release>8</maven.compiler.release>
58-
<maven-clean-plugin.version>3.2.0</maven-clean-plugin.version>
5958
<maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
59+
<maven-clean-plugin.version>3.2.0</maven-clean-plugin.version>
6060
<maven-deploy-plugin.version>3.1.0</maven-deploy-plugin.version>
6161
<maven-install-plugin.version>3.1.0</maven-install-plugin.version>
6262
<maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
63-
<maven-release-plugin.version>3.0.0-M7</maven-release-plugin.version>
6463
<maven-resources-plugin.version>3.3.0</maven-resources-plugin.version>
64+
<maven-release-plugin.version>3.0.0-M7</maven-release-plugin.version>
6565
<maven-gpg.version>3.0.1</maven-gpg.version>
6666
</properties>
6767
<build>

b3dgs-parent/pom.xml

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -95,26 +95,26 @@
9595
<jdk.version>1.8</jdk.version>
9696
<maven-minimum.version>3.0</maven-minimum.version>
9797
<encoding.type>UTF-8</encoding.type>
98-
<tycho.version>2.3.0</tycho.version>
98+
<tycho.version>3.0.4</tycho.version>
9999
<junit.version>5.9.2</junit.version>
100100
<junit-runner.version>1.9.2</junit-runner.version>
101101
<jacoco.version>0.8.8</jacoco.version>
102102
<maven-bundle.version>5.1.8</maven-bundle.version>
103-
<maven-compiler.version>3.10.1</maven-compiler.version>
103+
<maven-compiler.version>3.11.0</maven-compiler.version>
104104
<maven-jar.version>3.3.0</maven-jar.version>
105105
<maven-clean.version>3.2.0</maven-clean.version>
106106
<maven-source.version>3.2.1</maven-source.version>
107107
<maven-javadoc.version>3.5.0</maven-javadoc.version>
108-
<maven-surfire.version>3.0.0-M9</maven-surfire.version>
109-
<maven-failsafe.version>3.0.0-M9</maven-failsafe.version>
108+
<maven-surfire.version>3.0.0</maven-surfire.version>
109+
<maven-failsafe.version>3.0.0</maven-failsafe.version>
110110
<maven-checkstyle.version>3.2.1</maven-checkstyle.version>
111111
<maven-site.version>3.12.1</maven-site.version>
112112
<maven-deploy.version>3.1.0</maven-deploy.version>
113113
<maven-install.version>3.1.0</maven-install.version>
114114
<maven-resources.version>3.3.0</maven-resources.version>
115115
<maven-dependency.version>3.5.0</maven-dependency.version>
116116
<maven-release.version>3.0.0-M7</maven-release.version>
117-
<checkstyle.version>9.3</checkstyle.version>
117+
<checkstyle.version>10.4</checkstyle.version>
118118
<pde-target-maven.version>1.0.1</pde-target-maven.version>
119119
<maven-gpg.version>3.0.1</maven-gpg.version>
120120
<maven-jarsigner.version>3.0.0</maven-jarsigner.version>
@@ -313,6 +313,9 @@
313313
</dependency>
314314
</dependencies>
315315
<configuration>
316+
<configLocation>checkstyle-checker.xml</configLocation>
317+
<headerLocation>checkstyle-header.txt</headerLocation>
318+
<suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
316319
<sourceDirectories>
317320
<sourceDirectory>src/main/java</sourceDirectory>
318321
</sourceDirectories>
@@ -322,10 +325,6 @@
322325
<id>validate</id>
323326
<phase>validate</phase>
324327
<configuration>
325-
<configLocation>checkstyle-checker.xml</configLocation>
326-
<headerLocation>checkstyle-header.txt</headerLocation>
327-
<suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
328-
<encoding>${encoding.type}</encoding>
329328
<consoleOutput>true</consoleOutput>
330329
<failsOnError>true</failsOnError>
331330
</configuration>
@@ -341,13 +340,19 @@
341340
<version>${tycho.version}</version>
342341
<extensions>true</extensions>
343342
</plugin>
343+
<plugin>
344+
<groupId>org.eclipse.tycho</groupId>
345+
<artifactId>tycho-gpg-plugin</artifactId>
346+
<version>${tycho.version}</version>
347+
</plugin>
344348
<plugin>
345349
<groupId>org.eclipse.tycho</groupId>
346350
<artifactId>target-platform-configuration</artifactId>
347351
<version>${tycho.version}</version>
348352
<configuration>
349353
<resolver>p2</resolver>
350-
<pomDependencies>consider</pomDependencies>
354+
<pomDependencies>wrapAsBundle</pomDependencies>
355+
<executionEnvironment>JavaSE-${jdk.version}</executionEnvironment>
351356
<target>
352357
<artifact>
353358
<groupId>${project.groupId}</groupId>
@@ -444,8 +449,7 @@
444449
<instructions>
445450
<Import-Package>org.junit;resolution:=optional, *</Import-Package>
446451
<Bundle-RequiredExecutionEnvironment>JavaSE-${jdk.version}</Bundle-RequiredExecutionEnvironment>
447-
<_removeheaders> Build-Jdk,Built-By,Bnd-LastModified,Created-By,Private-Package,Tool,Require-Capability
448-
</_removeheaders>
452+
<_removeheaders>Build-Jdk,Built-By,Bnd-LastModified,Created-By,Private-Package,Tool,Require-Capability</_removeheaders>
449453
</instructions>
450454
</configuration>
451455
<executions>

0 commit comments

Comments
 (0)