iSharkFly-Docs
/
java-tutorials
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resolve merge conflicts

This commit is contained in:
amit.pandey 2020-01-30 02:39:31 +05:30
parent 4abba35a7a 64aaaebb04
commit fb58191295
22 changed files with 97 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core-groovy-2/pom.xml
View File

@ -77,7 +77,7 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-eclipse-compiler</artifactId>
<version>3.3.0-01</version>
<version>${groovy.compiler.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>

3
core-java-modules/core-java-11/pom.xml
View File

@ -65,7 +65,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.2.1</version>
<version>${shade.plugin.version}</version>
<executions>
<execution>
<phase>package</phase>
@ -109,6 +109,7 @@
<uberjar.name>benchmarks</uberjar.name>
<jmh.version>1.22</jmh.version>
<eclipse.collections.version>10.0.0</eclipse.collections.version>
<shade.plugin.version>10.0.0</shade.plugin.version>
</properties>
</project>

6
data-structures/pom.xml
View File

@ -23,7 +23,7 @@
<dependency>
<groupId>com.leansoft</groupId>
<artifactId>bigqueue</artifactId>
<version>0.7.0</version>
<version>${bigqueue.version}</version>
</dependency>
</dependencies>
@ -39,4 +39,8 @@
</pluginManagement>
</build>
<properties>
<bigqueue.version>0.7.0</bigqueue.version>
</properties>
</project>

8
ethereum/pom.xml
View File

@ -177,8 +177,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>${compiler.plugin.version}</version>
<configuration>
<source>${source.version}</source>
<target>${target.version}</target>
<source>${java.version}</source>
<target>${java.version}</target>
</configuration>
</plugin>
<plugin>
@ -189,7 +189,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>3.0.0</version>
<version>${maven-war-plugin.version}</version>
<configuration>
<warSourceDirectory>src/main/webapp</warSourceDirectory>
<failOnMissingWebXml>false</failOnMissingWebXml>
@ -216,7 +216,5 @@
<slf4j.version>1.7.25</slf4j.version>
<spring-boot-maven-plugin.version>2.0.4.RELEASE</spring-boot-maven-plugin.version>
<compiler.plugin.version>3.1</compiler.plugin.version>
<source.version>1.8</source.version>
<target.version>1.8</target.version>
</properties>
</project>

6
java-numbers-3/pom.xml
View File

@ -17,7 +17,7 @@
<dependency>
<groupId>it.unimi.dsi</groupId>
<artifactId>dsiutils</artifactId>
<version>2.6.0</version>
<version>${dsiutils.version}</version>
</dependency>
</dependencies>
@ -31,4 +31,8 @@
</resources>
</build>
<properties>
<dsiutils.version>2.6.0</dsiutils.version>
</properties>
</project>

3
jhipster/jhipster-uaa/quotes/pom.xml
View File

@ -232,7 +232,7 @@
<dependency>
<groupId>org.zalando</groupId>
<artifactId>problem-spring-web</artifactId>
<version>0.24.0-RC.0</version>
<version>${zalando.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.security.oauth</groupId>
@ -910,5 +910,6 @@
<sonar.tests>${project.basedir}/src/test/</sonar.tests>
<!-- jhipster-needle-maven-property -->
<zalando.version>0.24.0-RC.0</zalando.version>
</properties>
</project>

3
kotlin-libraries-2/pom.xml
View File

@ -21,7 +21,7 @@
<dependency>
<groupId>io.reactivex.rxjava2</groupId>
<artifactId>rxkotlin</artifactId>
<version>2.3.0</version>
<version>${rxkotlin.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@ -86,6 +86,7 @@
<guava.version>27.1-jre</guava.version>
<mockk.version>1.9.3</mockk.version>
<kotlinx-collections-immutable.version>0.1</kotlinx-collections-immutable.version>
<rxkotlin.version>2.3.0</rxkotlin.version>
</properties>
</project>

3
kotlin-quasar/pom.xml
View File

@ -48,7 +48,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<version>${junit.version}</version>
</dependency>
<!-- logging -->
<dependency>
@ -148,6 +148,7 @@
<dependency.plugin.version>3.1.1</dependency.plugin.version>
<surefire.plugin.version>2.22.1</surefire.plugin.version>
<exec.plugin.version>1.3.2</exec.plugin.version>
<junit.version>4.12</junit.version>
</properties>
</project>

6
maven-all/profiles/pom.xml
View File

@ -73,7 +73,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-help-plugin</artifactId>
<version>3.2.0</version>
<version>${help.plugin.version}</version>
<executions>
<execution>
<id>show-profiles</id>
@ -87,4 +87,8 @@
</plugins>
</build>
<properties>
<help.plugin.version>3.2.0</help.plugin.version>
</properties>
</project>

3
maven-all/versions-maven-plugin/original/pom.xml
View File

@ -46,7 +46,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>2.7</version>
<version>${versions.plugin.version}</version>
<configuration>
<excludes>
<exclude>org.apache.commons:commons-collections4</exclude>
@ -76,6 +76,7 @@
<commons-collections4.version>4.0</commons-collections4.version>
<commons-lang3.version>3.0</commons-lang3.version>
<commons-beanutils.version>1.9.1</commons-beanutils.version>
<versions.plugin.version>2.7</versions.plugin.version>
</properties>
</project>

18
ninja/pom.xml
View File

@ -16,6 +16,12 @@
<bootstrap.version>3.3.4</bootstrap.version>
<jquery.version>2.1.3</jquery.version>
<h2.version>1.4.186</h2.version>
<compiler.plugin.version>3.2</compiler.plugin.version>
<source.version>1.8</source.version>
<target.version>1.8</target.version>
<enforcer.plugin.version>1.3.1</enforcer.plugin.version>
<deploy.plugin.version>2.8.2</deploy.plugin.version>
<shade.plugin.version>2.2</shade.plugin.version>
</properties>
<build>
@ -23,16 +29,16 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.2</version>
<version>${compiler.plugin.version}</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<source>${source.version}</source>
<target>${target.version}</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>1.3.1</version>
<version>${enforcer.plugin.version}</version>
<executions>
<execution>
<id>enforce-banned-dependencies</id>
@ -95,7 +101,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.2</version>
<version>${deploy.plugin.version}</version>
<configuration>
<skip>true</skip>
</configuration>
@ -103,7 +109,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>2.2</version>
<version>${shade.plugin.version}</version>
<configuration>
<createDependencyReducedPom>true</createDependencyReducedPom>
<filters>

3
parent-kotlin/pom.xml
View File

@ -45,7 +45,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.2.0.M4</version>
<version>${boot.dependencies.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@ -215,6 +215,7 @@
<ktor.io.version>0.9.5</ktor.io.version>
<assertj.version>3.12.0</assertj.version>
<junit.platform.version>1.3.2</junit.platform.version>
<boot.dependencies.version>2.2.0.M4</boot.dependencies.version>
</properties>
</project>

29
performance-tests/pom.xml
View File

@ -38,7 +38,7 @@
<dependency>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct-processor</artifactId>
<version>1.2.0.Final</version>
<version>${mapstruct-jdk8.version}</version>
<scope>provided</scope>
</dependency>
@ -93,6 +93,15 @@
Name of the benchmark Uber-JAR to generate.
-->
<uberjar.name>benchmarks</uberjar.name>
<compiler.plugin.version>3.1</compiler.plugin.version>
<shade.plugin.version>2.2</shade.plugin.version>
<install.version>2.5.1</install.version>
<jar.plugin.version>2.4</jar.plugin.version>
<javadoc.plugin.version>2.9.1</javadoc.plugin.version>
<resources.plugin.version>2.6</resources.plugin.version>
<site.plugin.version>3.3</site.plugin.version>
<source.plugin.version>2.2.1</source.plugin.version>
<surefire.plugin.version>2.17</surefire.plugin.version>
</properties>
<build>
@ -100,7 +109,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<version>${compiler.plugin.version}</version>
<configuration>
<compilerVersion>${javac.target}</compilerVersion>
<source>${javac.target}</source>
@ -117,7 +126,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>2.2</version>
<version>${shade.plugin.version}</version>
<executions>
<execution>
<phase>package</phase>
@ -162,31 +171,31 @@
</plugin>
<plugin>
<artifactId>maven-install-plugin</artifactId>
<version>2.5.1</version>
<version>${install.version}</version>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
<version>${jar.plugin.version}</version>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version>
<version>${javadoc.plugin.version}</version>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
<version>${resources.plugin.version}</version>
</plugin>
<plugin>
<artifactId>maven-site-plugin</artifactId>
<version>3.3</version>
<version>${site.plugin.version}</version>
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
<version>2.2.1</version>
<version>${source.plugin.version}</version>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.17</version>
<version>${surefire.plugin.version}</version>
</plugin>
</plugins>
</pluginManagement>

9
persistence-modules/hibernate5-2/pom.xml
View File

@ -54,9 +54,9 @@
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${commons-lang3.version}</version>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${commons.lang3.version}</version>
</dependency>
</dependencies>
@ -66,6 +66,9 @@
<commons-lang3.version>3.8.1</commons-lang3.version>
<maven.deploy.skip>true</maven.deploy.skip>
<spring-boot.version>2.1.7.RELEASE</spring-boot.version>
<hibernate.core.version>5.4.7.Final</hibernate.core.version>
<h2.version>1.4.200</h2.version>
<commons.lang3.version>3.8.1</commons.lang3.version>
</properties>
</project>

2
persistence-modules/jnosql/jnosql-diana/pom.xml
View File

@ -55,7 +55,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.6.0</version>
<version>${exec-maven-plugin.version}</version>
<executions>
<execution>
<id>document</id>

6
persistence-modules/sirix/pom.xml
View File

@ -30,7 +30,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<version>${compiler.plugin.version}</version>
<configuration>
<release>${maven.release.version}</release>
<encoding>${project.build.sourceEncoding}</encoding>
@ -39,7 +39,7 @@
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>6.1</version> <!-- Use newer version of ASM -->
<version>${asm.version}</version> <!-- Use newer version of ASM -->
</dependency>
</dependencies>
</plugin>
@ -50,6 +50,8 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.release.version>11</maven.release.version>
<sirix-core.version>0.9.3</sirix-core.version>
<compiler.plugin.version>3.8.0</compiler.plugin.version>
<asm.version>6.1</asm.version>
</properties>
</project>

3
persistence-modules/spring-boot-persistence-2/pom.xml
View File

@ -20,7 +20,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.1.8.RELEASE</version>
<version>${spring.boot.dependencies}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@ -95,6 +95,7 @@
<properties>
<jdbi.version>3.9.1</jdbi.version>
<spring.boot.dependencies>2.1.8.RELEASE</spring.boot.dependencies>
</properties>
</project>

3
persistence-modules/spring-data-geode/pom.xml
View File

@ -17,7 +17,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
<version>${spring-boot-version}</version>
<version>${spring.boot.starter.version}</version>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
@ -88,6 +88,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<start-class>com.baeldung.springdatageode.app.ClientCacheApp</start-class>
<spring-geode-starter-version>1.1.1.RELEASE</spring-geode-starter-version>
<spring.boot.starter.version>2.1.9.RELEASE</spring.boot.starter.version>
</properties>
</project>

6
quarkus-extension/quarkus-liquibase/deployment/pom.xml
View File

@ -40,7 +40,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<version>${compiler.plugin.version}</version>
<configuration>
<annotationProcessorPaths>
<path>
@ -54,4 +54,8 @@
</plugins>
</build>
<properties>
<compiler.plugin.version>3.8.1</compiler.plugin.version>
</properties>
</project>

4
quarkus-extension/quarkus-liquibase/runtime/pom.xml
View File

@ -50,7 +50,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<version>${compiler.plugin.version}</version>
<configuration>
<annotationProcessorPaths>
<path>
@ -66,6 +66,8 @@
<properties>
<liquibase-core.version>3.8.1</liquibase-core.version>
<compiler.plugin.version>3.8.1</compiler.plugin.version>
<liquibase.version>3.8.1</liquibase.version>
</properties>
</project>

10
spf4j/spf4j-aspects-app/pom.xml
View File

@ -39,16 +39,16 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<version>${compiler.plugin.version}</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<source>${java.version}</source>
<target>${java.version}</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.1.1</version>
<version>${dependency.plugin.version}</version>
<executions>
<execution>
<id>copy-dependencies</id>
@ -84,6 +84,8 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spf4j.version>8.6.10</spf4j.version>
<org.slf4j.version>1.7.21</org.slf4j.version>
<compiler.plugin.version>3.8.0</compiler.plugin.version>
<dependency.plugin.version>3.1.1</dependency.plugin.version>
</properties>
</project>

10
spf4j/spf4j-core-app/pom.xml
View File

@ -39,16 +39,16 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<version>${compiler.plugin.version}</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<source>${java.version}</source>
<target>${java.version}</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.1.1</version>
<version>${dependency.plugin.version}</version>
<executions>
<execution>
<id>copy-dependencies</id>
@ -84,6 +84,8 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spf4j.version>8.6.10</spf4j.version>
<org.slf4j.version>1.7.21</org.slf4j.version>
<compiler.plugin.version>3.8.0</compiler.plugin.version>
<dependency.plugin.version>3.1.1</dependency.plugin.version>
</properties>
</project>