Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change to 3.10-SNAPSHOT #5096

Merged
merged 2 commits into from Jan 28, 2021
Merged

Change to 3.10-SNAPSHOT #5096

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f601ad
Change to 3.10-SNAPSHOT
jodygarnett Oct 19, 2020
75402f3
Change to 3.11-SNAPSHOT - update release shell scripts
josegar74 Jan 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion cachingxslt/pom.xml
View file
Open in desktop
Expand Up @@ -31,7 +31,7 @@
<parent>
<groupId>org.geonetwork-opensource</groupId>
<artifactId>geonetwork</artifactId>
<version>3.10.7-SNAPSHOT</version>
<version>3.10-SNAPSHOT</version>
</parent>


Expand Down
2 changes: 1 addition & 1 deletion common/pom.xml
View file
Open in desktop
Expand Up @@ -31,7 +31,7 @@
<parent>
<groupId>org.geonetwork-opensource</groupId>
<artifactId>geonetwork</artifactId>
<version>3.10.7-SNAPSHOT</version>
<version>3.10-SNAPSHOT</version>
</parent>


Expand Down
6 changes: 3 additions & 3 deletions core/pom.xml
View file
Open in desktop
Expand Up @@ -27,7 +27,7 @@
<parent>
<artifactId>geonetwork</artifactId>
<groupId>org.geonetwork-opensource</groupId>
<version>3.10.7-SNAPSHOT</version>
<version>3.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down Expand Up @@ -430,9 +430,9 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<groupId>org.geonetwork-opensource.schemas</groupId>
<artifactId>schema-iso19139</artifactId>
<version>${gn.schemas.version}</version>
<version>${project.version}</version>
</dependency>
<dependency> <!-- dummy API for ARC SDE stuff -->
<groupId>${project.groupId}</groupId>
Expand Down
2 changes: 1 addition & 1 deletion csw-server/pom.xml
View file
Open in desktop
Expand Up @@ -27,7 +27,7 @@
<parent>
<artifactId>geonetwork</artifactId>
<groupId>org.geonetwork-opensource</groupId>
<version>3.10.7-SNAPSHOT</version>
<version>3.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion docs/pom.xml
View file
Open in desktop
Expand Up @@ -27,7 +27,7 @@
<parent>
<artifactId>geonetwork</artifactId>
<groupId>org.geonetwork-opensource</groupId>
<version>3.10.7-SNAPSHOT</version>
<version>3.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>docs</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion doi/pom.xml
View file
Open in desktop
Expand Up @@ -28,7 +28,7 @@
<parent>
<artifactId>geonetwork</artifactId>
<groupId>org.geonetwork-opensource</groupId>
<version>3.10.7-SNAPSHOT</version>
<version>3.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion domain/pom.xml
View file
Open in desktop
Expand Up @@ -27,7 +27,7 @@
<parent>
<artifactId>geonetwork</artifactId>
<groupId>org.geonetwork-opensource</groupId>
<version>3.10.7-SNAPSHOT</version>
<version>3.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion es/es-core/pom.xml
View file
Open in desktop
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>es</artifactId>
<groupId>org.geonetwork-opensource</groupId>
<version>3.10.7-SNAPSHOT</version>
<version>3.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>es-core</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion es/es-dashboards/pom.xml
View file
Open in desktop
Expand Up @@ -28,7 +28,7 @@
<parent>
<artifactId>es</artifactId>
<groupId>org.geonetwork-opensource</groupId>
<version>3.10.7-SNAPSHOT</version>
<version>3.10-SNAPSHOT</version>
</parent>
<profiles>
<profile>
Expand Down
2 changes: 1 addition & 1 deletion es/pom.xml
View file
Open in desktop
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>geonetwork</artifactId>
<groupId>org.geonetwork-opensource</groupId>
<version>3.10.7-SNAPSHOT</version>
<version>3.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>es</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion events/pom.xml
View file
Open in desktop
Expand Up @@ -28,7 +28,7 @@
<parent>
<artifactId>geonetwork</artifactId>
<groupId>org.geonetwork-opensource</groupId>
<version>3.10.7-SNAPSHOT</version>
<version>3.10-SNAPSHOT</version>
</parent>

<name>GeoNetwork Events</name>
Expand Down
2 changes: 1 addition & 1 deletion harvesters/pom.xml
View file
Open in desktop
Expand Up @@ -27,7 +27,7 @@
<parent>
<artifactId>geonetwork</artifactId>
<groupId>org.geonetwork-opensource</groupId>
<version>3.10.7-SNAPSHOT</version>
<version>3.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion healthmonitor/pom.xml
View file
Open in desktop
Expand Up @@ -27,7 +27,7 @@
<parent>
<artifactId>geonetwork</artifactId>
<groupId>org.geonetwork-opensource</groupId>
<version>3.10.7-SNAPSHOT</version>
<version>3.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion inspire-atom/pom.xml
View file
Open in desktop
Expand Up @@ -28,7 +28,7 @@
<parent>
<artifactId>geonetwork</artifactId>
<groupId>org.geonetwork-opensource</groupId>
<version>3.10.7-SNAPSHOT</version>
<version>3.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion jmeter/pom.xml
View file
Open in desktop
Expand Up @@ -29,7 +29,7 @@
<parent>
<groupId>org.geonetwork-opensource</groupId>
<artifactId>geonetwork</artifactId>
<version>3.10.7-SNAPSHOT</version>
<version>3.10-SNAPSHOT</version>
</parent>
<!-- =========================================================== -->
<!-- Module Description -->
Expand Down
2 changes: 1 addition & 1 deletion listeners/pom.xml
View file
Open in desktop
Expand Up @@ -28,7 +28,7 @@
<parent>
<artifactId>geonetwork</artifactId>
<groupId>org.geonetwork-opensource</groupId>
<version>3.10.7-SNAPSHOT</version>
<version>3.10-SNAPSHOT</version>
</parent>

