From 477188c28c4296a8372578cfca9833034918f46c Mon Sep 17 00:00:00 2001
From: michaeloffner <michaeloffner@users.noreply.github.com>
Date: Thu, 20 Jun 2024 22:46:50 +0200
Subject: [PATCH] add maven deployment

---
 .github/workflows/main.yml |  43 ++++++-
 .gitignore                 |   2 +-
 build.number               |   3 -
 build.properties           |  10 --
 build.xml                  |  75 ++++-------
 maven-settings.xml         |  27 ++++
 pom.xml                    | 253 +++++++++++++++++++++++++++++++++++++
 source/fld/function.fld    |   1 -
 8 files changed, 344 insertions(+), 70 deletions(-)
 delete mode 100644 build.number
 delete mode 100644 build.properties
 create mode 100755 maven-settings.xml
 create mode 100644 pom.xml

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 4fe0416..0ce9dc7 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -34,8 +34,14 @@ jobs:
       with:
         path: ~/work/_actions/lucee/script-runner/main/lucee-download-cache
         key: lucee-downloads
-    - name: Build extension-s3 with Ant
-      run: ant -noinput -verbose -buildfile build.xml
+    - name: Build and Install with Maven
+        env:
+          MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
+          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
+          GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+        run: |
+          echo "------- Maven Install -------";
+          mvn -B -e -f pom.xml clean install 
     - name: Upload Artifact
       uses: actions/upload-artifact@v4
       with:
@@ -76,3 +82,36 @@ jobs:
         S3_GOOGLE_SECRET_KEY: ${{ secrets.S3_GOOGLE_SECRET_KEY }}
         S3_GOOGLE_HOST: storage.googleapis.com
         S3_GOOGLE_BUCKET_PREFIX: lucee-ldev-e-
+    - name: Cache Maven packages
+      uses: actions/cache@v2
+      with:
+        path: ~/.m2
+        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+        restore-keys: |
+          ${{ runner.os }}-maven-
+
+    - name: Extract version number
+      id: extract-version
+      run: |
+        VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
+        echo "VERSION=$VERSION" >> $GITHUB_ENV
+
+    - name: Import GPG key
+      run: |
+        echo "$GPG_PRIVATE_KEY" | base64 --decode | gpg --batch --import
+      env:
+        GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
+
+    - name: Build and Deploy with Maven
+      env:
+        MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
+        MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
+        GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+      run: |
+        if [[ "$VERSION" == *-SNAPSHOT ]]; then
+          echo "------- Maven Deploy snapshot on ${{ github.event_name }} -------";
+          mvn -B -e -f pom.xml clean deploy --settings maven-settings.xml
+        else
+          echo "------- Maven Deploy release on ${{ github.event_name }} -------";
+          mvn -B -e -f pom.xml clean deploy -DperformRelease=true --settings maven-settings.xml
+        fi
diff --git a/.gitignore b/.gitignore
index ef59bb6..32aeee0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-/dist
+/target
 **/Test.java
 **/TestCase.java
 **/.DS_Store
diff --git a/build.number b/build.number
deleted file mode 100644
index ab49974..0000000
--- a/build.number
+++ /dev/null
@@ -1,3 +0,0 @@
-#Build Number for ANT. Do not edit!
-#Mon Jun 17 22:27:19 CEST 2024
-build.number=18
diff --git a/build.properties b/build.properties
deleted file mode 100644
index d337837..0000000
--- a/build.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-bundlename: s3.extension
-filename: s3-extension
-bundleversion: 2.0.2.
-id: 17AB52DE-B300-A94B-E058BD978511E39E
-luceeCoreVersion: 5.0.0.157
-releaseType: server
-appendix: -SNAPSHOT
-label: S3 Resource Extension
-description: Core Extension to integrate Amazon Simple Storage Service (S3) Resource into Lucee.
-class: org.lucee.extension.resource.s3.S3ResourceProvider
\ No newline at end of file
diff --git a/build.xml b/build.xml
index 1dedd49..87f6cc3 100644
--- a/build.xml
+++ b/build.xml
@@ -1,43 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project default="clean" basedir="." name="formtag-extension">
+<project default="clean" basedir="." name="s3-extension">
 	<description>
-        Build Form Extension
+        Build S3 Extension
     </description>
     <!-- set global properties for this build -->
   
-  <property file="build.properties"/>
-
   <property name="lib" location="source/java/libs"/>
   <property name="src" location="source/java/src"/>
   <property name="srcImg" location="source/images"/>
   <property name="temp" location="temp"/>
   <property name="build" location="build"/>
