Skip to content

Commit 08d80cd

Browse files
dkapildkapil
committed
Merge branch 'master' of https://github.com/eugenp/tutorials into task/BAEL-20665
# Conflicts: # core-java-modules/core-java-jndi/pom.xml
2 parents 075c1b1 + dd173ec commit 08d80cd

File tree

97 files changed

+1158
-202
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+1158
-202
lines changed

‎algorithms-miscellaneous-1/pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
<plugin>
6565
<groupId>org.codehaus.mojo</groupId>
6666
<artifactId>cobertura-maven-plugin</artifactId>
67-
<version>2.7</version>
67+
<version>${cobertura.plugin.version}</version>
6868
<configuration>
6969
<instrumentation>
7070
<ignores>
@@ -85,6 +85,7 @@
8585
<commons-codec.version>1.11</commons-codec.version>
8686
<guava.version>27.0.1-jre</guava.version>
8787
<combinatoricslib3.version>3.3.0</combinatoricslib3.version>
88+
<cobertura.plugin.version>2.7</cobertura.plugin.version>
8889
</properties>
8990

9091
</project>

‎algorithms-miscellaneous-3/pom.xml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,13 @@
4646
<dependency>
4747
<groupId>org.apache.commons</groupId>
4848
<artifactId>commons-lang3</artifactId>
49-
<version>3.8.1</version>
49+
<version>${commons.lang3.version}</version>
5050
</dependency>
5151

5252
<dependency>
5353
<groupId>pl.pragmatists</groupId>
5454
<artifactId>JUnitParams</artifactId>
55-
<version>1.1.0</version>
55+
<version>${JUnitParams.version}</version>
5656
<scope>test</scope>
5757
</dependency>
5858
<dependency>
@@ -91,6 +91,8 @@
9191
<retrofit.version>2.6.0</retrofit.version>
9292
<jmh-core.version>1.19</jmh-core.version>
9393
<jmh-generator.version>1.19</jmh-generator.version>
94+
<commons.lang3.version>3.8.1</commons.lang3.version>
95+
<JUnitParams.version>1.1.0</JUnitParams.version>
9496
</properties>
9597

9698
</project>

‎algorithms-miscellaneous-5/pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<dependency>
3838
<groupId>com.google.guava</groupId>
3939
<artifactId>guava</artifactId>
40-
<version>28.1-jre</version>
40+
<version>${guava.version}</version>
4141
</dependency>
4242

4343
<dependency>
@@ -65,6 +65,7 @@
6565
<org.assertj.core.version>3.9.0</org.assertj.core.version>
6666
<commons-codec.version>1.11</commons-codec.version>
6767
<commons-math3.version>3.6.1</commons-math3.version>
68+
<guava.version>28.1-jre</guava.version>
6869
</properties>
6970

7071
</project>

‎apache-cxf/sse-jaxrs/sse-jaxrs-server/pom.xml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,19 @@
1818
<dependency>
1919
<groupId>javax.ws.rs</groupId>
2020
<artifactId>javax.ws.rs-api</artifactId>
21-
<version>2.1</version>
21+
<version>${rs-api.version}</version>
2222
<scope>provided</scope>
2323
</dependency>
2424
<dependency>
2525
<groupId>javax.enterprise</groupId>
2626
<artifactId>cdi-api</artifactId>
27-
<version>2.0</version>
27+
<version>${cdi-api.version}</version>
2828
<scope>provided</scope>
2929
</dependency>
3030
<dependency>
3131
<groupId>javax.json.bind</groupId>
3232
<artifactId>javax.json.bind-api</artifactId>
33-
<version>1.0</version>
33+
<version>${bind-api.version}</version>
3434
<scope>provided</scope>
3535
</dependency>
3636

@@ -80,6 +80,9 @@
8080
<liberty-maven-plugin.version>2.4.2</liberty-maven-plugin.version>
8181
<failOnMissingWebXml>false</failOnMissingWebXml>
8282
<openliberty-version>18.0.0.2</openliberty-version>
83+
<rs-api.version>2.1</rs-api.version>
84+
<cdi-api.version>2.0</cdi-api.version>
85+
<bind-api.version>1.0</bind-api.version>
8386
</properties>
8487

8588
</project>

‎apache-rocketmq/pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,12 @@
1717
<dependency>
1818
<groupId>org.apache.rocketmq</groupId>
1919
<artifactId>rocketmq-spring-boot-starter</artifactId>
20-
<version>2.0.4</version>
20+
<version>${rocketmq.version}</version>
2121
</dependency>
2222
</dependencies>
2323

2424
<properties>
2525
<geode.core>1.6.0</geode.core>
26+
<rocketmq.version>2.0.4</rocketmq.version>
2627
</properties>
2728
</project>

