Skip to content

Commit

Permalink
Updated pom.xml; updated organization, added scm, added spotless, re-…
Browse files Browse the repository at this point in the history 
…ordened. Ran spotless
  • Loading branch information
@Hilbrand
Hilbrand committed Nov 25, 2021
1 parent 8d3c1dc commit d9514c4
Show file tree
Hide file tree
Showing 31 changed files with 569 additions and 90 deletions.
148 changes: 100 additions & 48 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,35 +1,34 @@
<!--
Copyright the State of the Netherlands
Copyright the State of the Netherlands
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see http://www.gnu.org/licenses/.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see http://www.gnu.org/licenses/.
-->
<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/xsd/maven-4.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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>nl.aerius</groupId>
<artifactId>search-parent</artifactId>
<version>1.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>AERIUS Search :: Parent</name>
<name>AERIUS Search</name>
<url>https://www.aerius.nl</url>

<organization>
<name>National Institute for Public Health and the Environment of the Netherlands</name>
<url>https://rivm.nl</url>
<name>State of the Netherlands</name>
<url>https://www.government.nl</url>
</organization>

<licenses>
Expand All @@ -39,6 +38,12 @@
</license>
</licenses>

<scm>
<connection>scm:git:ssh://git@github.com/aerius/search.git</connection>
<developerConnection>scm:git:ssh://git@github.com/aerius/search.git</developerConnection>
<url>https://www.github.com/aerius/search</url>
</scm>

<distributionManagement>
<repository>
<id>aerius-nexus</id>
Expand All @@ -50,70 +55,68 @@
</snapshotRepository>
</distributionManagement>

<scm>
<connection>scm:git:ssh://git@github.com:aerius/search.git</connection>
<developerConnection>scm:git:ssh://git@github.com:aerius/search.git</developerConnection>
</scm>

<repositories>
<repository>
<id>aerius-nexus-public</id>
<name>AERIUS Nexus repository</name>
<url>https://nexus.aerius.nl/repository/maven-public/</url>
<snapshots>
<enabled>true</enabled>
<updatePolicy>always</updatePolicy>
</snapshots>
</repository>
</repositories>

<pluginRepositories>
<pluginRepository>
<id>aerius-nexus-public</id>
<name>AERIUS Nexus Repository</name>
<url>https://nexus.aerius.nl/repository/maven-public/</url>
</pluginRepository>
</pluginRepositories>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>

<gwt-client-common.version>1.2-SNAPSHOT</gwt-client-common.version>
<common-json.version>1.2-SNAPSHOT</common-json.version>

<aerius.gwt-client-common.version>1.2.0</aerius.gwt-client-common.version>
<aerius.gwt-client-common-json.version>1.2.0</aerius.gwt-client-common-json.version>
<maven.compiler.plugin.version>3.8.1</maven.compiler.plugin.version>

<aerius-tools.version>1.1.1</aerius-tools.version>
<spotless.version>2.5.0</spotless.version>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>nl.aerius</groupId>
<artifactId>gwt-client-vue</artifactId>
<version>${gwt-client-common.version}</version>
<version>${aerius.gwt-client-common.version}</version>
<type>gwt-lib</type>
</dependency>
<dependency>
<groupId>nl.aerius</groupId>
<artifactId>gwt-client-common</artifactId>
<version>${gwt-client-common.version}</version>
<version>${aerius.gwt-client-common.version}</version>
<type>gwt-lib</type>
</dependency>
<dependency>
<groupId>nl.aerius</groupId>
<artifactId>gwt-client-common-json</artifactId>
<version>${common-json.version}</version>
<version>${aerius.gwt-client-common-json.version}</version>
<type>gwt-lib</type>
</dependency>
</dependencies>
</dependencyManagement>

<repositories>
<repository>
<id>aerius-nexus-public</id>
<name>AERIUS Nexus repository</name>
<url>https://nexus.aerius.nl/repository/maven-public/</url>
<snapshots>
<enabled>true</enabled>
<updatePolicy>always</updatePolicy>
</snapshots>
</repository>
</repositories>

<pluginRepositories>
<pluginRepository>
<id>aerius-nexus-public</id>
<name>AERIUS Nexus Repository</name>
<url>https://nexus.aerius.nl/repository/maven-public/</url>
</pluginRepository>
</pluginRepositories>


