Skip to content

Commit

Permalink
Merge branch 'release/0.61' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
jfallows committed Jan 27, 2021
2 parents d856d16 + fddd048 commit 319ac0c
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 4 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
18 changes: 18 additions & 0 deletions NOTICE
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
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:
agrona under The Apache License, Version 2.0
Nukleus Proxy Specification under The Apache Software License, Version 2.0
Nukleus Specification under The Apache Software License, Version 2.0

36 changes: 32 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-tls.spec</artifactId>
<version>0.60</version>
<version>0.61</version>
<name>TLS Nukleus Specification</name>
<description>TLS Nukleus Specification</description>
<url>https://github.com/reaktivity/nukleus-tls.spec</url>
Expand Down Expand Up @@ -56,11 +56,11 @@
<junit.version>4.13.1</junit.version>

<k3po.version>3.1.0</k3po.version>
<reaktor.version>0.159</reaktor.version>
<reaktor.version>0.160</reaktor.version>

<nukleus.proxy.spec.version>0.14</nukleus.proxy.spec.version>
<nukleus.proxy.spec.version>0.15</nukleus.proxy.spec.version>

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

<dependencies>
Expand Down Expand Up @@ -148,6 +148,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

0 comments on commit 319ac0c

Please sign in to comment.