Try normal deploy

parttimenerd · Jan 29, 2024 · 6266708 · 6266708
1 parent 99d789c
commit 6266708
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 61 deletions.
diff --git a/.github/workflows/early-access.yml b/.github/workflows/early-access.yml
@@ -58,6 +58,9 @@ jobs:
         with:
           java-version: ${{ env.JAVA_VERSION }}
           distribution: ${{ env.JAVA_DISTRO }}
+          server-id: ossrh
+          server-username: MAVEN_USERNAME
+          server-password: MAVEN_PASSWORD
 
       - name: Cache Maven
         uses: actions/cache@v4
@@ -67,18 +70,19 @@ jobs:
           restore-keys: ${{ runner.os }}-m2
 
       - name: Build
-        run: ./mvnw -ntp -B --file pom.xml verify
+        run: ./mvnw -Ppublication -ntp -B --file pom.xml verify
 
       - name: Deploy
         run: |
           mkdir -p ~/.m2
-          echo "<settings><servers><server><id>ossrh</id><username>${NEXUS2_USERNAME}</username><password>${NEXUS2_PASSWORD}</password></server></servers></settings>" > ~/.m2/settings.xml
+          echo $SETTINGS_FILE > ~/.m2/settings.xml
           mvn -ntp -B clean deploy
         env:
-          NEXUS2_USERNAME: ${{ secrets.JRELEASER_NEXUS2_USERNAME }}
-          NEXUS2_PASSWORD: ${{ secrets.JRELEASER_NEXUS2_PASSWORD }}
+          MAVEN_USERNAME: ${{ secrets.JRELEASER_NEXUS2_USERNAME }}
+          MAVEN_PASSWORD: ${{ secrets.JRELEASER_NEXUS2_PASSWORD }}
           SIGN_KEY_PASS: ${{ secrets.JRELEASER_GPG_PASSPHRASE }}
           SIGN_KEY: ${{ secrets.JRELEASER_GPG_SECRET_KEY }}
           GPG_PUBLIC_KEY: ${{ secrets.JRELEASER_GPG_PUBLIC_KEY }}
           SIGN_KEY_ID: ${{ secrets.GPG_KEY_NAME }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SETTINGS_FILE: ${{ secrets.SETTINGS_FILE }}
diff --git a/bcc/pom.xml b/bcc/pom.xml
@@ -73,36 +73,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <version>2.2.1</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.4.1</version>
-                <executions>
-                    <execution>
-                        <id>attach-javadoc</id>
-                        <phase>deploy</phase>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <additionalJOption>-Xdoclint:none</additionalJOption>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 

diff --git a/pom.xml b/pom.xml
@@ -48,30 +48,6 @@
                     <forkCount>1</forkCount>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <version>2.8.2</version>
-                <executions>
-                    <execution>
-                        <id>default-deploy</id>
-                        <phase>deploy</phase>
-                        <goals>
-                            <goal>deploy</goal>
-                        </goals>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>release</id>
-                        <phase>deploy</phase>
-                        <goals>
-                            <goal>deploy</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 
@@ -84,9 +60,34 @@
             <build>
                 <defaultGoal>deploy</defaultGoal>
                 <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-deploy-plugin</artifactId>
+                        <version>3.1.1</version>
+                        <executions>
+                            <execution>
+                                <id>default-deploy</id>
+                                <phase>deploy</phase>
+                                <goals>
+                                    <goal>deploy</goal>
+                                </goals>
+                                <configuration>
+                                    <skip>true</skip>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>release</id>
+                                <phase>deploy</phase>
+                                <goals>
+                                    <goal>deploy</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
+                        <version>3.6.3</version>
                         <executions>
                             <execution>
                                 <id>attach-javadocs</id>
@@ -97,13 +98,13 @@
                                     <attach>true</attach>
                                     <additionalJOption>-Xdoclint:none</additionalJOption>
                                     <release>21</release>
-                                    <additionalOptions>--enable-preview</additionalOptions>
+                                    <additionalJOption>--enable-preview</additionalJOption>
                                 </configuration>
                             </execution>
                         </executions>
                         <configuration>
                             <release>21</release>
-                            <additionalOptions>--enable-preview</additionalOptions>
+                            <additionalOptions>--enable-preview -Xdoclint:none</additionalOptions>
                         </configuration>
                     </plugin>
                     <plugin>