Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Esri/geoportal-server-har…
Browse files Browse the repository at this point in the history 
…vester.git
  • Loading branch information
@zguo
zguo committed Nov 13, 2018
2 parents a1dd2be + 0ab6350 commit 11c46d0
Show file tree
Hide file tree
Showing 40 changed files with 41 additions and 41 deletions.
2 changes: 1 addition & 1 deletion geoportal-SDK/geoportal-harvester-api-base/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.esri.geoportal</groupId>
<artifactId>geoportal-SDK</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.6.1</version>
</parent>
<artifactId>harvester-api-base</artifactId>
<name>Esri :: Geoportal Server :: Harvester :: Api Base</name>
Expand Down
4 changes: 2 additions & 2 deletions geoportal-SDK/geoportal-harvester-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
<parent>
<artifactId>geoportal-SDK</artifactId>
<groupId>com.esri.geoportal</groupId>
<version>2.6.1-SNAPSHOT</version>
<version>2.6.1</version>
</parent>
<artifactId>harvester-api</artifactId>
<name>Esri :: Geoportal Server :: Harvester :: Api</name>
<description>Definitions of all basic elements of the Harvester (interfaces, final classes, etc.).</description>
<version>2.6.1-SNAPSHOT</version>
<version>2.6.1</version>
<packaging>jar</packaging>
<dependencies>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion geoportal-SDK/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>geoportal-harvester</artifactId>
<groupId>com.esri.geoportal</groupId>
<version>2.6.1-SNAPSHOT</version>
<version>2.6.1</version>
</parent>
<artifactId>geoportal-SDK</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion geoportal-application/geoportal-harvester-cli/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.esri.geoportal</groupId>
<artifactId>geoportal-application</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.6.1</version>
</parent>
<artifactId>geoportal-harvester-cli</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion geoportal-application/geoportal-harvester-engine/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>geoportal-application</artifactId>
<groupId>com.esri.geoportal</groupId>
<version>2.6.1-SNAPSHOT</version>
<version>2.6.1</version>
</parent>
<artifactId>geoportal-harvester-engine</artifactId>
<name>Esri :: Geoportal Server :: Harvester :: Application :: Engine</name>
Expand Down
2 changes: 1 addition & 1 deletion geoportal-application/geoportal-harvester-war/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>geoportal-application</artifactId>
<groupId>com.esri.geoportal</groupId>
<version>2.6.1-SNAPSHOT</version>
<version>2.6.1</version>
</parent>
<artifactId>geoportal-harvester-war</artifactId>
<packaging>war</packaging>
Expand Down
2 changes: 1 addition & 1 deletion geoportal-application/geoportal-harvester-war/src/main/webapp/hrv/nls/resources.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ define({
},

header: {
caption: "Geoportal Server Harvester ver. 2.6",
caption: "Geoportal Server Harvester ver. 2.6.1",
logout: "Log out"
},

Expand Down
2 changes: 1 addition & 1 deletion geoportal-application/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>geoportal-harvester</artifactId>
<groupId>com.esri.geoportal</groupId>
<version>2.6.1-SNAPSHOT</version>
<version>2.6.1</version>
</parent>
<artifactId>geoportal-application</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion geoportal-commons/geoportal-commons-agp-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.esri.geoportal</groupId>
<artifactId>geoportal-commons</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.6.1</version>
</parent>
<artifactId>geoportal-commons-agp-client</artifactId>
<name>Esri :: Geoportal Server :: Commons :: ArcGIS Portal Client</name>
Expand Down
2 changes: 1 addition & 1 deletion geoportal-commons/geoportal-commons-ags-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.esri.geoportal</groupId>
<artifactId>geoportal-commons</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.6.1</version>
</parent>
<artifactId>geoportal-commons-ags-client</artifactId>
<name>Esri :: Geoportal Server :: Commons :: ArcGIS Server Client</name>
Expand Down
2 changes: 1 addition & 1 deletion geoportal-commons/geoportal-commons-ckan-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.esri.geoportal</groupId>
<artifactId>geoportal-commons</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.6.1</version>
</parent>
<artifactId>geoportal-commons-ckan-client</artifactId>
<name>Esri :: Geoportal Server :: Commons :: CKAN Lightweight Client</name>
Expand Down
2 changes: 1 addition & 1 deletion geoportal-commons/geoportal-commons-constants/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.esri.geoportal</groupId>
<artifactId>geoportal-commons</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.6.1</version>
</parent>
<artifactId>geoportal-commons-constants</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion geoportal-commons/geoportal-commons-csw-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.esri.geoportal</groupId>
<artifactId>geoportal-commons</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.6.1</version>
</parent>
<artifactId>geoportal-commons-csw-client</artifactId>
<name>Esri :: Geoportal Server :: Commons :: Csw Client</name>
Expand Down
2 changes: 1 addition & 1 deletion geoportal-commons/geoportal-commons-doc/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>geoportal-commons</artifactId>
<groupId>com.esri.geoportal</groupId>
<version>2.6.1-SNAPSHOT</version>
<version>2.6.1</version>
</parent>
<artifactId>geoportal-commons-doc</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion geoportal-commons/geoportal-commons-geometry/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.esri.geoportal</groupId>
<artifactId>geoportal-commons</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.6.1</version>
</parent>
<artifactId>geoportal-commons-geometry</artifactId>
<name>Esri :: Geoportal Server :: Commons :: Geometry Utils</name>
Expand Down
2 changes: 1 addition & 1 deletion geoportal-commons/geoportal-commons-gpt-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.esri.geoportal</groupId>
<artifactId>geoportal-commons</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.6.1</version>
</parent>
<artifactId>geoportal-commons-gpt-client</artifactId>
<name>Esri :: Geoportal Server :: Commons :: Geoportal Rest Client</name>
Expand Down
2 changes: 1 addition & 1 deletion geoportal-commons/geoportal-commons-meta/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.esri.geoportal</groupId>
<artifactId>geoportal-commons</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.6.1</version>
</parent>
<artifactId>geoportal-commons-meta</artifactId>
<name>Esri :: Geoportal Server :: Commons :: Meta</name>
Expand Down
2 changes: 1 addition & 1 deletion geoportal-commons/geoportal-commons-oai-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.esri.geoportal</groupId>
<artifactId>geoportal-commons</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.6.1</version>
</parent>
<artifactId>geoportal-commons-oai-client</artifactId>
<name>Esri :: Geoportal Server :: Commons :: OAI-PMH Client</name>
Expand Down
2 changes: 1 addition & 1 deletion geoportal-commons/geoportal-commons-pdf/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>geoportal-commons</artifactId>
<groupId>com.esri.geoportal</groupId>
<version>2.6.1-SNAPSHOT</version>
<version>2.6.1</version>
</parent>
<artifactId>geoportal-commons-pdf</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion geoportal-commons/geoportal-commons-robots/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.esri.geoportal</groupId>
<artifactId>geoportal-commons</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.6.1</version>
</parent>
<artifactId>commons-robots</artifactId>
<name>Esri :: Geoportal Server :: Commons :: Robots</name>
Expand Down
2 changes: 1 addition & 1 deletion geoportal-commons/geoportal-commons-utils/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.esri.geoportal</groupId>
<artifactId>geoportal-commons</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.6.1</version>
</parent>
<artifactId>commons-utils</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion geoportal-commons/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>geoportal-harvester</artifactId>
<groupId>com.esri.geoportal</groupId>
<version>2.6.1-SNAPSHOT</version>
<version>2.6.1</version>
</parent>
<artifactId>geoportal-commons</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion geoportal-connectors/geoportal-harvester-agp-publisher/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.esri.geoportal</groupId>
<artifactId>geoportal-connectors</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.6.1</version>
</parent>
<artifactId>geoportal-harvester-agp-publisher</artifactId>
<name>Esri :: Geoportal Server :: Harvester :: Data Publisher :: ArcGIS Portal</name>
Expand Down
2 changes: 1 addition & 1 deletion geoportal-connectors/geoportal-harvester-agp-source/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.esri.geoportal</groupId>
<artifactId>geoportal-connectors</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.6.1</version>
</parent>
<artifactId>geoportal-harvester-agp-source</artifactId>
<name>Esri :: Geoportal Server :: Harvester :: Data Source :: ArcGIS Portal</name>
Expand Down
2 changes: 1 addition & 1 deletion geoportal-connectors/geoportal-harvester-ags/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.esri.geoportal</groupId>
<artifactId>geoportal-connectors</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.6.1</version>
</parent>
<artifactId>geoportal-harvester-ags</artifactId>
<name>Esri :: Geoportal Server :: Harvester :: Data Source :: ArcGIS Server</name>
Expand Down
2 changes: 1 addition & 1 deletion geoportal-connectors/geoportal-harvester-ckan/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.esri.geoportal</groupId>
<artifactId>geoportal-connectors</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.6.1</version>
</parent>
<artifactId>geoportal-harvester-ckan</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion geoportal-connectors/geoportal-harvester-console/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.esri.geoportal</groupId>
<artifactId>geoportal-connectors</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.6.1</version>
</parent>
<artifactId>geoportal-harvester-console</artifactId>
<name>Esri :: Geoportal Server :: Harvester :: Data Publisher :: Console</name>
Expand Down
2 changes: 1 addition & 1 deletion geoportal-connectors/geoportal-harvester-csw/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.esri.geoportal</groupId>
<artifactId>geoportal-connectors</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.6.1</version>
</parent>
<artifactId>geoportal-harvester-csw</artifactId>
<name>Esri :: Geoportal Server :: Harvester :: Data Source :: Csw</name>
Expand Down
2 changes: 1 addition & 1 deletion geoportal-connectors/geoportal-harvester-folder-big/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.esri.geoportal</groupId>
<artifactId>geoportal-connectors</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.6.1</version>
</parent>
<artifactId>geoportal-harvester-folder-big</artifactId>
<name>Esri :: Geoportal Server :: Harvester :: Data Publisher :: Folder :: Big</name>
Expand Down
2 changes: 1 addition & 1 deletion geoportal-connectors/geoportal-harvester-folder/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.esri.geoportal</groupId>
<artifactId>geoportal-connectors</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.6.1</version>
</parent>
<artifactId>geoportal-harvester-folder</artifactId>
<name>Esri :: Geoportal Server :: Harvester :: Data Publisher :: Folder</name>
Expand Down
2 changes: 1 addition & 1 deletion geoportal-connectors/geoportal-harvester-gpt/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.esri.geoportal</groupId>
<artifactId>geoportal-connectors</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.6.1</version>
</parent>
<artifactId>geoportal-harvester-gpt</artifactId>
<name>Esri :: Geoportal Server :: Harvester :: Data Publisher :: Geoportal Rest</name>
Expand Down
2 changes: 1 addition & 1 deletion geoportal-connectors/geoportal-harvester-gptsrc/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.esri.geoportal</groupId>
<artifactId>geoportal-connectors</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.6.1</version>
</parent>
<artifactId>geoportal-harvester-gptsrc</artifactId>
<name>Esri :: Geoportal Server :: Harvester :: Data Source :: Geoportal Rest</name>
Expand Down
2 changes: 1 addition & 1 deletion geoportal-connectors/geoportal-harvester-jdbc/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.esri.geoportal</groupId>
<artifactId>geoportal-connectors</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.6.1</version>
</parent>
<artifactId>geoportal-harvester-jdbc</artifactId>
<name>Esri :: Geoportal Server :: Harvester :: Data Source :: JDBC</name>
Expand Down
2 changes: 1 addition & 1 deletion geoportal-connectors/geoportal-harvester-migration/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.esri.geoportal</groupId>
<artifactId>geoportal-connectors</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.6.1</version>
</parent>
<artifactId>geoportal-harvester-migration</artifactId>
<name>Esri :: Geoportal Server :: Harvester :: Data Source :: Migration Tool</name>
Expand Down
2 changes: 1 addition & 1 deletion geoportal-connectors/geoportal-harvester-oai-pmh/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.esri.geoportal</groupId>
<artifactId>geoportal-connectors</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.6.1</version>
</parent>
<artifactId>geoportal-harvester-oai-pmh</artifactId>
<name>Esri :: Geoportal Server :: Harvester :: Data Source :: OAI-PMH</name>
Expand Down
2 changes: 1 addition & 1 deletion geoportal-connectors/geoportal-harvester-sink/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.esri.geoportal</groupId>
<artifactId>geoportal-connectors</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.6.1</version>
</parent>
<artifactId>geoportal-harvester-sink</artifactId>
<name>Esri :: Geoportal Server :: Harvester :: Data Source :: Sink</name>
Expand Down
2 changes: 1 addition & 1 deletion geoportal-connectors/geoportal-harvester-unc/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.esri.geoportal</groupId>
<artifactId>geoportal-connectors</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.6.1</version>
</parent>
<artifactId>geoportal-harvester-unc</artifactId>
<name>Esri :: Geoportal Server :: Harvester :: Data Source :: Unc</name>
Expand Down
2 changes: 1 addition & 1 deletion geoportal-connectors/geoportal-harvester-waf/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.esri.geoportal</groupId>
<artifactId>geoportal-connectors</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.6.1</version>
</parent>
<artifactId>geoportal-harvester-waf</artifactId>
<name>Esri :: Geoportal Server :: Harvester :: Data Source :: Waf</name>
Expand Down
2 changes: 1 addition & 1 deletion geoportal-connectors/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>geoportal-harvester</artifactId>
<groupId>com.esri.geoportal</groupId>
<version>2.6.1-SNAPSHOT</version>
<version>2.6.1</version>
</parent>
<artifactId>geoportal-connectors</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.esri.geoportal</groupId>
<artifactId>geoportal-harvester</artifactId>
<version>2.6.1-SNAPSHOT</version>
<version>2.6.1</version>
<packaging>pom</packaging>
<name>Esri :: Geoportal Server :: Harvester</name>
<description>Top-level project for all Harvester modules.</description>
Expand Down

0 comments on commit 11c46d0

Please sign in to comment.