‎apache-tapestry/pom.xml‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,18 +81,18 @@ of testing facilities designed for use with TestNG (http://testng.org/), so it's
8181
<plugin>
8282
<groupId>org.apache.maven.plugins</groupId>
8383
<artifactId>maven-compiler-plugin</artifactId>
84-
<version>2.3.2</version>
84+
<version>${compiler.plugin.version}</version>
8585
<configuration>
86-
<source>1.8</source>
87-
<target>1.8</target>
86+
<source>${source.version}</source>
87+
<target>${target.version}</target>
8888
<optimize>true</optimize>
8989
</configuration>
9090
</plugin>
9191

9292
<plugin>
9393
<groupId>org.apache.maven.plugins</groupId>
9494
<artifactId>maven-surefire-plugin</artifactId>
95-
<version>2.7.2</version>
95+
<version>${compiler.surefire.version}</version>
9696
<configuration>
9797
<systemPropertyVariables>
9898
<tapestry.execution-mode>Qa</tapestry.execution-mode>
@@ -104,7 +104,7 @@ of testing facilities designed for use with TestNG (http://testng.org/), so it's
104104
<plugin>
105105
<groupId>org.mortbay.jetty</groupId>
106106
<artifactId>maven-jetty-plugin</artifactId>
107-
<version>6.1.16</version>
107+
<version>${compiler.jetty.version}</version>
108108
<configuration>
109109
<!-- Log to the console. -->
110110
<requestLog implementation="org.mortbay.jetty.NCSARequestLog">
@@ -140,6 +140,11 @@ of testing facilities designed for use with TestNG (http://testng.org/), so it's
140140
</repositories>
141141

142142
<properties>
143+
<compiler.jetty.version>6.1.16</compiler.jetty.version>
144+
<compiler.surefire.version>2.7.2</compiler.surefire.version>
145+
<compiler.plugin.version>2.3.2</compiler.plugin.version>
146+
<source.version>1.8</source.version>
147+
<target.version>1.8</target.version>
143148
<tapestry-release-version>5.4.5</tapestry-release-version>
144149
<servlet-api-release-version>2.5</servlet-api-release-version>
145150
<testng-release-version>6.8.21</testng-release-version>

‎aws-reactive/pom.xml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717

1818
<properties>
1919
<java.version>1.8</java.version>
20+
<spring.version>2.2.1.RELEASE</spring.version>
21+
<awssdk.version>2.10.27</awssdk.version>
2022
</properties>
2123

2224
<dependencyManagement>
@@ -26,15 +28,15 @@
2628
<!-- Import dependency management from Spring Boot -->
2729
<groupId>org.springframework.boot</groupId>
2830
<artifactId>spring-boot-dependencies</artifactId>
29-
<version>2.2.1.RELEASE</version>
31+
<version>${spring.version}</version>
3032
<type>pom</type>
3133
<scope>import</scope>
3234
</dependency>
3335

3436
<dependency>
3537
<groupId>software.amazon.awssdk</groupId>
3638
<artifactId>bom</artifactId>
37-
<version>2.10.27</version>
39+
<version>${awssdk.version}</version>
3840
<type>pom</type>
3941
<scope>import</scope>
4042
</dependency>

‎blade/pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124

125125
<plugin>
126126
<artifactId>maven-assembly-plugin</artifactId>
127-
<version>3.1.0</version>
127+
<version>${assembly.plugin.version}</version>
128128
<configuration>
129129
<finalName>${project.build.finalName}</finalName>
130130
<appendAssemblyId>false</appendAssemblyId>
@@ -161,6 +161,7 @@
161161
<assertj-core.version>3.11.1</assertj-core.version>
162162
<maven-failsafe-plugin.version>3.0.0-M3</maven-failsafe-plugin.version>
163163
<process-exec-maven-plugin.version>0.7</process-exec-maven-plugin.version>
164+
<assembly.plugin.version>3.1.0</assembly.plugin.version>
164165
</properties>
165166

166167
</project>

‎core-groovy-2/pom.xml‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,12 @@
6262
<plugin>
6363
<groupId>org.codehaus.groovy</groupId>
6464
<artifactId>groovy-eclipse-compiler</artifactId>
65-
<version>3.3.0-01</version>
65+
<version>${groovy.compiler.version}</version>
6666
<extensions>true</extensions>
6767
</plugin>
6868
<plugin>
6969
<artifactId>maven-compiler-plugin</artifactId>
70-
<version>3.8.0</version>
70+
<version>${compiler.plugin.version}</version>
7171
<configuration>
7272
<compilerId>groovy-eclipse-compiler</compilerId>
7373
<source>${java.version}</source>
@@ -113,7 +113,7 @@
113113
</plugin>
114114
<plugin>
115115
<artifactId>maven-surefire-plugin</artifactId>
116-
<version>2.20.1</version>
116+
<version>${surefire.plugin.version}</version>
117117
<configuration>
118118
<useFile>false</useFile>
119119
<includes>
@@ -126,7 +126,7 @@
126126
<plugin>
127127
<groupId>org.apache.maven.plugins</groupId>
128128
<artifactId>maven-assembly-plugin</artifactId>
129-
<version>3.1.0</version>
129+
<version>${assembly.plugin.version}</version>
130130
<configuration>
131131
<!-- get all project dependencies -->
132132
<descriptorRefs>
@@ -183,6 +183,10 @@
183183
<groovy-wslite.version>1.1.3</groovy-wslite.version>
184184
<logback.version>1.2.3</logback.version>
185185
<groovy.version>2.5.7</groovy.version>
186+
<assembly.plugin.version>3.1.0</assembly.plugin.version>
187+
<surefire.plugin.version>2.20.1</surefire.plugin.version>
188+
<compiler.plugin.version>3.8.0</compiler.plugin.version>
189+
<groovy.compiler.version>3.3.0-01</groovy.compiler.version>
186190
</properties>
187191

188192
</project>

‎core-groovy-collections/pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
</plugin>
100100
<plugin>
101101
<artifactId>maven-surefire-plugin</artifactId>
102-
<version>2.20.1</version>
102+
<version>${surefire.plugin.version}</version>
103103
<configuration>
104104
<useFile>false</useFile>
105105
<includes>
@@ -126,6 +126,7 @@
126126
<hsqldb.version>2.4.0</hsqldb.version>
127127
<spock-core.version>1.1-groovy-2.4</spock-core.version>
128128
<gmavenplus-plugin.version>1.6</gmavenplus-plugin.version>
129+
<surefire.plugin.version>2.20.1</surefire.plugin.version>
129130
</properties>
130131

131132
</project>

0 commit comments

Comments
 (0)