This Confluence has been LDAP enabled, if you are an ASF Committer, please use your LDAP Credentials to login. Any problems file an INFRA jira ticket please.

Page tree

Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.
Comment: Add Java test code

...

# Start in the root of the Tomcat Native repo
git remote add -f -t master --no-tags 9.0.x https://gitbox.apache.org/repos/asf/tomcat.git
git merge -s ours --no-commit 9.0.x/master
git read-tree --prefix=java/org/apache/tomcat/jni/ -u 9.0.x/master:java/org/apache/tomcat/jni
git read-tree --prefix=test/org/apache/tomcat/jni/ -u 9.0.x/master:test/org/apache/tomcat/jni
git commit

The Java code in Tomcat Native is updated using:

# Start in the root of the Tomcat Native repo
git mergerm -s ours --no-commit rf java/org/apache/tomcat/jni
git read-tree --prefix=java/org/apache/tomcat/jni/ -u 9.0.x/master:java/org/apache/tomcat/jni
git rm -rf javatest/org/apache/tomcat/jni
git read-tree --prefix=javatest/org/apache/tomcat/jni/ -u 9.0.x/master:javatest/org/apache/tomcat/jni
git commit