Release 3.4.8

geoserver · Feb 8, 2021 · 3668fa5 · 3668fa5
1 parent ad4c965
commit 3668fa5
Show file tree

Hide file tree

Showing 29 changed files with 138 additions and 153 deletions.
diff --git a/src/gui/core/plugin/mapsui/pom.xml b/src/gui/core/plugin/mapsui/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.geoserver.geofence</groupId>
 		<artifactId>geofence-gui-plugin</artifactId>
-		<version>3.4-SNAPSHOT</version>
+		<version>3.4.8</version>
 	</parent>
 
 	<groupId>org.geoserver.geofence</groupId>

diff --git a/src/gui/core/plugin/pom.xml b/src/gui/core/plugin/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.geoserver.geofence</groupId>
 		<artifactId>geofence-gui-core</artifactId>
-		<version>3.4-SNAPSHOT</version>
+		<version>3.4.8</version>
 	</parent>
 
 	<groupId>org.geoserver.geofence</groupId>

diff --git a/src/gui/core/plugin/userui/pom.xml b/src/gui/core/plugin/userui/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.geoserver.geofence</groupId>
 		<artifactId>geofence-gui-plugin</artifactId>
-		<version>3.4-SNAPSHOT</version>
+		<version>3.4.8</version>
 	</parent>
 
     <groupId>org.geoserver.geofence</groupId>

diff --git a/src/gui/core/pom.xml b/src/gui/core/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.geoserver.geofence</groupId>
         <artifactId>geofence-gui-root</artifactId>
-        <version>3.4-SNAPSHOT</version>
+        <version>3.4.8</version>
     </parent>
 
     <groupId>org.geoserver.geofence</groupId>

diff --git a/src/gui/core/resources/pom.xml b/src/gui/core/resources/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.geoserver.geofence</groupId>
 		<artifactId>geofence-gui-core</artifactId>
-		<version>3.4-SNAPSHOT</version>
+		<version>3.4.8</version>
 	</parent>
 
 	<groupId>org.geoserver.geofence</groupId>

diff --git a/src/gui/pom.xml b/src/gui/pom.xml
@@ -11,19 +11,19 @@
     <parent>
         <groupId>org.geoserver.geofence</groupId>
         <artifactId>geofence</artifactId>
-        <version>3.4-SNAPSHOT</version>
+        <version>3.4.8</version>
     </parent>
 
     <groupId>org.geoserver.geofence</groupId>
     <artifactId>geofence-gui-root</artifactId>
-    <version>3.4-SNAPSHOT</version>
+    <version>3.4.8</version>
     <packaging>pom</packaging>
 
     <name>GeoFence - GUI</name>
 
     <properties>
         <module.name>geofence-gui</module.name>
-        <geofence-version>3.4-SNAPSHOT</geofence-version>
+        <geofence-version>3.4.8</geofence-version>
         <gt-version>21.4</gt-version>
         <geogwt-version>0.4-SNAPSHOT</geogwt-version>
 

diff --git a/src/gui/web/pom.xml b/src/gui/web/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.geoserver.geofence</groupId>
         <artifactId>geofence-gui-root</artifactId>
-        <version>3.4-SNAPSHOT</version>
+        <version>3.4.8</version>
     </parent>
 
     <groupId>org.geoserver.geofence</groupId>

diff --git a/src/pom.xml b/src/pom.xml
@@ -10,7 +10,7 @@
 
    <groupId>org.geoserver.geofence</groupId>
    <artifactId>geofence</artifactId>
-   <version>3.4-SNAPSHOT</version>
+   <version>3.4.8</version>
    <packaging>pom</packaging>
 
    <properties>

diff --git a/src/samples/csv2geofence/pom.xml b/src/samples/csv2geofence/pom.xml
@@ -12,7 +12,7 @@
 
     <groupId>org.geoserver.geofence.sample</groupId>
     <artifactId>csv2geofence</artifactId>
-    <version>3.4-SNAPSHOT</version>
+    <version>3.4.8</version>
     <packaging>jar</packaging>
 
     <name>csv2geofence</name>

