chore: use version 1.0-SNAPSHOT

block · Aug 14, 2024 · 5221b9c · 5221b9c
1 parent c4cf07e
commit 5221b9c
Show file tree

Hide file tree

Showing 14 changed files with 20 additions and 18 deletions.
diff --git a/backend/controller/leases/testdata/java/leases/pom.xml b/backend/controller/leases/testdata/java/leases/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>xyz.block.ftl.examples</groupId>
     <artifactId>leases</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.0-SNAPSHOT</version>
 
     <properties>
         <ftl.version>1.0-SNAPSHOT</ftl.version>
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>xyz.block</groupId>
             <artifactId>ftl-java-runtime</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>

diff --git a/examples/kotlin/echo/pom.xml b/examples/kotlin/echo/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>xyz.block.ftl.examples</groupId>
     <artifactId>echo</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.0-SNAPSHOT</version>
 
     <properties>
         <ftl.version>1.0-SNAPSHOT</ftl.version>
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>xyz.block</groupId>
             <artifactId>ftl-java-runtime</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>

diff --git a/examples/kotlin/time/pom.xml b/examples/kotlin/time/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>xyz.block.ftl.examples</groupId>
     <artifactId>time</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.0-SNAPSHOT</version>
 
     <properties>
         <ftl.version>1.0-SNAPSHOT</ftl.version>
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>xyz.block</groupId>
             <artifactId>ftl-java-runtime</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>

diff --git a/integration/harness.go b/integration/harness.go
@@ -79,9 +79,10 @@ func WithEnvar(key, value string) Option {
 	}
 }
 
-// BuildJava is a Run* option that ensures the Java runtime is built.
+// WithJavaBuild is a Run* option that ensures the Java runtime is built.
 // If the test languages contain java this is not necessary, as it is implied
-func BuildJava() Option {
+// Note that this will not actually add Java as a language under test
+func WithJavaBuild() Option {
 	return func(o *options) {
 		o.requireJava = true
 	}

diff --git a/java-runtime/ftl-runtime/deployment/pom.xml b/java-runtime/ftl-runtime/deployment/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>xyz.block</groupId>
         <artifactId>ftl-java-runtime-parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0-SNAPSHOT</version>
     </parent>
     <artifactId>ftl-java-runtime-deployment</artifactId>
     <name>Ftl Java Runtime - Deployment</name>

diff --git a/...untime/ftl-runtime/deployment/src/main/java/xyz/block/ftl/deployment/TopicsProcessor.java b/...untime/ftl-runtime/deployment/src/main/java/xyz/block/ftl/deployment/TopicsProcessor.java
@@ -51,7 +51,7 @@ TopicsBuildItem handleTopics(CombinedIndexBuildItem index, BuildProducer<Generat
                         + " with a concrete type parameter " + iface.name() + " does not extend this interface");
             }
 
-            String name = topicDefinition.value("name").asString();
+            String name = topicDefinition.value().asString();
             if (names.contains(name)) {
                 throw new RuntimeException("Multiple topic definitions found for topic " + name);
             }

diff --git a/java-runtime/ftl-runtime/integration-tests/pom.xml b/java-runtime/ftl-runtime/integration-tests/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>xyz.block</groupId>
         <artifactId>ftl-java-runtime-parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0-SNAPSHOT</version>
     </parent>
     <artifactId>ftl-java-runtime-integration-tests</artifactId>
     <name>Ftl Java Runtime - Integration Tests</name>

diff --git a/...me/ftl-runtime/integration-tests/src/main/java/xyz/block/ftl/java/runtime/it/MyTopic.java b/...me/ftl-runtime/integration-tests/src/main/java/xyz/block/ftl/java/runtime/it/MyTopic.java
@@ -5,6 +5,6 @@
 import xyz.block.ftl.TopicDefinition;
 
 @Export
-@TopicDefinition(name = "testTopic")
+@TopicDefinition(value = "testTopic")
 public interface MyTopic extends Topic<Person> {
 }
diff --git a/java-runtime/ftl-runtime/pom.xml b/java-runtime/ftl-runtime/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>xyz.block</groupId>
     <artifactId>ftl-java-runtime-parent</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Ftl Java Runtime - Parent</name>
 

diff --git a/java-runtime/ftl-runtime/runtime/pom.xml b/java-runtime/ftl-runtime/runtime/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>xyz.block</groupId>
         <artifactId>ftl-java-runtime-parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0-SNAPSHOT</version>
     </parent>
     <artifactId>ftl-java-runtime</artifactId>
     <name>Ftl Java Runtime - Runtime</name>

diff --git a/java-runtime/ftl-runtime/runtime/src/main/java/xyz/block/ftl/TopicDefinition.java b/java-runtime/ftl-runtime/runtime/src/main/java/xyz/block/ftl/TopicDefinition.java
@@ -12,6 +12,6 @@
      *
      * @return The name of the topic
      */
-    String name();
+    String value();
 
 }
diff --git a/java-runtime/ftl-runtime/runtime/src/main/java/xyz/block/ftl/runtime/FTLRecorder.java b/java-runtime/ftl-runtime/runtime/src/main/java/xyz/block/ftl/runtime/FTLRecorder.java
@@ -26,6 +26,7 @@ public void registerVerb(String module, String verbName, String methodName, List
         //TODO: this sucks
         try {
             var method = verbHandlerClass.getDeclaredMethod(methodName, parameterTypes.toArray(new Class[0]));
+            method.setAccessible(true);
             var handlerInstance = Arc.container().instance(verbHandlerClass);
             Arc.container().instance(VerbRegistry.class).get().register(module, verbName, handlerInstance, method,
                     paramMappers, allowNullReturn);

diff --git a/java-runtime/ftl-runtime/test-framework/pom.xml b/java-runtime/ftl-runtime/test-framework/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>xyz.block</groupId>
         <artifactId>ftl-java-runtime-parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0-SNAPSHOT</version>
     </parent>
     <artifactId>ftl-java-test-framework</artifactId>
     <name>Ftl Java Runtime - Test Framework</name>

diff --git a/java-runtime/testdata/java/javamodule/pom.xml b/java-runtime/testdata/java/javamodule/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>xyz.block.ftl.examples</groupId>
     <artifactId>javamodule</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.0-SNAPSHOT</version>
 
     <properties>
         <ftl.version>1.0-SNAPSHOT</ftl.version>
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>xyz.block</groupId>
             <artifactId>ftl-java-runtime</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>