Skip to content

Commit

Permalink
Merge branch 'release/0.288' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
jfallows committed Jan 28, 2021
2 parents 7146c56 + ebbb457 commit 258692d
Show file tree
Hide file tree
Showing 4 changed files with 79 additions and 5 deletions.
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
README.md merge=ours
COPYRIGHT merge=ours
NOTICE merge=ours
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2
- name: Build with Maven
run: ./mvnw -B -nsu verify jacoco:report
run: ./mvnw -B -U -nsu verify jacoco:report
- name: Notify via Slack
uses: 8398a7/action-slack@v3
with:
Expand Down
17 changes: 17 additions & 0 deletions NOTICE
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
Licensed under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at:

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on
an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.

This project includes:
Gson under Apache 2.0
JSR 374 (JSON Processing) Default Provider under Dual license consisting of the CDDL v1.1 and GPL v2

64 changes: 60 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.reaktivity</groupId>
<artifactId>nukleus-kafka</artifactId>
<version>0.287</version>
<version>0.288</version>
<name>Kafka Nukleus Implementation</name>
<description>Kafka Nukleus Implementation</description>
<url>https://github.com/reaktivity/nukleus-kafka.java</url>
Expand Down Expand Up @@ -59,10 +59,10 @@

<k3po.version>3.1.0</k3po.version>

<nukleus.plugin.version>0.83</nukleus.plugin.version>
<nukleus.plugin.version>0.84</nukleus.plugin.version>

<nukleus.kafka.spec.version>0.169</nukleus.kafka.spec.version>
<reaktor.version>0.159</reaktor.version>
<nukleus.kafka.spec.version>0.170</nukleus.kafka.spec.version>
<reaktor.version>0.161</reaktor.version>

<kafka.clients.version>1.0.0</kafka.clients.version>
</properties>
Expand Down Expand Up @@ -201,6 +201,34 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.jasig.maven</groupId>
<artifactId>maven-notice-plugin</artifactId>
<version>1.1.0</version>
<dependencies>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.1</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>2.2.5</version>
</dependency>
</dependencies>
<configuration>
<includeScopes>compile</includeScopes>
</configuration>
<executions>
<execution>
<phase>validate</phase>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.1.0</version>
Expand Down Expand Up @@ -378,6 +406,34 @@
</executions>
</plugin>
</plugins>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.jasig.maven</groupId>
<artifactId>maven-notice-plugin</artifactId>
<versionRange>[1.1.0,)</versionRange>
<goals>
<goal>check</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore></ignore>
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>

<profiles>
Expand Down

0 comments on commit 258692d

Please sign in to comment.