Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/release-please.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,12 @@ jobs:
# This means there's no way to skip publishing of a particular module in a multi-module build, so we iterate over each module and publish them individually,
# letting exists-maven-plugin skip the nexus-staging-maven-plugin's entire deploy goal if the artifact exists.
run: |
FLAGD_CORE_VERSION=$(cat tools/flagd-core/version.txt)
mvn --non-recursive --batch-mode --settings release/m2-settings.xml -DskipTests -Dcheckstyle.skip clean deploy
modules=($(cat pom.xml | grep "<module>" | sed 's/\s*<.*>\(.*\)<.*>/\1/'))
for module in "${modules[@]}"
do
mvn --batch-mode --projects $module --settings release/m2-settings.xml -DskipTests -Dcheckstyle.skip clean deploy
mvn --batch-mode --projects $module --settings release/m2-settings.xml -DskipTests -Dcheckstyle.skip -Dflagd-core.version=$FLAGD_CORE_VERSION clean deploy
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This pins the flagd-core dep in the flagd-provider to the current version in source, ensuring we never have incompatibility.

done
env:
CENTRAL_USERNAME: ${{ secrets.CENTRAL_USERNAME }}
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,6 @@
[submodule "providers/go-feature-flag/wasm-releases"]
path = providers/go-feature-flag/wasm-releases
url = https://github.com/go-feature-flag/wasm-releases.git
[submodule "tools/flagd-core/schemas"]
path = tools/flagd-core/schemas
url = https://github.com/open-feature/schemas.git
2 changes: 2 additions & 0 deletions .release-please-manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,7 @@
"providers/ofrep": "0.0.1",
"tools/junit-openfeature": "0.2.1",
"tools/flagd-http-connector": "0.0.4",
"tools/flagd-api": "0.0.1",
"tools/flagd-core": "0.0.1",
".": "1.0.0"
}
2 changes: 2 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
<modules>
<module>hooks/open-telemetry</module>
<module>tools/junit-openfeature</module>
<module>tools/flagd-api</module>
<module>tools/flagd-core</module>
<module>providers/flagd</module>
<module>providers/flagsmith</module>
<module>providers/go-feature-flag</module>
Expand Down
85 changes: 10 additions & 75 deletions providers/flagd/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
<io.grpc.version>1.79.0</io.grpc.version>
<!-- caution - updating this will break compatibility with older protobuf-java versions -->
<protobuf-java.min.version>3.25.6</protobuf-java.min.version>
<!-- Match any core version locally- at release, CI sets exact version: -Dflagd-core.version=$(cat tools/flagd-core/version.txt) -->
<flagd-core.version>[0.0.1,)</flagd-core.version>
</properties>

<name>flagd</name>
Expand All @@ -37,6 +39,13 @@
<dependencies>
<!-- we inherent dev.openfeature.javasdk and the test dependencies from the parent pom -->

<!-- flagd core evaluation logic -->
<dependency>
<groupId>dev.openfeature.contrib.tools</groupId>
<artifactId>flagd-core</artifactId>
<version>${flagd-core.version}</version>
</dependency>

<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
Expand All @@ -62,37 +71,6 @@

<!-- grpc-netty-shaded bundles netty with epoll support for unix sockets -->

<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.20.1</version>
</dependency>

<dependency>
<groupId>io.github.jamsesso</groupId>
<artifactId>json-logic-java</artifactId>
<version>1.1.0</version>
</dependency>

<!-- Override gson usage of json-logic-java-->
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.13.1</version>
</dependency>

<dependency>
<groupId>com.networknt</groupId>
<artifactId>json-schema-validator</artifactId>
<version>1.5.9</version>
<exclusions>
<exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<!-- necessary for Java 9+ -->
<groupId>org.apache.tomcat</groupId>
Expand All @@ -107,30 +85,12 @@
<version>4.5.0</version>
</dependency>

<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.20.0</version>
</dependency>

<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-api</artifactId>
<version>1.56.0</version>
</dependency>

<dependency>
<groupId>org.semver4j</groupId>
<artifactId>semver4j</artifactId>
<version>5.8.0</version>
</dependency>

<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.20.0</version>
</dependency>

<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
Expand Down Expand Up @@ -205,7 +165,7 @@
<goal>exec</goal>
</goals>
<configuration>
<!-- run: git submodule update \-\-init schemas -->
<!-- run: git submodule update \-\-init schemas for protos -->
<executable>git</executable>
<arguments>
<argument>submodule</argument>
Expand All @@ -217,31 +177,6 @@
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>3.3.1</version>
<executions>
<execution>
<id>copy-json-schemas</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${basedir}/src/main/resources/flagd/schemas/</outputDirectory>
<resources>
<resource>
<directory>${basedir}/schemas/json/</directory>
<includes>
<include>flags.json</include>
<include>targeting.json</include>
</includes>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.xolstice.maven.plugins</groupId>
Expand Down
Loading
Loading