<build>
<pluginManagement>
<plugins>
<plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
<version>3.2.0</version>
</plugin>
Expand Down Expand Up @@ -145,6 +148,55 @@
</compilerArgs>
</configuration>
</plugin>

<plugin>
<groupId>com.diffplug.spotless</groupId>
<artifactId>spotless-maven-plugin</artifactId>
<version>${spotless.version}</version>
<configuration>
<formats>
<format>
<includes>
<include>pom.xml</include>
</includes>
<licenseHeader>
<file>pom-xml-header.txt</file>
<delimiter>&lt;project</delimiter>
</licenseHeader>
<trimTrailingWhitespace />
<endWithNewline />
<eclipseWtp>
<type>XML</type>
<files>
<file>pom-xml.prefs</file>
</files>
</eclipseWtp>
</format>
</formats>
<java>
<includes>
<include>src/*/java/nl/aerius/**/*.java</include>
</includes>
<licenseHeader>
<file>checkstyle-header.txt</file>
</licenseHeader>
<eclipse>
<file>eclipse_code_formatter_profile.xml</file>
</eclipse>
<importOrder>
<file>eclipse.importorder</file>
</importOrder>
</java>
</configuration>

<dependencies>
<dependency>
<groupId>nl.aerius</groupId>
<artifactId>tools</artifactId>
<version>${aerius-tools.version}</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</pluginManagement>
</build>
Expand Down
68 changes: 40 additions & 28 deletions search-client/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
<!--
Copyright the State of the Netherlands
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see http://www.gnu.org/licenses/.
-->
<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
Expand All @@ -11,30 +29,9 @@

<packaging>gwt-lib</packaging>

<repositories>
<repository>
<id>aerius-nexus-public</id>
<name>AERIUS Nexus repository</name>
<url>https://nexus.aerius.nl/repository/maven-public/</url>
<snapshots>
<updatePolicy>always</updatePolicy>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>aerius-nexus-public</id>
<name>AERIUS Nexus Repository</name>
<url>https://nexus.aerius.nl/repository/maven-public/</url>
<snapshots>
<updatePolicy>always</updatePolicy>
</snapshots>
</pluginRepository>
</pluginRepositories>

<properties>
<com.google.gwt.version>2.8.2</com.google.gwt.version>
<vue.version>1.0-beta-10-AERIUS</vue.version>
<vue.version>1.0.1</vue.version>
</properties>

<dependencies>
Expand All @@ -44,12 +41,6 @@
<scope>provided</scope>
<version>${com.google.gwt.version}</version>
</dependency>
<dependency>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-dev</artifactId>
<scope>provided</scope>
<version>${com.google.gwt.version}</version>
</dependency>

<dependency>
<groupId>com.axellience</groupId>
Expand Down Expand Up @@ -92,6 +83,27 @@
</dependency>
</dependencies>

<repositories>
<repository>
<id>aerius-nexus-public</id>
<name>AERIUS Nexus repository</name>
<url>https://nexus.aerius.nl/repository/maven-public/</url>
<snapshots>
<updatePolicy>always</updatePolicy>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>aerius-nexus-public</id>
<name>AERIUS Nexus Repository</name>
<url>https://nexus.aerius.nl/repository/maven-public/</url>
<snapshots>
<updatePolicy>always</updatePolicy>
</snapshots>
</pluginRepository>
</pluginRepositories>

<build>
<plugins>
<plugin>
Expand Down
16 changes: 16 additions & 0 deletions search-client/src/main/java/nl/aerius/search/wui/command/SearchTextCommand.java
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
/*
* Copyright the State of the Netherlands
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see http://www.gnu.org/licenses/.
*/
package nl.aerius.search.wui.command;

import nl.aerius.wui.event.SimpleGenericEvent;
Expand Down
16 changes: 16 additions & 0 deletions search-client/src/main/java/nl/aerius/search/wui/component/MapSearchComponent.java
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
/*
* Copyright the State of the Netherlands
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see http://www.gnu.org/licenses/.
*/
package nl.aerius.search.wui.component;

import java.util.Collection;
Expand Down
16 changes: 16 additions & 0 deletions search-client/src/main/java/nl/aerius/search/wui/component/PopoutSearchComponent.java
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
/*
* Copyright the State of the Netherlands
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see http://www.gnu.org/licenses/.
*/
package nl.aerius.search.wui.component;

import javax.inject.Inject;
Expand Down
Loading

0 comments on commit d9514c4

Please sign in to comment.