Revert "[CI/CD] Release - Adds maven-gpg-plugin (#4)" (#5)

dirigiblelabs · Dec 15, 2023 · cd85c2f · cd85c2f
1 parent e10a2e7
commit cd85c2f
Show file tree

Hide file tree

Showing 37 changed files with 164 additions and 240 deletions.
diff --git a/.github/workflows/release-maven.yml b/.github/workflows/release-maven.yml
diff --git a/.github/workflows/release-github.yml → .github/workflows/release.yml b/.github/workflows/release-github.yml → .github/workflows/release.yml
@@ -1,16 +1,16 @@
-name: Release GitHub
+name: Release
 
 on:
   workflow_dispatch:
     inputs:
       releaseVersion:
         description: Release Version
         required: true
-        default: 3.1.1
+        default: 3.0.0
       snapshotVersion:
         description: Snapshot Version
         required: true
-        default: 3.1.2-SNAPSHOT
+        default: 3.0.1-SNAPSHOT
 
 run-name: 'version set to ${{ github.event.inputs.releaseVersion }} for release'
 
@@ -67,7 +67,7 @@ jobs:
       run: mvn deploy
       env:
         GITHUB_USERNAME: x-access-token
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
         BUILD_ENV: 'github-actions'
 
     - name: "Git: Commit Release Version"

diff --git a/odata2-annotation-processor/annotation-processor-api/pom.xml b/odata2-annotation-processor/annotation-processor-api/pom.xml
@@ -23,9 +23,9 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>com.codbex.olingo</groupId>
+    <groupId>org.apache.olingo</groupId>
     <artifactId>olingo-odata2-annotation-processor</artifactId>
-    <version>3.1.2-SNAPSHOT</version>
+    <version>3.1.1-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
@@ -76,7 +76,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>com.codbex.olingo</groupId>
+      <groupId>org.apache.olingo</groupId>
       <artifactId>olingo-odata2-api</artifactId>
       <version>${project.version}</version>
     </dependency>

diff --git a/odata2-annotation-processor/annotation-processor-core/pom.xml b/odata2-annotation-processor/annotation-processor-core/pom.xml
@@ -18,9 +18,9 @@
   <name>${project.artifactId}</name>
 
   <parent>
-    <groupId>com.codbex.olingo</groupId>
+    <groupId>org.apache.olingo</groupId>
     <artifactId>olingo-odata2-annotation-processor</artifactId>
-    <version>3.1.2-SNAPSHOT</version>
+    <version>3.1.1-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
@@ -66,29 +66,29 @@
 
   <dependencies>
     <dependency>
-      <groupId>com.codbex.olingo</groupId>
+      <groupId>org.apache.olingo</groupId>
       <artifactId>olingo-odata2-annotation-processor-api</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>com.codbex.olingo</groupId>
+      <groupId>org.apache.olingo</groupId>
       <artifactId>olingo-odata2-api-annotation</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>com.codbex.olingo</groupId>
+      <groupId>org.apache.olingo</groupId>
       <artifactId>olingo-odata2-api</artifactId>
       <version>${project.version}</version>
     </dependency>
     <!-- Test dependencies -->
     <dependency>
-      <groupId>com.codbex.olingo</groupId>
+      <groupId>org.apache.olingo</groupId>
       <artifactId>olingo-odata2-core</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.codbex.olingo</groupId>
+      <groupId>org.apache.olingo</groupId>
       <artifactId>olingo-odata2-testutil</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>

diff --git a/odata2-annotation-processor/annotation-processor-ref/pom.xml b/odata2-annotation-processor/annotation-processor-ref/pom.xml
@@ -18,9 +18,9 @@
   <name>${project.artifactId}</name>
 
   <parent>
-    <groupId>com.codbex.olingo</groupId>
+    <groupId>org.apache.olingo</groupId>
     <artifactId>olingo-odata2-annotation-processor</artifactId>
-    <version>3.1.2-SNAPSHOT</version>
+    <version>3.1.1-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
@@ -68,22 +68,22 @@
 
   <dependencies>
     <dependency>
-      <groupId>com.codbex.olingo</groupId>
+      <groupId>org.apache.olingo</groupId>
       <artifactId>olingo-odata2-api</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>com.codbex.olingo</groupId>
+      <groupId>org.apache.olingo</groupId>
       <artifactId>olingo-odata2-core</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>com.codbex.olingo</groupId>
+      <groupId>org.apache.olingo</groupId>
       <artifactId>olingo-odata2-annotation-processor-api</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>com.codbex.olingo</groupId>
+      <groupId>org.apache.olingo</groupId>
       <artifactId>olingo-odata2-annotation-processor-core</artifactId>
       <version>${project.version}</version>
     </dependency>
@@ -93,7 +93,7 @@
     </dependency>
     <!-- Test dependencies -->
     <dependency>
-      <groupId>com.codbex.olingo</groupId>
+      <groupId>org.apache.olingo</groupId>
       <artifactId>olingo-odata2-testutil</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>

diff --git a/odata2-annotation-processor/annotation-processor-web/pom.xml b/odata2-annotation-processor/annotation-processor-web/pom.xml
@@ -18,9 +18,9 @@
   <name>${project.artifactId}</name>
 
   <parent>
-    <groupId>com.codbex.olingo</groupId>
+    <groupId>org.apache.olingo</groupId>
     <artifactId>olingo-odata2-annotation-processor</artifactId>
-    <version>3.1.2-SNAPSHOT</version>
+    <version>3.1.1-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
@@ -63,12 +63,12 @@
       <version>${cxf.version}</version>
     </dependency>
     <dependency>
-      <groupId>com.codbex.olingo</groupId>
+      <groupId>org.apache.olingo</groupId>
       <artifactId>olingo-odata2-annotation-processor-ref</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>com.codbex.olingo</groupId>
+      <groupId>org.apache.olingo</groupId>
       <artifactId>olingo-odata2-core</artifactId>
       <version>${project.version}</version>
     </dependency>

diff --git a/odata2-annotation-processor/pom.xml b/odata2-annotation-processor/pom.xml
@@ -10,15 +10,15 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>com.codbex.olingo</groupId>
+    <groupId>org.apache.olingo</groupId>
     <artifactId>olingo-odata2-annotation-processor</artifactId>
     <packaging>pom</packaging>
     <name>${project.artifactId}</name>
 
     <parent>
-        <groupId>com.codbex.olingo</groupId>
+        <groupId>org.apache.olingo</groupId>
         <artifactId>olingo-odata2-parent</artifactId>
-        <version>3.1.2-SNAPSHOT</version>
+        <version>3.1.1-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/odata2-dist/janos/pom.xml b/odata2-dist/janos/pom.xml
@@ -15,9 +15,9 @@
     <name>${project.artifactId}</name>
 
     <parent>
-        <groupId>com.codbex.olingo</groupId>
+        <groupId>org.apache.olingo</groupId>
         <artifactId>olingo-odata2-dist</artifactId>
-        <version>3.1.2-SNAPSHOT</version>
+        <version>3.1.1-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 
@@ -70,31 +70,31 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.codbex.olingo</groupId>
+            <groupId>org.apache.olingo</groupId>
             <artifactId>olingo-odata2-api-annotation</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>com.codbex.olingo</groupId>
+            <groupId>org.apache.olingo</groupId>
             <artifactId>olingo-odata2-api</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>com.codbex.olingo</groupId>
+            <groupId>org.apache.olingo</groupId>
             <artifactId>olingo-odata2-core</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>com.codbex.olingo</groupId>
+            <groupId>org.apache.olingo</groupId>
             <artifactId>olingo-odata2-annotation-processor-api</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>com.codbex.olingo</groupId>
+            <groupId>org.apache.olingo</groupId>
             <artifactId>olingo-odata2-annotation-processor-core</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>

diff --git a/odata2-dist/javadoc/pom.xml b/odata2-dist/javadoc/pom.xml
@@ -15,9 +15,9 @@
     <name>${project.artifactId}</name>
 
     <parent>
-        <groupId>com.codbex.olingo</groupId>
+        <groupId>org.apache.olingo</groupId>
         <artifactId>olingo-odata2-dist</artifactId>
-        <version>3.1.2-SNAPSHOT</version>
+        <version>3.1.1-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/odata2-dist/jpa/pom.xml b/odata2-dist/jpa/pom.xml
@@ -15,9 +15,9 @@
     <name>${project.artifactId}</name>
 
     <parent>
-        <groupId>com.codbex.olingo</groupId>
+        <groupId>org.apache.olingo</groupId>
         <artifactId>olingo-odata2-dist</artifactId>
-        <version>3.1.2-SNAPSHOT</version>
+        <version>3.1.1-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 
@@ -70,31 +70,31 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.codbex.olingo</groupId>
+            <groupId>org.apache.olingo</groupId>
             <artifactId>olingo-odata2-api-annotation</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>com.codbex.olingo</groupId>
+            <groupId>org.apache.olingo</groupId>
             <artifactId>olingo-odata2-api</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>com.codbex.olingo</groupId>
+            <groupId>org.apache.olingo</groupId>
             <artifactId>olingo-odata2-core</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>com.codbex.olingo</groupId>
+            <groupId>org.apache.olingo</groupId>
             <artifactId>olingo-odata2-jpa-processor-api</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>com.codbex.olingo</groupId>
+            <groupId>org.apache.olingo</groupId>
             <artifactId>olingo-odata2-jpa-processor-core</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>

diff --git a/odata2-dist/lib/pom.xml b/odata2-dist/lib/pom.xml
@@ -15,9 +15,9 @@
     <name>${project.artifactId}</name>
 
     <parent>
-        <groupId>com.codbex.olingo</groupId>
+        <groupId>org.apache.olingo</groupId>
         <artifactId>olingo-odata2-dist</artifactId>
-        <version>3.1.2-SNAPSHOT</version>
+        <version>3.1.1-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 
@@ -70,19 +70,19 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.codbex.olingo</groupId>
+            <groupId>org.apache.olingo</groupId>
             <artifactId>olingo-odata2-api-annotation</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>com.codbex.olingo</groupId>
+            <groupId>org.apache.olingo</groupId>
             <artifactId>olingo-odata2-api</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>com.codbex.olingo</groupId>
+            <groupId>org.apache.olingo</groupId>
             <artifactId>olingo-odata2-core</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>

diff --git a/odata2-dist/pom.xml b/odata2-dist/pom.xml
@@ -15,9 +15,9 @@
     <name>${project.artifactId}</name>
 
     <parent>
-        <groupId>com.codbex.olingo</groupId>
+        <groupId>org.apache.olingo</groupId>
         <artifactId>olingo-odata2-parent</artifactId>
-        <version>3.1.2-SNAPSHOT</version>
+        <version>3.1.1-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>