<name>GeoNetwork Events</name>
Expand Down
2 changes: 1 addition & 1 deletion messaging/pom.xml
View file
Open in desktop
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>geonetwork</artifactId>
<groupId>org.geonetwork-opensource</groupId>
<version>3.10.7-SNAPSHOT</version>
<version>3.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion oaipmh/pom.xml
View file
Open in desktop
Expand Up @@ -30,7 +30,7 @@
<parent>
<groupId>org.geonetwork-opensource</groupId>
<artifactId>geonetwork</artifactId>
<version>3.10.7-SNAPSHOT</version>
<version>3.10-SNAPSHOT</version>
</parent>


Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Expand Up @@ -29,7 +29,7 @@
<groupId>org.geonetwork-opensource</groupId>
<artifactId>geonetwork</artifactId>
<packaging>pom</packaging>
<version>3.10.7-SNAPSHOT</version>
<version>3.10-SNAPSHOT</version>
<name>GeoNetwork opensource</name>
<description>GeoNetwork opensource is a standards based, Free and
Open Source catalog application to manage spatially referenced
Expand Down Expand Up @@ -269,6 +269,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.1.0</version>
<configuration>
<encoding>UTF-8</encoding>
</configuration>
Expand Down Expand Up @@ -1553,6 +1554,5 @@
<xbean.version>3.18</xbean.version>
<jolokia.version>1.6.0</jolokia.version>
<httpcomponents.version>4.5.9</httpcomponents.version>
<gn.schemas.version>3.7</gn.schemas.version>
</properties>
</project>
2 changes: 1 addition & 1 deletion release/pom.xml
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.geonetwork-opensource</groupId>
<artifactId>geonetwork</artifactId>
<version>3.10.7-SNAPSHOT</version>
<version>3.10-SNAPSHOT</version>
</parent>

<artifactId>release</artifactId>
Expand Down
6 changes: 3 additions & 3 deletions schemas-test/pom.xml
View file
Open in desktop
Expand Up @@ -27,7 +27,7 @@
<parent>
<artifactId>geonetwork</artifactId>
<groupId>org.geonetwork-opensource</groupId>
<version>3.10.7-SNAPSHOT</version>
<version>3.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
Expand Down Expand Up @@ -68,9 +68,9 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<groupId>org.geonetwork-opensource.schemas</groupId>
<artifactId>schema-iso19139</artifactId>
<version>${gn.schemas.version}</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
Expand Down
40 changes: 32 additions & 8 deletions schemas/csw-record/pom.xml
View file
Open in desktop
Expand Up @@ -4,18 +4,42 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>schemas</artifactId>
<groupId>org.geonetwork-opensource</groupId>
<version>3.7</version>
<groupId>org.geonetwork-opensource.schemas</groupId>
<version>3.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>schema-csw-record</artifactId>
<name>GeoNetwork schema plugin for Dublin Core records retrieved by CSW</name>

<build>
<resources>
<resource>
<directory>src/main/config/translations</directory>
<targetPath>META-INF/catalog/locales</targetPath>
</resource>
</resources>

<resources>
<resource>
<directory>src/main/config/translations</directory>
<targetPath>META-INF/catalog/locales</targetPath>
</resource>
</resources>

<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<id>plugin-assembly</id>
<phase>package</phase>
<goals><goal>single</goal></goals>
<inherited>false</inherited>
<configuration>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
<descriptor>src/assembly/schema-plugin.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>
</plugins>

</build>

</project>
16 changes: 16 additions & 0 deletions schemas/csw-record/src/assembly/schema-plugin.xml
View file
Open in desktop
@@ -0,0 +1,16 @@
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
<id>plugin</id>
<includeBaseDirectory>false</includeBaseDirectory>
<formats>
<format>zip</format>
</formats>
<fileSets>
<fileSet>
<directory>src/main/plugin/</directory>
<outputDirectory></outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
</fileSet>
</fileSets>
</assembly>
28 changes: 25 additions & 3 deletions schemas/dublin-core/pom.xml
View file
Open in desktop
Expand Up @@ -4,8 +4,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>schemas</artifactId>
<groupId>org.geonetwork-opensource</groupId>
<version>3.7</version>
<groupId>org.geonetwork-opensource.schemas</groupId>
<version>3.10-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -14,7 +14,7 @@

<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<groupId>org.geonetwork-opensource.schemas</groupId>
<artifactId>schema-core</artifactId>
<version>${project.version}</version>
</dependency>
Expand All @@ -30,7 +30,9 @@
<directory>src/main/resources</directory>
</resource>
</resources>

<plugins>

<plugin>
<artifactId>maven-jar-plugin</artifactId>
<executions>
Expand All @@ -42,6 +44,26 @@
</execution>
</executions>
</plugin>

<!-- package up plugin folder as a zip -->
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<id>plugin-assembly</id>
<phase>package</phase>
<goals><goal>single</goal></goals>
<inherited>false</inherited>
<configuration>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
<descriptor>src/assembly/schema-plugin.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>

</plugins>
</build>

Expand Down
16 changes: 16 additions & 0 deletions schemas/dublin-core/src/assembly/schema-plugin.xml
View file
Open in desktop
@@ -0,0 +1,16 @@
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
<id>plugin</id>
<includeBaseDirectory>false</includeBaseDirectory>
<formats>
<format>zip</format>
</formats>
<fileSets>
<fileSet>
<directory>src/main/plugin/</directory>
<outputDirectory></outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
</fileSet>
</fileSets>
</assembly>