-  <property name="dist"  location="dist"/>
+  <property name="dist"  location="target"/>
 
   <property name="tld" location="source/tld"/>
   <property name="fld" location="source/fld"/>
   
 
-  
-  <buildnumber file="build.number"/>
-
-  <scriptdef name="replace" language="javascript">
-     <attribute name="haystack" />
-     <attribute name="needle" />
-     <attribute name="repl" />
-     <attribute name="property" />
-     <![CDATA[
-      var text = attributes.get("haystack");
-      var needle = attributes.get("needle");
-      var repl = attributes.get("repl");
-      text=text.trim();
-
-      var regex = new RegExp(needle,'g');
-      text=text.replace(regex,repl);
-      project.setProperty(attributes.get("property"), text);
-     ]]>
-  </scriptdef>
-
   <path id="classpath">
     <fileset dir="${lib}">
       <include name="**/*.jar" />
@@ -77,14 +55,14 @@
 
     <echo file="${dist}/extension/META-INF/MANIFEST.MF">Manifest-Version: 1.0
 Built-Date: ${NOW}
-version: "${bundleversion}${build.number}${appendix}"
+version: "${bundleversion}"
 id: "${id}"
 name: "${label}"
 description: "${description}"
 lucee-core-version: "${luceeCoreVersion}"
 release-type: ${releaseType}
 start-bundles: false
-resource: "[{'class':'${class}','bundleName':'${bundlename}','bundleVersion':'${bundleversion}${build.number}${appendix}','scheme':'s3','lock-timeout':'10000'}]"
+resource: "[{'class':'${class}','bundleName':'${bundlename}','bundleVersion':'${bundleversion}','scheme':'s3','lock-timeout':'10000'}]"
 </echo>
   </target>
   
@@ -104,9 +82,9 @@ resource: "[{'class':'${class}','bundleName':'${bundlename}','bundleVersion':'${
  
     <!-- Put everything in ${build} into .jar file -->
     <jar 
-    	jarfile="${dist}/extension/jars/${filename}-${bundleversion}${build.number}${appendix}.jar" basedir="${build}"  manifest="${src}/META-INF/MANIFEST.MF">
+    	jarfile="${dist}/extension/jars/${bundlename}-${bundleversion}.jar" basedir="${build}"  manifest="${src}/META-INF/MANIFEST.MF">
       <manifest>
-        <attribute name="Bundle-Version" value="${bundleversion}${build.number}${appendix}"/>
+        <attribute name="Bundle-Version" value="${bundleversion}"/>
         <attribute name="Built-Date" value="${NOW}"/>
         <attribute name="Bundle-SymbolicName" value="${bundlename}"/>
 
@@ -114,28 +92,18 @@ resource: "[{'class':'${class}','bundleName':'${bundlename}','bundleVersion':'${
     </jar>
 
 
-
-    <!-- copy the tlds necessary 
-    <loadfile property="content1" srcFile="${tld}/tag.tld" />
-    <replace haystack="${content1}" needle="{bundle-name}" repl="${bundlename}" property="content2"/>
-    <replace haystack="${content2}" needle="{bundle-version}" repl="${bundleversion}${build.number}${appendix}" property="content3"/>
-    <echo message="${content3}" file="${dist}/extension/tlds/pdftag.tld"/>
-    -->
-
     <!-- copy the flds necessary -->
-    <loadfile property="c1" srcFile="${fld}/function.fld" />
-    <replace haystack="${c1}" needle="{bundle-name}" repl="${bundlename}" property="c2"/>
-    <replace haystack="${c2}" needle="{bundle-version}" repl="${bundleversion}${build.number}${appendix}" property="c3"/>
-    <echo message="${c3}" file="${dist}/extension/flds/s3-functions.fld"/>
-
-
-
-    <!-- copy the context necessary
-    <copy todir="${dist}/extension/webcontexts">
-      <fileset dir="${context}">
-        <include name="**/*.*"/>
-      </fileset>
-    </copy> -->
+    <copy file="${fld}/function.fld" tofile="${dist}/extension/flds/s3-functions.fld" />
+    <replaceregexp 
+      file="${dist}/extension/flds/s3-functions.fld" 
+      match="\{bundle-name\}" 
+      replace="${bundlename}" 
+      byline="true"/>
+    <replaceregexp 
+      file="${dist}/extension/flds/s3-functions.fld" 
+      match="\{bundle-version\}" 
+      replace="${bundleversion}" 
+      byline="true"/>
 
     <!-- copy the jars necessary -->
     <copy todir="${dist}/extension/jars">
