Merge branch 'master' of https://github.com/eugenp/tutorials into task/BAEL-20665

# Conflicts:
#	core-java-modules/core-java-jndi/pom.xml
This commit is contained in:
Dhawal Kapil
2020-01-21 20:02:01 +05:30
97 changed files with 1158 additions and 202 deletions

View File

@@ -17,12 +17,12 @@
<dependency>
<groupId>com.baeldung.servicemodule</groupId>
<artifactId>servicemodule</artifactId>
<version>1.0</version>
<version>${servicemodule.version}</version>
</dependency>
<dependency>
<groupId>com.baeldung.providermodule</groupId>
<artifactId>providermodule</artifactId>
<version>1.0</version>
<version>${providermodule.version}</version>
</dependency>
</dependencies>
@@ -34,5 +34,10 @@
</plugin>
</plugins>
</build>
<properties>
<servicemodule.version>1.0</servicemodule.version>
<providermodule.version>1.0</providermodule.version>
</properties>
</project>

View File

@@ -20,14 +20,20 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<version>${compiler.plugin.version}</version>
<configuration>
<source>11</source>
<target>11</target>
<source>${source.version}</source>
<target>${target.version}</target>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
<properties>
<compiler.plugin.version>3.8.0</compiler.plugin.version>
<source.version>11</source.version>
<target.version>11</target.version>
</properties>
</project>

View File

@@ -17,7 +17,7 @@
<dependency>
<groupId>com.baeldung.servicemodule</groupId>
<artifactId>servicemodule</artifactId>
<version>1.0</version>
<version>${servicemodule.version}</version>
</dependency>
</dependencies>
@@ -30,4 +30,9 @@
</plugins>
</build>
<properties>
<servicemodule.version>1.0</servicemodule.version>
</properties>
</project>