diff --git a/src/services/core/model-external/pom.xml b/src/services/core/model-external/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.geoserver.geofence</groupId>
         <artifactId>geofence-core</artifactId>
-        <version>3.4-SNAPSHOT</version>
+        <version>3.4.8</version>
     </parent>
 
     <groupId>org.geoserver.geofence</groupId>

diff --git a/src/services/core/model/pom.xml b/src/services/core/model/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.geoserver.geofence</groupId>
         <artifactId>geofence-core</artifactId>
-        <version>3.4-SNAPSHOT</version>
+        <version>3.4.8</version>
     </parent>
 
     <groupId>org.geoserver.geofence</groupId>

diff --git a/src/services/core/persistence-pg-test/pom.xml b/src/services/core/persistence-pg-test/pom.xml
@@ -5,16 +5,14 @@
  * application directory.
  */
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" 
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
       <groupId>org.geoserver.geofence</groupId>
       <artifactId>geofence-core</artifactId>
-      <version>3.4-SNAPSHOT</version>
+      <version>3.4.8</version>
    </parent>
 
    <groupId>org.geoserver.geofence</groupId>

diff --git a/src/services/core/persistence/pom.xml b/src/services/core/persistence/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.geoserver.geofence</groupId>
         <artifactId>geofence-core</artifactId>
-        <version>3.4-SNAPSHOT</version>
+        <version>3.4.8</version>
     </parent>
 
     <groupId>org.geoserver.geofence</groupId>

diff --git a/src/services/core/pom.xml b/src/services/core/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.geoserver.geofence</groupId>
         <artifactId>geofence-root</artifactId>
-        <version>3.4-SNAPSHOT</version>
+        <version>3.4.8</version>
     </parent>
 
     <groupId>org.geoserver.geofence</groupId>

diff --git a/src/services/core/services-api/pom.xml b/src/services/core/services-api/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.geoserver.geofence</groupId>
         <artifactId>geofence-core</artifactId>
-        <version>3.4-SNAPSHOT</version>
+        <version>3.4.8</version>
     </parent>
 
     <groupId>org.geoserver.geofence</groupId>

diff --git a/src/services/core/services-impl/pom.xml b/src/services/core/services-impl/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.geoserver.geofence</groupId>
         <artifactId>geofence-core</artifactId>
-        <version>3.4-SNAPSHOT</version>
+        <version>3.4.8</version>
     </parent>
 
     <groupId>org.geoserver.geofence</groupId>

diff --git a/src/services/core/webtest/pom.xml b/src/services/core/webtest/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.geoserver.geofence</groupId>
         <artifactId>geofence-core</artifactId>
-        <version>3.4-SNAPSHOT</version>
+        <version>3.4.8</version>
     </parent>
 
     <groupId>org.geoserver.geofence</groupId>
@@ -57,14 +57,6 @@
             <artifactId>geofence-services-impl</artifactId>
         </dependency>
 
-        <!-- =============================================================== -->
-        <!-- =============================================================== -->
-
-        <dependency>
-            <groupId>org.hibernatespatial</groupId>
-            <artifactId>hibernate-spatial-h2-geodb</artifactId>
-        </dependency>
-
         <!-- =============================================================== -->
         <!-- APACHE COMMONS -->
         <!-- =============================================================== -->
@@ -95,28 +87,6 @@
             <artifactId>log4j</artifactId>
         </dependency>
 
-<!--
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-web</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-jcl</artifactId>
-        </dependency>
--->
         <!-- =============================================================== -->
         <!-- HTTP UTILS -->
         <!-- =============================================================== -->
@@ -187,13 +157,6 @@
         <!-- =============================================================== -->
         <!-- =============================================================== -->
 
-		<!-- SPRING -->
-<!--        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring</artifactId>
-            <version>2.5.6</version>
-        </dependency>
--->
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-beans</artifactId>
@@ -235,90 +198,90 @@
 			<artifactId>spring-webmvc</artifactId>
 		</dependency>
 
