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

Pal 1040 push to public nexus #63

Merged
merged 5 commits into from
May 17, 2021
Merged

Pal 1040 push to public nexus #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4ee0a78
PAL-1040-push-to-public-nexus initial commit
dev930018 May 13, 2021
4693fda
PAL-1040 allow pushing artefacts to public nexus
dev930018 May 13, 2021
5fa3128
PAL-1040 push clients artifacts to public nexus
dev930018 May 14, 2021
8d47952
PAL-1040 - Simplified the module poms by moving the release profile t…
ac74475 May 17, 2021
df8527f
PAL-1040 - removed docker file properties from release profile
ac74475 May 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion NOTICES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ List of third-party dependencies grouped by their license type
* spring-boot-starter-test ([org.springframework.boot:spring-boot-starter-test:2.3.1.RELEASE](https://spring.io/projects/spring-boot))
* Spring Shell Starter ([org.springframework.shell:spring-shell-starter:2.0.0.RELEASE](http://projects.spring.io/spring-boot/spring-shell-parent/spring-shell-starter/))
* client-java ([uk.gov.gchq.palisade:client-java:0.5.0-SNAPSHOT](https://github.com/gchq/Palisade-clients/tree/develop/client-java))
* common ([uk.gov.gchq.palisade:common:0.5.0-SNAPSHOT](https://github.com/gchq/Palisade-common))
* GCHQ Palisade Common Library ([uk.gov.gchq.palisade:common:0.5.0-SNAPSHOT](https://github.com/gchq/Palisade-common))

### [Eclipse Public License 1.0](./licenses/eclipse_public_license_1.0.html):
* Logback Classic Module ([ch.qos.logback:logback-classic:1.2.3](http://logback.qos.ch/logback-classic))
Expand Down
19 changes: 19 additions & 0 deletions client-akka/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,30 @@
</parent>
<modelVersion>4.0.0</modelVersion>

<developers>
<developer>
<name>PalisadeDevelopers</name>
<organization>GCHQ</organization>
<organizationUrl>https://github.com/gchq</organizationUrl>
</developer>
</developers>

<!-- *********** Artifact ID *********** -->
<artifactId>client-akka</artifactId>
<url>https://github.com/gchq/Palisade-clients/tree/develop/client-akka</url>
<name>GCHQ Palisade - Akka Client</name>
<description>
The Akka Palisade Client API provides access to a Palisade cluster and exposes an interface using both Java standard-lib types and Akka types.
</description>
<!-- *********** Artifact ID *********** -->

<scm>
<url>${scm.url}</url>
<connection>${scm.connection}</connection>
<developerConnection>${scm.developer.connection}</developerConnection>
<tag>HEAD</tag>
</scm>

<properties>
<!-- Dependency versions -->
<scala.version>2.13</scala.version>
Expand Down
20 changes: 20 additions & 0 deletions client-fuse/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,31 @@
</parent>
<modelVersion>4.0.0</modelVersion>

<developers>
<developer>
<name>PalisadeDevelopers</name>
<organization>GCHQ</organization>
<organizationUrl>https://github.com/gchq</organizationUrl>
</developer>
</developers>

<!-- *********** Artifact ID *********** -->
<artifactId>client-fuse</artifactId>
<url>https://github.com/gchq/Palisade-clients/tree/develop/client-fuse</url>
<name>GCHQ Palisade - Attribute-Masking Service</name>
<description>
The Fuse Palisade Client creates a software-controlled filesystem mount to represent the returned resources and data from a query.
Returned resources, data and metadata are all presented as a FUSE mounted local directory.
</description>
<!-- *********** Artifact ID *********** -->

<scm>
<url>${scm.url}</url>
<connection>${scm.connection}</connection>
<developerConnection>${scm.developer.connection}</developerConnection>
<tag>HEAD</tag>
</scm>

<properties>
<java.version>11</java.version>
<maven.compiler.source>11</maven.compiler.source>
Expand Down
29 changes: 19 additions & 10 deletions client-java/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,42 +27,53 @@
<relativePath>../pom.xml</relativePath>
</parent>

<developers>
<developer>
<name>PalisadeDevelopers</name>
<organization>GCHQ</organization>
<organizationUrl>https://github.com/gchq</organizationUrl>
</developer>
</developers>

<!-- *********** Artifact ID *********** -->
<artifactId>client-java</artifactId>
<name>client-java</name>
<description>Java standalone client</description>
<url>https://github.com/gchq/Palisade-clients/tree/develop/client-java</url>
<name>GCHQ Palisade - Java Client</name>
<description>
The Java Palisade Client API provides access to a Palisade deployment, allowing querying and reading of resources.
</description>
<!-- *********** Artifact ID *********** -->

<scm>
<url>${scm.url}</url>
<connection>${scm.connection}</connection>
<developerConnection>${scm.developer.connection}</developerConnection>
<tag>HEAD</tag>
</scm>

<properties>
<jdk.version>11</jdk.version>
<release.version>11</release.version>

<!-- Runtime Dependency versions -->

<jackson.version>2.11.0</jackson.version>
<rxjava.version>3.0.8</rxjava.version>
<slf4j.version>1.7.26</slf4j.version>

<!-- Provided dependency versions -->

<immutables.version>2.8.2</immutables.version>

<!-- Test dependency versions -->

<micronaut.version>2.3.2</micronaut.version>
<junit.jupiter.version>5.7.0</junit.jupiter.version>
<junit.platform.version>1.7.0</junit.platform.version>
<assertj.version>3.19.0</assertj.version>
<logback.version>1.2.3</logback.version>
<mockito.version>3.7.7</mockito.version>

</properties>

<dependencies>

<!-- RUNTIME -->

<dependency>
<!-- Common types (User, Resource, Context) -->
<groupId>uk.gov.gchq.palisade</groupId>
Expand Down Expand Up @@ -91,7 +102,6 @@
</dependency>

<!-- PROVIDED -->

<dependency>
<groupId>org.immutables</groupId>
<artifactId>value</artifactId>
Expand All @@ -100,7 +110,6 @@
</dependency>

<!-- TEST -->

<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
Expand Down
19 changes: 19 additions & 0 deletions client-shell/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,30 @@
</parent>
<modelVersion>4.0.0</modelVersion>

<developers>
<developer>
<name>PalisadeDevelopers</name>
<organization>GCHQ</organization>
<organizationUrl>https://github.com/gchq</organizationUrl>
</developer>
</developers>

<!-- *********** Artifact ID *********** -->
<artifactId>client-shell</artifactId>
<url>https://github.com/gchq/Palisade-clients/tree/develop/client-shell</url>
<name>GCHQ Palisade - Spring Shell Client</name>
<description>
The Palisade Shell provides a interactive CLI REPL for access to a cluster and its resources.
</description>
<!-- *********** Artifact ID *********** -->

<scm>
<url>${scm.url}</url>
<connection>${scm.connection}</connection>
<developerConnection>${scm.developer.connection}</developerConnection>
<tag>HEAD</tag>
</scm>

<properties>
<!-- Dependency versions -->
<spring.shell.version>2.0.0.RELEASE</spring.shell.version>
Expand Down
128 changes: 121 additions & 7 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<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>

Expand Down Expand Up @@ -43,6 +44,7 @@
<encoding>UTF-8</encoding>
<project.build.sourceEncoding>${encoding}</project.build.sourceEncoding>
<project.reporting.outputEncoding>${encoding}</project.reporting.outputEncoding>
<image.repository/>

<!-- Plugins -->
<compiler.plugin.version>3.8.0</compiler.plugin.version>
Expand All @@ -53,6 +55,13 @@
<surefire.plugin.version>2.22.1</surefire.plugin.version>
<failsafe.version>2.22.1</failsafe.version>

<!-- Release plugin versions -->
<gpg.plugin.version>1.5</gpg.plugin.version>
<nexus.plugin.version>1.6.8</nexus.plugin.version>
<release.plugin.version>2.5.3</release.plugin.version>
<scm.plugin.version>1.1</scm.plugin.version>
<source.plugin.version>3.2.1</source.plugin.version>

<!-- Testing properties -->
<unit-test.skip>false</unit-test.skip>
<component-test.skip>false</component-test.skip>
Expand All @@ -67,6 +76,11 @@
<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
<sonar.jacoco.xmlReportPaths>${project.basedir}/../target/site/jacoco/jacoco.xml</sonar.jacoco.xmlReportPaths>
<sonar.language>java</sonar.language>

<!-- SCM properties for Release plugin -->
<scm.url>https://github.com/gchq/Palisade-common</scm.url>
<scm.connection>scm:git:https://github.com/gchq/Palisade-common.git</scm.connection>
<scm.developer.connection>scm:git:https://github.com/gchq/Palisade-common.git</scm.developer.connection>
</properties>

<modules>
Expand All @@ -88,23 +102,98 @@
<license.skipAggregateDownloadLicenses>true</license.skipAggregateDownloadLicenses>
</properties>
</profile>
<profile>
<id>release</id>
<properties>
<!-- Release configuration -->
<releases.repository.id>ossrh</releases.repository.id>
<releases.repository.name>Sonatype Nexus release repository</releases.repository.name>
<releases.repository.url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</releases.repository.url>
<snapshots.repository.id>ossrh</snapshots.repository.id>
<snapshots.repository.name>Sonatype Nexus snapshot repository</snapshots.repository.name>
<snapshots.repository.url>https://oss.sonatype.org/content/repositories/snapshots</snapshots.repository.url>
<!-- Build configuration for release -->
<revision>RELEASE</revision>
<common.revision>RELEASE</common.revision>
<maven.test.skip>true</maven.test.skip>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>${nexus.plugin.version}</version>
<extensions>true</extensions>
<configuration>
<serverId>${releases.repository.id}</serverId>
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
<autoReleaseAfterClose>false</autoReleaseAfterClose>
<keepStagingRepositoryOnCloseRuleFailure>true
</keepStagingRepositoryOnCloseRuleFailure>
<stagingProgressTimeoutMinutes>10</stagingProgressTimeoutMinutes>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>${source.plugin.version}</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${javadoc.plugin.version}</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>${gpg.plugin.version}</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

<distributionManagement>
<!-- in order to use this, one must have nexus up and running on a given url -->
<repository>
<!-- Snapshot repositories can be build on each commit to develop branch -->
<id>nexus</id>
<name>releases</name>
<id>${releases.repository.id}</id>
<name>${releases.repository.name}</name>
<!--suppress UnresolvedMavenProperty -->
<url>${release.url}</url>
<url>${releases.repository.url}</url>
</repository>
<snapshotRepository>
<!-- Snapshot repositories can be build on each commit to develop branch -->
<id>nexus</id>
<name>snapshots</name>
<id>${snapshots.repository.id}</id>
<uniqueVersion>false</uniqueVersion>
<name>${snapshots.repository.name}</name>
<!--suppress UnresolvedMavenProperty -->
<url>${snapshot.url}</url>
<url>${snapshots.repository.url}</url>
</snapshotRepository>
</distributionManagement>

Expand Down Expand Up @@ -372,6 +461,31 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>1.1.0</version>
<configuration>
<updatePomFile>true</updatePomFile>
<flattenMode>ossrh</flattenMode>
</configuration>
<executions>
<execution>
<id>flatten</id>
<phase>process-resources</phase>
<goals>
<goal>flatten</goal>
</goals>
</execution>
<execution>
<id>flatten.clean</id>
<phase>clean</phase>
<goals>
<goal>clean</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>