Skip to content

Commit

Permalink
DCA11Y-1145 Make project releaseable (#11)
Browse files Browse the repository at this point in the history
* DCA11Y-1145: Update SCM URLs to reflect Atlassian Forks org

* DCA11Y-1145: Remove skipping of deploy plugin

* DCA11Y-1145: Remove Sonatype deploy plugin

* DCA11Y-1145: Remove Javadoc and Source plugin

Our release scripts run this and this will cause warnings

* DCA11Y-1145: Make the Java version consistent

Avoid mixed releases

* DCA11Y-1145: Update the Maven repos

* chore: set version to 0b42a3b for release

* DCA11Y-1145: Add base pom to use artifactory release config

* chore: Make the version settable by Maven version plugin

* DCA11Y-1145: Fix clash with artifactory plugin

As per https://hello.atlassian.net/wiki/spaces/RELENG/pages/967261876/

* DCA11Y-1145: Remove parent POM

Get a 409 when trying to deploy otherwise

* chore: Prepare for release of 1.15.0-atlassian-1-e31f82ca

* chore: Reset version to 1.15.0-atlassian-1-SNAPSHOT

* DCA11Y-1145: Bundle the license
  • Loading branch information
atl-mk authored Sep 30, 2024
1 parent 438e71a commit f877a50
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 81 deletions.
10 changes: 1 addition & 9 deletions frontend-maven-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<dependency>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-plugin-core</artifactId>
<version>${project.parent.version}</version>
<scope>compile</scope>
</dependency>

<dependency>
Expand Down Expand Up @@ -79,14 +79,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
</plugin>
</plugins>
</build>

Expand Down
13 changes: 0 additions & 13 deletions frontend-plugin-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -73,17 +73,4 @@
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
</plugin>
</plugins>
</build>

</project>
100 changes: 41 additions & 59 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<gpg.skip>true</gpg.skip>
<java.version>1.8</java.version>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
</properties>

<name>Frontend Plugins</name>
Expand All @@ -32,9 +30,9 @@
</licenses>

<scm>
<url>https://github.com/atlassian/frontend-maven-plugin</url>
<connection>scm:git:https://github.com/atlassian/frontend-maven-plugin.git</connection>
<developerConnection>scm:git:[email protected]:atlassian/frontend-maven-plugin.git</developerConnection>
<url>https://github.com/atlassian-forks/frontend-maven-plugin</url>
<connection>scm:git:https://github.com/atlassian-forks/frontend-maven-plugin.git</connection>
<developerConnection>scm:git:[email protected]:atlassian-forks/frontend-maven-plugin.git</developerConnection>
</scm>

<developers>
Expand All @@ -50,6 +48,21 @@
<module>frontend-maven-plugin</module>
</modules>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-plugin-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

<build>
<plugins>
<plugin>
Expand All @@ -64,34 +77,6 @@
<goals>deploy</goals>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>3.1.1</version>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.13</version>
<executions>
<execution>
<id>default-deploy</id>
<phase>deploy</phase>
<!-- By default, this is the phase deploy goal will bind to -->
<goals>
<goal>deploy</goal>
</goals>
</execution>
</executions>
<configuration>
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
<serverId>ossrh</serverId>
<autoReleaseAfterClose>true</autoReleaseAfterClose>
</configuration>
</plugin>
</plugins>
<pluginManagement>
<plugins>
Expand All @@ -100,36 +85,33 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<source>${java.version}</source>
<target>${java.version}</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.3.0</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>3.5.0</version>
<configuration>
<source>${maven.compiler.source}</source>
</configuration>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<id>attach-javadocs</id>
<id>copy-license</id>
<phase>process-sources</phase>
<goals>
<goal>jar</goal>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.outputDirectory}/META-INF</outputDirectory>
<overwrite>true</overwrite>
<resources>
<resource>
<directory>${user.dir}</directory>
<includes>
<include>LICENSE</include>
</includes>
<filtering>true</filtering>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
Expand All @@ -139,12 +121,12 @@

<distributionManagement>
<repository>
<id>atlassian-3rdparty</id>
<url>https://maven.atlassian.com/3rdparty</url>
<id>maven-atlassian-com</id>
<url>https://packages.atlassian.com/maven/3rdparty</url>
</repository>
<snapshotRepository>
<id>atlassian-3rdparty-snapshot</id>
<url>https://maven.atlassian.com/3rdparty-snapshot</url>
<id>maven-atlassian-com</id>
<url>https://packages.atlassian.com/maven/3rdparty-snapshot</url>
</snapshotRepository>
</distributionManagement>

Expand Down

0 comments on commit f877a50

Please sign in to comment.