Another attempt at GitHub workflow

open-AIMS · Jan 10, 2022 · 760c1ba · 760c1ba
1 parent 0434a25
commit 760c1ba
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 45 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -24,5 +24,4 @@ jobs:
       - name: Publish to GitHub Packages.
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: mvn -B -e --settings maven-settings.xml deploy:deploy-file -DrepositoryId='github_openaims' -Durl='https://maven.pkg.github.com/open-AIMS/log4j' -DpomFile='pom.xml' -Dfile='jar/log4j-1.2.17-aims2.jar'
-        # run: mvn -B -e --settings maven-settings.xml deploy
+        run: mvn -B -e --settings maven-settings.xml deploy:deploy-file -DrepositoryId='github_openaims' -Durl='https://maven.pkg.github.com/open-AIMS/log4j' -DpomFile='pom.xml' -Dfile='jar/log4j-1.2.17-aims.jar'
diff --git a/jar/log4j-1.2.17-aims2.jar → jar/log4j-1.2.17-aims.jar b/jar/log4j-1.2.17-aims2.jar → jar/log4j-1.2.17-aims.jar
diff --git a/pom.xml b/pom.xml
@@ -6,53 +6,11 @@
 
     <groupId>au.gov.aims</groupId>
     <artifactId>log4j</artifactId>
-    <version>1.2.17-aims2</version>
+    <version>1.2.17-aims</version>
     <packaging>jar</packaging>
     <name>Log4j version 1.2.17-aims</name>
     <description>Log4j version 1.2.17 without the offending class responsible for CVE-2021-4104.</description>
 
-    <!--
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-resources-plugin</artifactId>
-                    <version>3.2.0</version>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <version>3.2.0</version>
-
-                <executions>
-                    <execution>
-                        <id>copy-resource-one</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${basedir}/target</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>jar</directory>
-                                    <includes>
-                                        <include>log4j-1.2.17-aims.jar</include>
-                                    </includes>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-    -->
-
     <distributionManagement>
         <repository>
             <id>github_openaims</id>