Merge pull request #161 from gregmedd/bugfix/proto-import-paths

Fixing import paths so generated headers work
eclipse-uprotocol · May 24, 2024 · aef810b · aef810b
2 parents 39d5934 + 5e6172e
commit aef810b
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 25 deletions.
diff --git a/.github/workflows/build-github-package.yml b/.github/workflows/build-github-package.yml
@@ -37,10 +37,10 @@ jobs:
           settings-path: ${{ github.workspace }} 
 
       - name: Build with Maven
-        run: mvn -B package --file up-core-api/pom.xml
+        run: mvn -B package
 
       - name: Publish maven package to GitHub Packages
-        run: mvn deploy -s $GITHUB_WORKSPACE/settings.xml --file up-core-api/pom.xml
+        run: mvn deploy -s $GITHUB_WORKSPACE/settings.xml
         env:
           # GITHUB_TOKEN: ${{ github.token }}
          GITHUB_TOKEN: ${{ secrets.PKG_PUSH_TOKEN }}
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -21,4 +21,4 @@ jobs:
         distribution: 'temurin'
         cache: maven
     - name: Build and Test with Maven
-      run: mvn -B package --file up-core-api/pom.xml
+      run: mvn -B package
diff --git a/.github/workflows/build_deploy.yml b/.github/workflows/build_deploy.yml
@@ -28,7 +28,7 @@ jobs:
         gpg-passphrase: GPG_PASSPHRASE
 
     - name: Build and Publish to Apache Maven Central
-      run: mvn clean deploy --file up-core-api/pom.xml
+      run: mvn clean deploy
       env:
         OSSRH_USER: ${{ secrets.ORG_OSSRH_USERNAME }}
         OSSRH_PASSWORD: ${{ secrets.ORG_OSSRH_PASSWORD }}

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -34,7 +34,7 @@ jobs:
 
     - name: Stage to Nexus and Release to Maven central
       run: |
-        mvn -B release:clean release:prepare -P release release:perform --file up-core-api/pom.xml
+        mvn -B release:clean release:prepare -P release release:perform
       env:
         OSSRH_USER: ${{ secrets.ORG_OSSRH_USERNAME }}
         OSSRH_PASSWORD: ${{ secrets.ORG_OSSRH_PASSWORD }}
@@ -44,7 +44,7 @@ jobs:
 
     - if: cancelled() || failure()
       run: |
-        mvn -B release:rollback --file up-core-api/pom.xml
+        mvn -B release:rollback
       env:
         GH_TOKEN: ${{ secrets.BOT_GITHUB_TOKEN }}
         GITHUB_TOKEN: ${{ secrets.BOT_GITHUB_TOKEN }}
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@
 /uprotocol-spec.iml
 /up-spec.iml
 /up-core-api/target/
+/target/
diff --git a/up-core-api/pom.xml → pom.xml b/up-core-api/pom.xml → pom.xml
@@ -20,7 +20,7 @@
     <description>This project contains the built artifacts for core uProtocol services (uSubscription, uDiscovery, uTwin, etc..). Artifacts include language specific messages and client/server stubs</description>
     <version>1.5.8-SNAPSHOT</version>
     <packaging>jar</packaging>
-    <url>https://github.com/eclipse-uprotocol/uprotocol-core-api/</url>
+    <url>https://github.com/eclipse-uprotocol/up-spec/</url>
 
 
     <licenses>
@@ -55,7 +55,7 @@
     <scm>
         <connection>scm:git:${project.scm.url}</connection>
         <developerConnection>scm:git:${project.scm.url}</developerConnection>
-        <url>https://github.com/eclipse-uprotocol/uprotocol-core-api.git</url>
+        <url>https://github.com/eclipse-uprotocol/up-spec.git</url>
         <tag>HEAD</tag>
     </scm>
 
@@ -100,7 +100,7 @@
                 <configuration>
                     <protocArtifact>
                         com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
-                    <protoSourceRoot>${project.basedir}/uprotocol</protoSourceRoot>
+                    <protoSourceRoot>${project.basedir}/up-core-api</protoSourceRoot>
                 </configuration>
             </plugin>
 
@@ -277,4 +277,4 @@
         </profile>
     </profiles>
 
-</project>
+</project>
diff --git a/up-core-api/uprotocol/core/udiscovery/v3/udiscovery.proto b/up-core-api/uprotocol/core/udiscovery/v3/udiscovery.proto
@@ -15,9 +15,9 @@ syntax = "proto3";
 
 package uprotocol.core.udiscovery.v3;
 import "google/protobuf/timestamp.proto";
-import "uoptions.proto";
-import "v1/uri.proto";
-import "v1/ustatus.proto";
+import "uprotocol/uoptions.proto";
+import "uprotocol/v1/uri.proto";
+import "uprotocol/v1/ustatus.proto";
 
 option java_package = "org.eclipse.uprotocol.core.udiscovery.v3";
 option java_outer_classname = "UDiscoveryProto";

diff --git a/up-core-api/uprotocol/core/usubscription/v3/usubscription.proto b/up-core-api/uprotocol/core/usubscription/v3/usubscription.proto
@@ -17,9 +17,9 @@ package uprotocol.core.usubscription.v3;
 
 import "google/protobuf/any.proto";
 import "google/protobuf/timestamp.proto";
-import "v1/ustatus.proto";
-import "v1/uri.proto";
-import "uoptions.proto";
+import "uprotocol/v1/ustatus.proto";
+import "uprotocol/v1/uri.proto";
+import "uprotocol/uoptions.proto";
 
 option java_package = "org.eclipse.uprotocol.core.usubscription.v3";
 option java_outer_classname = "USubscriptionProto";

diff --git a/up-core-api/uprotocol/core/utwin/v2/utwin.proto b/up-core-api/uprotocol/core/utwin/v2/utwin.proto
@@ -15,10 +15,10 @@ syntax = "proto3";
 
 package uprotocol.core.utwin.v2;
 
-import "uoptions.proto";
-import "v1/ustatus.proto";
-import "v1/uri.proto";
-import "v1/umessage.proto";
+import "uprotocol/uoptions.proto";
+import "uprotocol/v1/ustatus.proto";
+import "uprotocol/v1/uri.proto";
+import "uprotocol/v1/umessage.proto";
 
 option java_package = "org.eclipse.uprotocol.core.utwin.v2";
 option java_outer_classname = "UTwinProto";

diff --git a/up-core-api/uprotocol/v1/uattributes.proto b/up-core-api/uprotocol/v1/uattributes.proto
@@ -15,10 +15,10 @@ syntax = "proto3";
 
 package uprotocol.v1;
 
-import "v1/uri.proto";
-import "v1/uuid.proto";
-import "v1/ustatus.proto";
-import "uoptions.proto";
+import "uprotocol/v1/uri.proto";
+import "uprotocol/v1/uuid.proto";
+import "uprotocol/v1/ustatus.proto";
+import "uprotocol/uoptions.proto";
 
 option java_package = "org.eclipse.uprotocol.v1";
 option java_outer_classname = "UAttributesProto";

diff --git a/up-core-api/uprotocol/v1/umessage.proto b/up-core-api/uprotocol/v1/umessage.proto
@@ -15,7 +15,7 @@ syntax = "proto3";
 
 package uprotocol.v1;
 
-import "v1/uattributes.proto";
+import "uprotocol/v1/uattributes.proto";
 
 option java_package = "org.eclipse.uprotocol.v1";
 option java_outer_classname = "UMessageProto";