Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 7 additions & 5 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,13 @@ jobs:
run: ./mvnw --version
- name: Set up JDK 6
if: ${{ matrix.java == '6'}}
uses: actions/setup-java@v1
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java }}
distribution: temurin
- name: Set up JDK
if: ${{ matrix.java != '6'}}
uses: actions/setup-java@v2
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java }}
distribution: temurin
Expand All @@ -49,11 +50,12 @@ jobs:
- name: Download Maven # Download with default JDK because OpenJDK 6 does not support TLS 1.2
run: ./mvnw --version
- name: Set up JDK
uses: actions/setup-java@v1
uses: actions/setup-java@v4
with:
java-version: 8
distribution: temurin
- name: Publish snapshot artifacts
env:
OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
MAVEN_CENTRAL_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
run: ./mvnw deploy --batch-mode --errors --activate-profiles generate-docs --settings .github/workflows/settings.xml
22 changes: 5 additions & 17 deletions .github/workflows/settings.xml
Original file line number Diff line number Diff line change
@@ -1,22 +1,10 @@
<settings>
<mirrors xmlns="http://maven.apache.org/SETTINGS/1.1.0">
<mirror>
<mirrorOf>central</mirrorOf>
<name>GCS Maven Central mirror</name>
<url>https://maven-central.storage-download.googleapis.com/maven2/</url>
<id>google-maven-central</id>
</mirror>
</mirrors>
<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 https://maven.apache.org/xsd/settings-1.0.0.xsd">
<servers>
<server>
<id>junit-snapshot-repo</id>
<username>${env.OSSRH_USERNAME}</username>
<password>${env.OSSRH_PASSWORD}</password>
</server>
<server>
<id>junit-releases-repo</id>
<username>${env.OSSRH_USERNAME}</username>
<password>${env.OSSRH_PASSWORD}</password>
<id>central-portal</id>
<username>${env.MAVEN_CENTRAL_USERNAME}</username>
<password>${env.MAVEN_CENTRAL_PASSWORD}</password>
</server>
</servers>
</settings>
7 changes: 1 addition & 6 deletions doc/building-junit.txt
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,7 @@ Steps to build junit:
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
<servers>
<server>
<id>junit-snapshot-repo</id>
<username><!--a username registered with Sonatype for deployment--></username>
<password><!--corresponding password--></password>
</server>
<server>
<id>junit-releases-repo</id>
<id>central-portal</id>
<username><!--a username registered with Sonatype for deployment--></username>
<password><!--corresponding password--></password>
</server>
Expand Down
23 changes: 12 additions & 11 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -76,16 +76,6 @@
</ciManagement>
<distributionManagement>
<downloadUrl>https://github.com/junit-team/junit4/wiki/Download-and-Install</downloadUrl>
<snapshotRepository>
<id>junit-snapshot-repo</id>
<name>Nexus Snapshot Repository</name>
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
</snapshotRepository>
<repository>
<id>junit-releases-repo</id>
<name>Nexus Release Repository</name>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
<site>
<id>junit.github.io</id>
<url>gitsite:[email protected]/junit-team/junit4.git</url>
Expand All @@ -101,7 +91,7 @@
<javadocPluginVersion>2.10.3</javadocPluginVersion>
<project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>
<arguments />
<gpg.keyname>67893CC4</gpg.keyname>
<gpg.keyname>FF6E2C001948C5F2F38B0CC385911F425EC61B51</gpg.keyname>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the key I've already been using for the past releases

</properties>

<dependencies>
Expand Down Expand Up @@ -379,6 +369,17 @@
<artifactId>maven-resources-plugin</artifactId>
<version>2.7</version>
</plugin>
<plugin>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
<version>0.7.0</version>
<extensions>true</extensions>
<configuration>
<publishingServerId>central-portal</publishingServerId>
<waitUntil>validated</waitUntil>
<deploymentName>junit-${project.version}</deploymentName>
</configuration>
</plugin>
</plugins>
</build>

Expand Down