-<!--		<dependency>
-           <groupId>org.springframework</groupId>
-           <artifactId>org.springframework.web</artifactId>
-           <version>3.1.1.RELEASE</version>
-		</dependency>-->
-
-<!--		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-expression</artifactId>
-		</dependency>-->
-
-		<!-- SCOPE TEST -->
-<!--		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-test</artifactId>
-			<scope>test</scope>
-			<exclusions>
-				<exclusion>
-					<groupId>commons-collections</groupId>
-					<artifactId>commons-collections</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>xerces</groupId>
-					<artifactId>xercesImpl</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>-->
-
         <!-- =============================================================== -->
         <!-- JUnit -->
         <!-- =============================================================== -->
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.7</version>
 			<scope>test</scope>
 		</dependency>
 
 	</dependencies>
 
-	<build>
-
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<encoding>utf8</encoding>
-					<source>1.6</source>
-					<target>1.6</target>
-				</configuration>
-			</plugin>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-war-plugin</artifactId>
-                <version>2.4</version>
-				<configuration>
-				</configuration>
-			</plugin>
-
-			<!-- Run the application using "mvn jetty:run" -->
-			<plugin>
-				<groupId>org.mortbay.jetty</groupId>
-				<artifactId>maven-jetty-plugin</artifactId>
-				<version>6.1.20</version>
-				<configuration>
-<!--					<webAppSourceDirectory>${basedir}/war</webAppSourceDirectory>-->
-					<webAppConfig>
-						<contextPath>/geofence</contextPath>
-					</webAppConfig>
-					<connectors>
-						<connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
-							<port>9191</port>
-							<maxIdleTime>60000</maxIdleTime>
-						</connector>
-					</connectors>
-					<reload>manual</reload>
-				</configuration>
-			</plugin>
-
-		</plugins>
-
-		<finalName>geofence-web-test</finalName>
-	</build>
+        <profiles>
+           <profile>
+              <id>postgis</id>            
+              <dependencies>
+                 <dependency>
+                    <groupId>org.hibernatespatial</groupId>
+                    <artifactId>hibernate-spatial-postgis</artifactId>
+                 </dependency>
+              </dependencies>
+           </profile>
+           <profile>
+              <id>h2</id>    
+              <activation>
+                 <activeByDefault>true</activeByDefault>
+              </activation>
+              <dependencies>
+                 <dependency>
+                    <groupId>org.hibernatespatial</groupId>
+                    <artifactId>hibernate-spatial-h2-geodb</artifactId>
+                 </dependency>
+                 <dependency>
+                    <groupId>org.opengeo</groupId>
+                    <artifactId>geodb</artifactId>
+                    <version>0.9</version>
+                 </dependency>                
+              </dependencies>
+           </profile>
+        </profiles>
+
+        <build>
+           <finalName>geofence-web-test</finalName>
+
+           <plugins>
+              <plugin>
+                 <groupId>org.apache.maven.plugins</groupId>
+                 <artifactId>maven-compiler-plugin</artifactId>
+                 <configuration>
+                    <encoding>utf8</encoding>
+                    <source>1.6</source>
+                    <target>1.6</target>
+                 </configuration>
+              </plugin>
+
+              <plugin>
+                 <groupId>org.apache.maven.plugins</groupId>
+                 <artifactId>maven-war-plugin</artifactId>
+                 <version>2.4</version>
+                 <configuration>
+                 </configuration>
+              </plugin>
+
+              <!-- Run the application using "mvn jetty:run" -->
+              <plugin>
+                 <groupId>org.mortbay.jetty</groupId>
+                 <artifactId>maven-jetty-plugin</artifactId>
+                 <version>6.1.20</version>
+                 <configuration>
+                    <!--	<webAppSourceDirectory>${basedir}/war</webAppSourceDirectory>-->
+                    <webAppConfig>
+                       <contextPath>/geofence</contextPath>
+                    </webAppConfig>
+                    <connectors>
+                       <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+                          <port>9191</port>
+                          <maxIdleTime>60000</maxIdleTime>
+                       </connector>
+                    </connectors>
+                    <reload>manual</reload>
+                 </configuration>
+              </plugin>
+
+           </plugins>
+
+        </build>
 
 </project>