Merge pull request #2918 from NielsCharlier/master

taskmanager: fix geoserver-manager dep, back in build
geoserver · Jun 17, 2018 · 42abda3 · 42abda3
2 parents 81bc908 + d3ddff5
commit 42abda3
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 37 deletions.
diff --git a/src/community/pom.xml b/src/community/pom.xml
@@ -87,7 +87,7 @@
           <descriptor>release/ext-status-monitoring.xml</descriptor>
           <descriptor>release/ext-nsg-wmts-profile.xml</descriptor>
           <descriptor>release/ext-nsg-wfs-profile.xml</descriptor>
-          <!--<descriptor>release/ext-taskmanager.xml</descriptor>-->
+          <descriptor>release/ext-taskmanager-core.xml</descriptor>
           <descriptor>release/ext-taskmanager-s3.xml</descriptor>
           <descriptor>release/ext-netcdf-ghrsst.xml</descriptor>
           <descriptor>release/ext-wfs3.xml</descriptor>
@@ -258,7 +258,7 @@
         <module>nsg-profiles/nsg-wfs-profile</module>
         <module>nsg-profiles/nsg-wmts-profile</module>
         <module>netcdf-ghrsst</module>
-        <!--<module>taskmanager</module>-->
+        <module>taskmanager</module>
         <module>wfs3</module>
         <module>monitor-hibernate</module>
       </modules>

diff --git a/src/community/release/ext-taskmanager.xml → ...ommunity/release/ext-taskmanager-core.xml b/src/community/release/ext-taskmanager.xml → ...ommunity/release/ext-taskmanager-core.xml
@@ -1,5 +1,5 @@
 <assembly>
-  <id>taskmanager-plugin</id>
+  <id>taskmanager-core-plugin</id>
   <formats>
     <format>zip</format>
   </formats>
@@ -11,7 +11,9 @@
       <includes>
         <include>gs-taskmanager-core*.jar</include>
         <include>*geoserver-manager*.jar</include>
-        <include>*hibernate*.jar</include>
+        <include>hibernate-core*.jar</include>
+        <include>hibernate-commons*.jar</include>
+        <include>hibernate-jpa*.jar</include>
         <include>*quartz*.jar</include>
         <include>*postgis*.jar</include>
       </includes>

diff --git a/src/community/release/pom.xml b/src/community/release/pom.xml
@@ -313,7 +313,7 @@
     <artifactId>gs-monitor-hibernate</artifactId>
     <version>${project.version}</version>
    </dependency>
-   <!--<dependency>
+   <dependency>
      <groupId>org.geoserver.community</groupId>
      <artifactId>gs-taskmanager-core</artifactId>
      <version>${project.version}</version>
@@ -323,12 +323,6 @@
      <artifactId>gs-taskmanager-s3</artifactId>
      <version>${project.version}</version>
    </dependency>   
-   <dependency>
-     <groupId>it.geosolutions</groupId>
-     <artifactId>geoserver-manager</artifactId>
-     <version>1.8-dov-0.3</version>
-     <scope>compile</scope>
-   </dependency>-->
  </dependencies>
  <build>
   <plugins>

diff --git a/src/community/taskmanager/pom.xml b/src/community/taskmanager/pom.xml
@@ -19,9 +19,9 @@
 
     <dependencies>
         <dependency>
-            <groupId>it.geosolutions</groupId>
+            <groupId>com.github.dov-vlaanderen</groupId>
             <artifactId>geoserver-manager</artifactId>
-            <version>1.8-dov-0.3</version>
+            <version>1.8</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
@@ -30,29 +30,5 @@
         <module>core</module>
         <module>s3</module>
     </modules>
-
-    <repositories>
-      <repository>
-       <id>boundless</id>
-       <name>Boundless Maven Repository</name>
-       <url>https://repo.boundlessgeo.com/main/</url>
-       <snapshots>
-         <enabled>true</enabled>
-       </snapshots>
-       <releases>
-         <enabled>true</enabled>
-       </releases>
-      </repository>  
-      <repository>
-        <id>osgeo</id>
-        <name>Open Source Geospatial Foundation Repository</name>
-        <url>http://download.osgeo.org/webdav/geotools/</url>
-      </repository>
-      <repository>
-       <id>acd</id>
-       <name>ACD Maven Repository</name>
-       <url>https://www.milieuinfo.be/artifactory/acd</url>
-     </repository>
-   </repositories>
 
 </project>