@@ -166,7 +134,7 @@ resource: "[{'class':'${class}','bundleName':'${bundlename}','bundleVersion':'${
 
 
     <!-- Zip everything  -->
-     <zip destfile="${dist}/${filename}-${bundleversion}${build.number}${appendix}.lex">
+     <zip destfile="${dist}/${filename}-${bundleversion}.lex">
         <zipfileset dir="${dist}/extension"/>
     </zip>
 		
@@ -174,8 +142,9 @@ resource: "[{'class':'${class}','bundleName':'${bundlename}','bundleVersion':'${
 
 	<target name="clean"  depends="dist" description="clean up" >
 		<!-- Delete the ${build} and ${dist} directory trees -->
-		<delete dir="${build}"/>
-		<delete dir="${temp}"/>
+		<delete dir="${dist}/extension"/>
+    <delete dir="${build}"/>
+    <delete dir="${temp}"/>
 	</target>
 
 </project>
\ No newline at end of file
diff --git a/maven-settings.xml b/maven-settings.xml
new file mode 100755
index 0000000..3647539
--- /dev/null
+++ b/maven-settings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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 http://maven.apache.org/xsd/settings-1.0.0.xsd">
+  <pluginGroups></pluginGroups>
+  <proxies></proxies>
+  <servers>
+    <server>
+      <id>ossrh</id>
+      <username>${env.MAVEN_USERNAME}</username>
+      <password>${env.MAVEN_PASSWORD}</password>
+    </server>
+  </servers>
+  <mirrors></mirrors>
+  <profiles>
+    <profile>
+      <id>ossrh</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <properties>
+        <gpg.executable>gpg2</gpg.executable>
+        <gpg.passphrase>${env.GPG_PASSPHRASE}</gpg.passphrase>
+      </properties>
+    </profile>
+  </profiles>
+</settings>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..82bcef9
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,253 @@
+<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://www.w3.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.lucee</groupId>
+    <artifactId>s3-extension</artifactId>
+    <version>2.0.2.17-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    <name>S3 Extension</name>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+        <id>17AB52DE-B300-A94B-E058BD978511E39E</id>
+        <bundlename>org.lucee.s3.extension</bundlename>
+        <luceeCoreVersion>5.0.0.157</luceeCoreVersion>
+        <releaseType>server</releaseType>
+        <label>S3 Resource Extension</label>
+        <class>org.lucee.extension.resource.s3.S3ResourceProvider</class>
+        <release.url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</release.url>
+        <snapshot.url>https://oss.sonatype.org/content/repositories/snapshots/</snapshot.url>
+    </properties>
+    <scm>
+        <url>https://github.com/lucee/extension-s3</url>
+        <connection>scm:git:git://github.com/lucee/extension-s3.git</connection>
+        <developerConnection>scm:git:git@github.com:lucee/extension-s3.git</developerConnection>
+        <tag>${project.version}</tag>
+    </scm>
+
+    <distributionManagement>
+        <repository>
+            <id>ossrh</id>
+            <url>${release.url}</url>
+        </repository>
+        <snapshotRepository>
+            <id>ossrh</id>
+            <url>${snapshot.url}</url>
+        </snapshotRepository>
+    </distributionManagement>
+
+    <licenses>
+        <license>
+            <name>The GNU Lesser General Public License, Version 2.1</name>
+            <url>http://www.gnu.org/licenses/lgpl-2.1.txt</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+
+    <developers>
+        <developer>
+            <id>micstriit</id>
+            <name>Michael Offner</name>
+            <email>michael@lucee.org</email>
+            <organization>Lucee Association Switzerland</organization>
+            <organizationUrl>http://lucee.org</organizationUrl>
+            <roles>
+                <role>Project-Administrator</role>
+                <role>Developer</role>
+            </roles>
+            <timezone>+1</timezone>
+        </developer>
+    </developers>
+
+    <description>Core Extension to integrate Amazon Simple Storage Service (S3) Resource into Lucee.</description>
+    <url>https://github.com/lucee/extension-kinesis</url>
+
+    <profiles>
+        <profile>
+            <id>release-sign-artifacts</id>
+            <activation>
+                <property>
+                    <name>performRelease</name>
+                    <value>true</value>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <!-- GPG sign -->
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <version>3.0.1</version>
+                        <executions>
+                            <execution>
+                                <id>sign-artifacts</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
+                                <configuration>
+                                    <files>
+                                        <file>${project.build.directory}/${project.artifactId}-${project.version}.lex</file>
+                                    </files>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                      <groupId>org.apache.maven.plugins</groupId>
+                      <artifactId>maven-release-plugin</artifactId>
+                      <version>3.0.0</version>
+                      <configuration>
+                        <autoVersionSubmodules>true</autoVersionSubmodules>
+                        <useReleaseProfile>false</useReleaseProfile>
+                        <releaseProfiles>release</releaseProfiles>
+                        <goals>deploy</goals>
+                      </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+    <build>
+        <plugins>
+            <!-- Antrun plugin to execute the Ant build -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.8</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <target>
+                                <ant antfile="build.xml" target="clean">
+                                    <property name="bundleversion" value="${project.version}"/>
+                                    <property name="bundlename" value="${bundlename}"/>
+                                    <property name="filename" value="${project.artifactId}"/>
+                                    <property name="id" value="${id}"/>
+                                    <property name="luceeCoreVersion" value="${luceeCoreVersion}"/>
+                                    <property name="releaseType" value="${releaseType}"/>
+                                    <property name="label" value="${label}"/>
+                                    <property name="description" value="${project.description}"/>
+                                    <property name="class" value="${class}"/>
+                                </ant>
+                                <condition property="isSnapshot" value="true" else="false">
+                                    <matches string="${project.version}" pattern=".*-SNAPSHOT"/>
+                                </condition>
+                                <condition property="deploy.url" value="${snapshot.url}">
+                                    <istrue value="${isSnapshot}"/>
+                                </condition>
+                                <condition property="deploy.url" value="${release.url}">
+                                    <isfalse value="${isSnapshot}"/>
+                                </condition>
+                                <echo message="Deploying to URL: ${deploy.url}" />
+                            </target>
+                            <exportAntProperties>true</exportAntProperties>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <!-- Build Helper Plugin to attach additional artifacts -->
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>3.2.0</version>
+                <executions>
+                    <execution>
+                        <id>attach-artifacts</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>attach-artifact</goal>
+                        </goals>
+                        <configuration>
+                            <artifacts>
+                                <artifact>
+                                    <file>${project.build.directory}/${project.artifactId}-${project.version}.lex</file>
+                                    <type>lex</type>
+                                </artifact>
+                            </artifacts>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <!-- Clean plugin to remove extra folders -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-clean-plugin</artifactId>
+                <version>3.1.0</version>
+                <executions>
+                    <execution>
+                        <id>cleanup</id>
+                        <phase>post-package</phase>
+                        <goals>
+                            <goal>clean</goal>
+                        </goals>
+                        <configuration>
+                            <filesets>
+                                <fileset>
+                                    <directory>${project.build.directory}/antrun</directory>
+                                    <includes>
+                                        <include>**/*</include>
+                                    </includes>
+                                </fileset>
+                                <fileset>
+                                    <directory>${project.build.directory}/archive-tmp</directory>
+                                    <includes>
+                                        <include>**/*</include>
+                                    </includes>
+                                </fileset>
+                            </filesets>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <!-- Maven Deploy Plugin to deploy the .lex file -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <version>3.0.0-M1</version>
+                <executions>
+                    <execution>
+                        <id>default-deploy</id>
+                        <phase>deploy</phase>
+                        <goals>
+                            <goal>deploy-file</goal>
+                        </goals>
+                        <configuration>
+                            <file>${project.build.directory}/${project.artifactId}-${project.version}.lex</file>
+                            <groupId>${project.groupId}</groupId>
+                            <artifactId>${project.artifactId}</artifactId>
+                            <version>${project.version}</version>
+                            <repositoryId>ossrh</repositoryId>
+                            <url>${deploy.url}</url>
+                            <packaging>lex</packaging>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <!-- Nexus Staging Maven Plugin to automate the release process -->
+            <plugin>
+                <groupId>org.sonatype.plugins</groupId>
+                <artifactId>nexus-staging-maven-plugin</artifactId>
+                <version>1.6.13</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <serverId>ossrh</serverId>
+                    <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+                    <autoReleaseAfterClose>true</autoReleaseAfterClose>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/source/fld/function.fld b/source/fld/function.fld
index 788c846..909eca4 100755
--- a/source/fld/function.fld
+++ b/source/fld/function.fld
@@ -1524,7 +1524,6 @@
 	</function>
 
 
-	<!-- S3GetVersionInfo -->
 	<!-- S3GetVersionInfo -->
 <function>
     <name>S3GetVersionInfo</name>