Update libs and simplify pom

README.md

@@ -25,19 +25,3 @@ See the javadoc overview.html file for more details.
 
 More detailed instructions in the Sakai programmers cafe here:
 https://confluence.sakaiproject.org/display/BOOT/Generic+DAO+package
-
-# Releasing 
-
-This artifact uses the Sonatype plugin for releasing to the OSS Sonatype repository.
-
-   mvn versions:set -DnewVersion=0.10.0
-   git add pom.xml
-   git commit -m "Increment version for release"
-   mvn clean deploy -Prelease
-   git tag 0.10.0
-   git push --tags
-   mvn versions:set -DnewVersion=0.10.1-SNAPSHOT
-   git add pom.xml
-   git commit -m "Increment version for development"
-   git push
-

pom.xml

@@ -5,8 +5,8 @@
 	<artifactId>generic-dao</artifactId>
 	<version>0.12.1-SNAPSHOT</version>
 	<properties>
-		<hibernate.version>5.4.24.Final</hibernate.version>
-		<spring.version>5.3.27</spring.version>
+		<hibernate.version>5.6.15.Final</hibernate.version>
+		<spring.version>5.3.39</spring.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 	<packaging>jar</packaging>
@@ -57,66 +57,47 @@
 			<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
 		</repository>
 	</distributionManagement>
-	<!-- define source code repository location -->
 	<scm>
 		<connection>scm:git:git://github.com/sakaiproject/genericdao.git</connection>
 		<developerConnection>scm:git:[email protected]:sakaiproject/genericdao.git</developerConnection>
 		<url>scm:git:https://github.com/sakaiproject/genericdao</url>
 	</scm>
 	<dependencies>
-		<!-- Spring dependency, you must have the spring jars on your classpath, 
-			Spring version 1.2.8 or higher is required to run this -->
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-core</artifactId>
 			<version>${spring.version}</version>
-			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context</artifactId>
 			<version>${spring.version}</version>
-			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-aop</artifactId>
 			<version>${spring.version}</version>
-			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-tx</artifactId>
 			<version>${spring.version}</version>
-			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-orm</artifactId>
 			<version>${spring.version}</version>
-			<scope>provided</scope>
 		</dependency>
-		<!-- optional Hibernate dependency, you will need to put this jars into 
-			your classpath depending on whether you are using hibernate -->
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-core</artifactId>
 			<version>${hibernate.version}</version>
-			<scope>provided</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.javassist</groupId>
-			<artifactId>javassist</artifactId>
-			<version>3.27.0-GA</version>
-			<scope>provided</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.azeckoski</groupId>
+			<groupId>org.sakaiproject</groupId>
 			<artifactId>reflectutils</artifactId>
-			<version>0.9.20</version>
+			<version>0.9.21</version>
 		</dependency>
-
 		<!-- testing dependencies -->
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -127,14 +108,14 @@
 		<dependency>
 			<groupId>org.hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-			<version>2.7.1</version>
+			<version>2.7.3</version>
 			<type>jar</type>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>mysql</groupId>
-			<artifactId>mysql-connector-java</artifactId>
-			<version>8.0.28</version>
+			<groupId>com.mysql</groupId>
+			<artifactId>mysql-connector-j</artifactId>
+			<version>8.0.33</version>
 			<type>jar</type>
 			<scope>test</scope>
 		</dependency>
@@ -148,130 +129,56 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.13.1</version>
+			<version>4.13.2</version>
 			<type>jar</type>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
 
 	<build>
-		<resources>
-			<!-- include the readme.txt file and the java source files -->
-			<resource>
-				<directory>${basedir}</directory>
-				<includes>
-					<include>README</include>
-					<include>LICENSE</include>
-					<include>src/main/**/*.java</include>
-					<include>src/main/**/*.html</include>
-					<include>src/main/**/*.xml</include>
-					<include>src/main/**/*.properties</include>
-				</includes>
-			</resource>
-		</resources>
-
-		<!-- unit testing -->
+		<sourceDirectory>src/main/java</sourceDirectory>
+		<testSourceDirectory>src/test/java</testSourceDirectory>
+		<testResources>
+			<testResource>
+				<directory>src/test/resources</directory>
+			</testResource>
+		</testResources>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<version>3.0.0-M5</version>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.8.1</version>
+				<artifactId>maven-enforcer-plugin</artifactId>
+				<version>3.5.0</version>
 				<configuration>
-					<source>1.8</source>
-					<target>1.8</target>
+					<rules>
+						<requireJavaVersion>
+							<version>[11,)</version>
+						</requireJavaVersion>
+					</rules>
 				</configuration>
 			</plugin>
 			<plugin>
-				<groupId>org.sonatype.plugins</groupId>
-				<artifactId>nexus-staging-maven-plugin</artifactId>
-				<version>1.6.8</version>
-				<extensions>true</extensions>
-				<configuration>
-					<serverId>ossrh</serverId>
-					<nexusUrl>https://oss.sonatype.org/</nexusUrl>
-					<autoReleaseAfterClose>true</autoReleaseAfterClose>
-				</configuration>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>3.3.1</version>
 			</plugin>
-		</plugins>
-	</build>
-	<profiles>
-		<profile>
-			<id>release</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-javadoc-plugin</artifactId>
-						<version>3.2.0</version>
-                        <configuration>
-                            <doclint>none</doclint>
-                            <failOnError>false</failOnError>
-						</configuration>
-						<executions>
-							<execution>
-								<id>attach-javadocs</id>
-								<goals>
-									<goal>jar</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-source-plugin</artifactId>
-						<version>3.2.1</version>
-						<executions>
-							<execution>
-								<id>attach-sources</id>
-								<goals>
-									<goal>jar</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-gpg-plugin</artifactId>
-						<executions>
-							<execution>
-								<id>sign-artifacts</id>
-								<phase>verify</phase>
-								<goals>
-									<goal>sign</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
-	<!-- define javadocs and jxr docs -->
-	<reporting>
-		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.13.0</version>
 				<configuration>
-					<debug>true</debug>
-					<breakiterator>true</breakiterator>
-					<verbose>true</verbose>
+					<source>11</source>
+					<target>11</target>
 				</configuration>
 			</plugin>
 			<plugin>
-				<!-- jxr source code cross linking -->
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>jxr-maven-plugin</artifactId>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>3.11.2</version>
 				<configuration>
-					<linkJavadoc>true</linkJavadoc>
-					<javadocDir>apidocs</javadocDir>
+					<doclint>none</doclint>
+					<failOnError>false</failOnError>
 				</configuration>
 			</plugin>
 		</plugins>
-	</reporting>
+	</build>
 </project>